Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'siacs/master' into development | Christian S | 2016-03-04 | 30 | -292/+546 |
|\ | |||||
| * | version bump to 1.11.0-beta.2 | Daniel Gultsch | 2016-03-03 | 1 | -2/+2 |
| | | |||||
| * | moved avatarfetcher reset code to bind | Daniel Gultsch | 2016-03-03 | 1 | -8/+8 |
| | | |||||
| * | avoid unnecessary disconnect. prevent NetworkOnMainThreadException | Daniel Gultsch | 2016-03-03 | 1 | -3/+3 |
| | | |||||
| * | 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 | 4 | -7/+26 |
| | | |||||
| * | removed unused config variable | Daniel Gultsch | 2016-03-01 | 1 | -4/+0 |
| | | |||||
| * | properly persist accepted crypto targets | Daniel Gultsch | 2016-03-01 | 1 | -5/+1 |
| | | |||||
| * | version bump to 1.11.0-beta, changelog and updated readme | Daniel Gultsch | 2016-03-01 | 3 | -9/+30 |
| | | |||||
| * | let users confirm each member in a conference even if that contact is ↵ | Daniel Gultsch | 2016-03-01 | 6 | -52/+137 |
| | | | | | | | | already trusted | ||||
| * | use correct jid when leaving a conference. fixes #1732 | Daniel Gultsch | 2016-02-29 | 2 | -6/+6 |
| | | |||||
| * | refactored omemo to take multiple recipients | Daniel Gultsch | 2016-02-29 | 12 | -173/+320 |
| | | |||||
| * | rename purge keys positive button to 'purge keys' | Daniel Gultsch | 2016-02-28 | 1 | -1/+1 |
| | | |||||
| * | made hashtable in roster store jids instead of strings | Daniel Gultsch | 2016-02-28 | 1 | -9/+7 |
| | | |||||
| * | removed unneeded proguard files | Daniel Gultsch | 2016-02-27 | 2 | -47/+0 |
| | | |||||
| * | 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 | 3 | -1/+34 |
| |\ | |||||
| | * | Merge pull request #1721 from fiaxh/export_logs_storage_permission | Daniel Gultsch | 2016-02-27 | 3 | -1/+34 |
| | |\ | | | | | | | | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M | ||||
| | | * | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M | fiaxh | 2016-02-24 | 2 | -0/+33 |
| | | | | |||||
| | | * | No possibility of multiple invocation of log export | fiaxh | 2016-02-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | changed single_account config into more simple lock_settings | Daniel Gultsch | 2016-02-27 | 8 | -8/+29 |
| |/ / | |||||
* | | | bug fixes | Christian S | 2016-02-27 | 1 | -2/+1 |
| | | | |||||
* | | | Merge branch 'siacs/master' into development | Christian S | 2016-02-27 | 21 | -58/+175 |
|\ \ \ | |||||
| * | | | Revert "disallow message correction by default. fixes #1720" | Christian S | 2016-02-27 | 2 | -2/+2 |
| |/ / | | | | | | | | | | This reverts commit 7fd6a37e670682e5e7cc3c0a4cb1939e09b0f291. | ||||
| * | | version bump to 1.10.1 and changelog | Daniel Gultsch | 2016-02-26 | 2 | -2/+6 |
| | | | |||||
| * | | disallow message correction by default. fixes #1720 | Daniel Gultsch | 2016-02-26 | 2 | -2/+2 |
| | | | |||||
| * | | execute pending mam queries every time we come online | Daniel Gultsch | 2016-02-26 | 1 | -1/+1 |
| | | | |||||
| * | | hide add account icons when single_account is set to true | Daniel Gultsch | 2016-02-24 | 2 | -1/+5 |
| | | | |||||
| * | | optionally lock conference domains as well and hide known domains in ui | Daniel Gultsch | 2016-02-24 | 10 | -22/+76 |
| | | | |||||
| * | | made hard coded choice for encryptions more flexible and disable parsing | Daniel Gultsch | 2016-02-24 | 6 | -26/+66 |
| | | | |||||
| * | | Merge pull request #1715 from fiaxh/gpg_decryption_failed | Daniel Gultsch | 2016-02-24 | 5 | -2/+21 |
| |\ \ | | | | | | | | | PGP Retry decryption from message menu | ||||
| | * | | Retry decryption from message menu | fiaxh | 2016-02-23 | 5 | -2/+21 |
| | |/ | |||||
* | | | updated German translation | Christian S | 2016-02-23 | 1 | -1/+2 |
| | | | |||||
* | | | removed push from changlog | Christian S | 2016-02-23 | 1 | -2/+0 |
| | | | | | | | | | it isn't available in Pix-Art Messenger | ||||
* | | | Merge branch 'siacs/master' into development | Christian S | 2016-02-23 | 12 | -64/+97 |
|\| | | |||||
| * | | set noMessagesLeftOnServer before conference configuration fetch | Daniel Gultsch | 2016-02-23 | 2 | -2/+2 |
| | | | |||||
| * | | update notification after message correction | Daniel Gultsch | 2016-02-23 | 1 | -0/+1 |
| | | | |||||
| * | | reset pending subscription request when receiving roster update | Daniel Gultsch | 2016-02-23 | 1 | -0/+2 |
| | | | |||||
| * | | Revert "disable predexing on travis" | Daniel Gultsch | 2016-02-23 | 2 | -103/+95 |
| | | | | | | | | | | | | This reverts commit ad063d00ccbfc4a9c72c707d11b13a2da0912d28. | ||||
| * | | disable predexing on travis | Daniel Gultsch | 2016-02-23 | 2 | -95/+103 |
| | | | |||||
| * | | made presences object final in contact | Daniel Gultsch | 2016-02-23 | 1 | -5/+1 |
| | | | |||||
| * | | fixed typo in travis.yml | Daniel Gultsch | 2016-02-23 | 1 | -1/+1 |
| | | | |||||
| * | | fixed formating in travis config | Daniel Gultsch | 2016-02-23 | 1 | -1/+1 |
| | | | |||||
| * | | added remark that users don't need their own app server | Daniel Gultsch | 2016-02-23 | 1 | -1/+3 |
| | | | |||||
| * | | tell travis to build free version | Daniel Gultsch | 2016-02-23 | 1 | -0/+2 |
| | | | |||||
| * | | update build instructions in readme | Daniel Gultsch | 2016-02-23 | 1 | -2/+4 |
| |/ | |||||
| * | 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 | 6 | -39/+54 |
| | | |||||
| * | version bump to 1.10.0 | Daniel Gultsch | 2016-02-21 | 1 | -2/+3 |
| | | |||||
| * | show load more messages when auto loading is disabled and messages are still ↵ | Daniel Gultsch | 2016-02-21 | 2 | -6/+14 |
| | | | | | | | | left on server |