Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update CHANGELOG.md | Christian S | 2016-03-13 | 1 | -0/+2 |
| | |||||
* | remove old code | Christian S | 2016-03-13 | 1 | -10/+0 |
| | |||||
* | Merge branch 'siacs/master' into development | Christian S | 2016-03-13 | 9 | -20/+51 |
|\ | |||||
| * | 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 |
| | | |||||
| * | mention mod_smacks_offline and ejabberds settings in readme | Daniel Gultsch | 2016-03-10 | 1 | -0/+6 |
| | | |||||
| * | version bump to 1.11.0 | Daniel Gultsch | 2016-03-07 | 1 | -2/+2 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-03-06 | 28 | -82/+272 |
| | | |||||
| * | 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 | 2 | -1/+15 |
| | | |||||
* | | version bump | Christian S | 2016-03-05 | 1 | -1/+1 |
| | | |||||
* | | only resend files smaller than 1 MiB automatically | Christian S | 2016-03-05 | 2 | -2/+4 |
| | | |||||
* | | updated changelog | Christian S | 2016-03-05 | 1 | -0/+1 |
| | | |||||
* | | 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 | 18 | -98/+177 |
|\| | |||||
| * | version bump to 1.11.0-beta.3 | Daniel Gultsch | 2016-03-05 | 1 | -2/+2 |
| | | |||||
| * | 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 'development' of https://github.com/kriztan/Pix-Art-Messenger ↵ | Christian S | 2016-03-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | into development | ||||
| * | | | Update CHANGELOG.md | Christian S | 2016-02-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | 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 |
| | | | | |