Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixed crashes during updates on Android 6 | Christian S | 2016-03-30 | 1 | -35/+56 |
| | |||||
* | Merge branch 'siacs/master' into development | Christian S | 2016-03-26 | 1 | -7/+25 |
|\ | |||||
| * | allow to delete attachments. fixes #1539 | Daniel Gultsch | 2016-03-23 | 1 | -7/+25 |
| | | |||||
* | | Merge pull request #80 from siacs/master | Christian S | 2016-03-20 | 3 | -5/+6 |
|\| | | | | | copy commits | ||||
| * | be less strict when sharing EXTRA_TEXT intents | Daniel Gultsch | 2016-03-20 | 1 | -1/+1 |
| | | |||||
| * | don't show v\omemo keys as such if not enabled | Daniel Gultsch | 2016-03-20 | 2 | -4/+5 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-17 | 4 | -42/+80 |
|\| | |||||
| * | 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 | 2 | -30/+66 |
| | | | | | | | | closing the activity prematuraly caused uri permissions to be revoked | ||||
| * | 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 | 4 | -5/+31 |
|\| | |||||
| * | don't show opt-out of battery optimization dialog when push is enabled | Daniel Gultsch | 2016-03-06 | 3 | -4/+17 |
| | | |||||
| * | warn in conversations when account is disabled | Daniel Gultsch | 2016-03-06 | 1 | -1/+14 |
| | | |||||
* | | show always buttons instead of links for files | Christian S | 2016-03-05 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-05 | 3 | -30/+74 |
|\| | |||||
| * | Merge branch 'Mess' of https://github.com/tarun018/Conversations into ↵ | Daniel Gultsch | 2016-03-04 | 1 | -0/+10 |
| |\ | | | | | | | | | | tarun018-Mess | ||||
| | * | Fix Issue #1634 : Shows XMPP URI as links. | Tarun | 2016-02-29 | 1 | -0/+10 |
| | | | | | | | | | | | | Shows XMPP URI as links, other than Web URL's and Email Addresses. Also performs respective actions on clicking XMPP URI. | ||||
| * | | show host in file size checker | Daniel Gultsch | 2016-03-04 | 1 | -1/+14 |
| | | | |||||
| * | | don't automatically crop avatar | Daniel Gultsch | 2016-03-04 | 1 | -22/+40 |
| | | | |||||
| * | | allow to copy original url even while downloading. fixes #1743 | Daniel Gultsch | 2016-03-04 | 1 | -6/+9 |
| | | | |||||
* | | | Merge branch 'siacs/master' into development | Christian S | 2016-03-04 | 11 | -102/+206 |
|\| | | |||||
| * | | don't break with srcoll events on empty message lists | Daniel Gultsch | 2016-03-03 | 1 | -2/+7 |
| | | | |||||
| * | | expert option to treat vibrate as silent mode for XA. fixes #1530 | Daniel Gultsch | 2016-03-01 | 1 | -6/+9 |
| | | | |||||
| * | | properly persist accepted crypto targets | Daniel Gultsch | 2016-03-01 | 1 | -5/+1 |
| | | | |||||
| * | | let users confirm each member in a conference even if that contact is ↵ | Daniel Gultsch | 2016-03-01 | 2 | -16/+38 |
| | | | | | | | | | | | | already trusted | ||||
| * | | refactored omemo to take multiple recipients | Daniel Gultsch | 2016-02-29 | 2 | -77/+100 |
| | | | |||||
| * | | rename purge keys positive button to 'purge keys' | Daniel Gultsch | 2016-02-28 | 1 | -1/+1 |
| | | | |||||
| * | | always search offline contacts as well. fixes #1653 | Daniel Gultsch | 2016-02-27 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-02-27 | 2 | -0/+33 |
| |\ \ | |||||
| | * \ | Merge pull request #1721 from fiaxh/export_logs_storage_permission | Daniel Gultsch | 2016-02-27 | 2 | -0/+33 |
| | |\ \ | | | | | | | | | | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M | ||||
| | | * | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M | fiaxh | 2016-02-24 | 2 | -0/+33 |
| | | | | | |||||
| * | | | | changed single_account config into more simple lock_settings | Daniel Gultsch | 2016-02-27 | 7 | -7/+28 |
| |/ / / | |||||
* | | | | bug fixes | Christian S | 2016-02-27 | 1 | -2/+1 |
| | | | | |||||
* | | | | Merge branch 'siacs/master' into development | Christian S | 2016-02-27 | 8 | -24/+63 |
|\| | | | |||||
| * | | | hide add account icons when single_account is set to true | Daniel Gultsch | 2016-02-24 | 1 | -0/+3 |
| | | | | |||||
| * | | | optionally lock conference domains as well and hide known domains in ui | Daniel Gultsch | 2016-02-24 | 5 | -17/+39 |
| | | | | |||||
| * | | | made hard coded choice for encryptions more flexible and disable parsing | Daniel Gultsch | 2016-02-24 | 2 | -5/+7 |
| | |/ | |/| | |||||
| * | | Merge pull request #1715 from fiaxh/gpg_decryption_failed | Daniel Gultsch | 2016-02-24 | 1 | -0/+13 |
| |\ \ | | | | | | | | | PGP Retry decryption from message menu | ||||
| | * | | Retry decryption from message menu | fiaxh | 2016-02-23 | 1 | -0/+13 |
| | |/ | |||||
* | | | Merge branch 'siacs/master' into development | Christian S | 2016-02-23 | 2 | -20/+35 |
|\| | | |||||
| * | | set noMessagesLeftOnServer before conference configuration fetch | Daniel Gultsch | 2016-02-23 | 1 | -1/+0 |
| |/ | |||||
| * | properly trigger show load more messages in mucs | Daniel Gultsch | 2016-02-22 | 1 | -2/+10 |
| | | |||||
| * | turned muc errors into enum. added error codes for service shutdown | Daniel Gultsch | 2016-02-22 | 1 | -11/+16 |
| | | |||||
| * | show load more messages when auto loading is disabled and messages are still ↵ | Daniel Gultsch | 2016-02-21 | 1 | -6/+10 |
| | | | | | | | | left on server | ||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-20 | 6 | -33/+94 |
|\| | |||||
| * | skip avatar ui when pep is not available. fixes #1706 | Daniel Gultsch | 2016-02-19 | 1 | -5/+5 |
| | | |||||
| * | don't reset whisper on reInit. fixes #1637 | Daniel Gultsch | 2016-02-19 | 1 | -3/+0 |
| | | |||||
| * | only offer message correction for the very last message | Daniel Gultsch | 2016-02-17 | 1 | -3/+6 |
| | |