Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | made hashtable in roster store jids instead of strings | Daniel Gultsch | 2016-02-28 | 1 | -9/+7 | |
| | | | ||||||
| * | | 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 | 17 | -55/+163 | |
|\ \ \ \ | ||||||
| * | | | | Revert "disallow message correction by default. fixes #1720" | Christian S | 2016-02-27 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | | | | This reverts commit 7fd6a37e670682e5e7cc3c0a4cb1939e09b0f291. | |||||
| * | | | disallow message correction by default. fixes #1720 | Daniel Gultsch | 2016-02-26 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | 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 | 9 | -22/+74 | |
| | | | | ||||||
| * | | | 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 | 3 | -1/+17 | |
| |\ \ | | | | | | | | | PGP Retry decryption from message menu | |||||
| | * | | Retry decryption from message menu | fiaxh | 2016-02-23 | 3 | -1/+17 | |
| | |/ | ||||||
* | | | Merge branch 'siacs/master' into development | Christian S | 2016-02-23 | 9 | -60/+89 | |
|\| | | ||||||
| * | | 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 | |
| | | | ||||||
| * | | made presences object final in contact | Daniel Gultsch | 2016-02-23 | 1 | -5/+1 | |
| |/ | ||||||
| * | 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 | 5 | -37/+51 | |
| | | ||||||
| * | show load more messages when auto loading is disabled and messages are still ↵ | Daniel Gultsch | 2016-02-21 | 2 | -6/+14 | |
| | | | | | | | | left on server | |||||
| * | check for uuid change when decrypting pgp messages | Daniel Gultsch | 2016-02-21 | 1 | -7/+6 | |
| | | ||||||
| * | some mucs may grant voice to visitors in unmoderated rooms | Daniel Gultsch | 2016-02-21 | 1 | -1/+3 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-20 | 17 | -95/+321 | |
|\| | ||||||
| * | change uuid when replacing messages | Daniel Gultsch | 2016-02-20 | 2 | -1/+9 | |
| | | ||||||
| * | decrypt pgp message corrections | Daniel Gultsch | 2016-02-19 | 1 | -8/+9 | |
| | | ||||||
| * | 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 | |
| | | ||||||
| * | never parse show in presences as offline | Daniel Gultsch | 2016-02-19 | 2 | -12/+16 | |
| | | ||||||
| * | don't log start reason | Daniel Gultsch | 2016-02-17 | 1 | -1/+0 | |
| | | ||||||
| * | only offer message correction for the very last message | Daniel Gultsch | 2016-02-17 | 4 | -8/+37 | |
| | | ||||||
| * | fixed regression that caused messages in muc not being send | Daniel Gultsch | 2016-02-17 | 2 | -7/+8 | |
| | | ||||||
| * | log reason why otr message won't be parsed | Daniel Gultsch | 2016-02-16 | 1 | -1/+2 | |
| | | ||||||
| * | fixed regression that caused ui to redraw a lot | Daniel Gultsch | 2016-02-16 | 1 | -4/+8 | |
| | | ||||||
| * | made clear that archiving preferences are server side | Daniel Gultsch | 2016-02-16 | 1 | -1/+1 | |
| | | ||||||
| * | added setting to opt-out of message correction. renamed preferences and ↵ | Daniel Gultsch | 2016-02-16 | 4 | -3/+13 | |
| | | | | | | | | options to settings | |||||
| * | added some OTR logging | Daniel Gultsch | 2016-02-16 | 2 | -5/+14 | |
| | | ||||||
| * | basic support for XEP-0308: Last Message Correction. fixes #864 | Daniel Gultsch | 2016-02-15 | 10 | -39/+200 | |
| | | ||||||
| * | removed unnecessary conditions when sending read marker | Daniel Gultsch | 2016-02-15 | 1 | -5/+1 | |
| | | ||||||
| * | add missing type='submit' attribute to enable push form | Daniel Gultsch | 2016-02-15 | 1 | -0/+1 | |
| | | ||||||
| * | only show load more messages button when mam is available | Daniel Gultsch | 2016-02-14 | 2 | -1/+6 | |
| | | | | | | | | also update ui after that button has been pressed. fixes #1695 | |||||
| * | fixed server info push not showing up when unavailable | Daniel Gultsch | 2016-02-14 | 1 | -2/+2 | |
| | | ||||||
* | | try to automatically rejoin muc after beeing kicked | Christian S | 2016-02-14 | 1 | -1/+2 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-14 | 8 | -54/+240 | |
|\| | ||||||
| * | optional mode to close tcp connection when going into background | Daniel Gultsch | 2016-02-14 | 3 | -29/+63 | |
| | | | | | | | | acts only when push is available. disable all non-push accounts to test properly | |||||
| * | send push enable to server. simplified logging | Daniel Gultsch | 2016-02-13 | 3 | -2/+22 | |
| | |