Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix ui bug in edit account view | Christian S | 2016-04-05 | 1 | -3/+3 |
| | |||||
* | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-04-04 | 2 | -19/+25 |
|\ | |||||
| * | switched around info and items query to avoid race condition | Daniel Gultsch | 2016-04-04 | 1 | -1/+1 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-04-04 | 12 | -26/+71 |
| | | |||||
| * | removed unnecessary wait for disconnect | Daniel Gultsch | 2016-04-04 | 1 | -6/+0 |
| | | |||||
| * | made sure the disco#items query has returned before finalizing the bind | Daniel Gultsch | 2016-04-04 | 1 | -12/+24 |
| | | |||||
* | | add option to only allow one account and set it to true | Christian S | 2016-04-04 | 2 | -5/+4 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-04-03 | 17 | -54/+184 |
|\| | |||||
| * | don't ask for resource when server uses http upload v0.1 | Daniel Gultsch | 2016-04-02 | 3 | -6/+8 |
| | | |||||
| * | check max http file size when attaching files | Daniel Gultsch | 2016-04-01 | 6 | -12/+83 |
| | | |||||
| * | add methods to check max file size for http upload | Daniel Gultsch | 2016-03-31 | 5 | -12/+41 |
| | | |||||
| * | save otr fingerprint in message | Daniel Gultsch | 2016-03-31 | 6 | -12/+15 |
| | | |||||
| * | include form fields into caps hash calculation | Daniel Gultsch | 2016-03-31 | 2 | -6/+25 |
| | | |||||
| * | closed some cursors under error conditions | Daniel Gultsch | 2016-03-31 | 1 | -3/+13 |
| | | |||||
| * | made setting aes keys in DownloadableFile more readable | Daniel Gultsch | 2016-03-31 | 1 | -12/+8 |
| | | |||||
| * | Update ShortcutBadger to version 1.1.4 | Christian S | 2016-03-27 | 1 | -2/+2 |
| | | |||||
* | | set sending crash reports to true as default | Christian S | 2016-04-03 | 1 | -1/+1 |
| | | |||||
* | | updated about info | Christian S | 2016-04-03 | 1 | -1/+3 |
| | | |||||
* | | added "blocklist" and "change password" icons | Christian S | 2016-04-03 | 1 | -2/+4 |
| | | |||||
* | | changed HomeAsUpIndicator | Christian S | 2016-04-03 | 6 | -0/+1 |
| | | |||||
* | | fixed crashes during updates on Android 6 | Christian S | 2016-03-30 | 2 | -35/+57 |
| | | |||||
* | | fixed bug in ShortcutBadger | Christian S | 2016-03-27 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/origin/patch-2' into development | Christian S | 2016-03-27 | 1 | -2/+2 |
|\ \ | |||||
| * | | Update ShortcutBadger to version 1.1.4 | Christian S | 2016-03-27 | 1 | -2/+2 |
| |/ | |||||
* | | added spinner to app updater activity | Christian S | 2016-03-26 | 1 | -0/+8 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-26 | 11 | -40/+69 |
|\| | |||||
| * | allow to delete attachments. fixes #1539 | Daniel Gultsch | 2016-03-23 | 8 | -31/+46 |
| | | |||||
| * | only add image files to media scanner | Daniel Gultsch | 2016-03-23 | 6 | -13/+26 |
| | | |||||
| * | Typo `attempt` | licaon-kter | 2016-03-22 | 1 | -1/+1 |
| | | |||||
* | | added missing/new strings | Christian S | 2016-03-23 | 2 | -0/+7 |
| | | |||||
* | | added VoiceRecorder to plugins | Christian S | 2016-03-23 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #80 from siacs/master | Christian S | 2016-03-20 | 6 | -12/+19 |
|\| | | | | | copy commits | ||||
| * | show room nick for /me command in sent muc messages. fixes #1773 | Daniel Gultsch | 2016-03-20 | 1 | -4/+5 |
| | | |||||
| * | be less strict when sharing EXTRA_TEXT intents | Daniel Gultsch | 2016-03-20 | 1 | -1/+1 |
| | | |||||
| * | be more careful to avoid creating multiple connections | Daniel Gultsch | 2016-03-20 | 2 | -3/+8 |
| | | |||||
| * | don't show v\omemo keys as such if not enabled | Daniel Gultsch | 2016-03-20 | 2 | -4/+5 |
| | | |||||
* | | add border to roundedimageview | Christian S | 2016-03-20 | 2 | -3/+4 |
| | | |||||
* | | add border to roundedimageview | Christian S | 2016-03-19 | 3 | -4/+6 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-17 | 8 | -58/+99 |
|\| | |||||
| * | made it possible to share text files | Daniel Gultsch | 2016-03-16 | 1 | -7/+8 |
| | | |||||
| * | reworked sharewith activity to stay open during sharing | Daniel Gultsch | 2016-03-16 | 3 | -30/+69 |
| | | | | | | | | closing the activity prematuraly caused uri permissions to be revoked | ||||
| * | Check if path for URI is accessible | fiaxh | 2016-03-15 | 1 | -1/+10 |
| | | | | | | | | | | The path extracted from the Cursor might not be accessible for Conversations. FileUtils accesses URI information through the ContentProvider, so this wouldn't be noticed. Fixes sharing from open-keychain's TemporaryContentProvider | ||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-03-13 | 5 | -106/+443 |
| | | |||||
| * | simplified getUsers(max) code | Daniel Gultsch | 2016-03-13 | 1 | -11/+2 |
| | | |||||
| * | added logging in case fragment wasn't attached | Daniel Gultsch | 2016-03-13 | 1 | -0/+5 |
| | | |||||
| * | fixed recursive call instead of call to super in PublishProfileActivity | Daniel Gultsch | 2016-03-13 | 1 | -5/+1 |
| | | |||||
* | | remove old code | Christian S | 2016-03-13 | 1 | -10/+0 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-13 | 8 | -18/+49 |
|\| | |||||
| * | log reason for bind failure | Daniel Gultsch | 2016-03-11 | 1 | -2/+2 |
| | | |||||
| * | close cursor in caps db query | Daniel Gultsch | 2016-03-11 | 1 | -1/+3 |
| | |