Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | only resend files smaller than 1 MiB automatically | Christian S | 2016-03-05 | 2 | -2/+4 |
| | |||||
* | resend failed filetransfers automatically | Christian S | 2016-03-05 | 1 | -2/+6 |
| | |||||
* | show always buttons instead of links for files | Christian S | 2016-03-05 | 1 | -1/+2 |
| | |||||
* | updated strings | Christian S | 2016-03-05 | 2 | -0/+4 |
| | |||||
* | reformated code | Christian S | 2016-03-05 | 1 | -64/+64 |
| | |||||
* | Merge branch 'siacs/master' into development | Christian S | 2016-03-05 | 17 | -96/+175 |
|\ | |||||
| * | 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 | 2 | -1/+15 |
| | | | |||||
| * | | mark oob messages and always display download button | Daniel Gultsch | 2016-03-04 | 4 | -6/+30 |
| | | | |||||
| * | | don't automatically crop avatar | Daniel Gultsch | 2016-03-04 | 8 | -22/+49 |
| | | | |||||
| * | | add a few more know file extensions | Daniel Gultsch | 2016-03-04 | 4 | -10/+13 |
| | | | |||||
| * | | allow to copy original url even while downloading. fixes #1743 | Daniel Gultsch | 2016-03-04 | 1 | -6/+9 |
| | | | |||||
* | | | allow users to edit settings and accounts | Christian S | 2016-03-04 | 1 | -2/+2 |
| | | | |||||
* | | | updated strings | Christian S | 2016-03-04 | 1 | -2/+6 |
| | | | |||||
* | | | Merge branch 'siacs/master' into development | Christian S | 2016-03-04 | 26 | -241/+541 |
|\| | | |||||
| * | | 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 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | 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 | 19 | -56/+169 |
|\ \ \ \ | |||||
| * | | | | Revert "disallow message correction by default. fixes #1720" | Christian S | 2016-02-27 | 2 | -2/+2 |
| |/ / / | | | | | | | | | | | | | This reverts commit 7fd6a37e670682e5e7cc3c0a4cb1939e09b0f291. | ||||
| * | | | 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 |
| | | | |||||
* | | | Merge branch 'siacs/master' into development | Christian S | 2016-02-23 | 10 | -62/+92 |
|\| | | |||||
| * | | 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 |
| | |