aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-09-161-1/+5
|\
| * hint that you should use latest version of ejabberdDaniel Gultsch2016-09-161-1/+5
* | pulled translations from transifexDaniel Gultsch2016-09-1610-4/+68
* | dont show delete file button when outside conversations directory. fixes #2007Daniel Gultsch2016-09-161-2/+5
|/
* Merge branch 'Mishiranu-master'Daniel Gultsch2016-09-162-37/+56
|\
| * Merge branch 'master' of https://github.com/Mishiranu/Conversations into Mish...Daniel Gultsch2016-09-162-37/+56
|/|
| * Allow text selection with multiple links in messageMishiranu2016-09-162-37/+56
* | use history clear date as minimum date for mamDaniel Gultsch2016-09-165-10/+40
* | deal with null bodys in message previewDaniel Gultsch2016-09-151-5/+3
* | store jid if it was changed during bindDaniel Gultsch2016-09-142-3/+8
|/
* Merge pull request #2018 from SamWhited/sasl_anonymousDaniel Gultsch2016-09-142-1/+32
|\
| * Use JID returned by the server during bindSam Whited2016-09-121-1/+1
| * Support ANONYMOUS SASLSam Whited2016-09-122-0/+31
* | Merge branch 'pebble-notification' of https://github.com/danielegobbetti/Conv...Daniel Gultsch2016-09-121-1/+1
|\ \
| * | Use the last message in the content text instead of the first.Daniele Gobbetti2016-09-111-1/+1
| |/
* | don't use display version of jidsDaniel Gultsch2016-09-122-95/+99
* | remember scroll position on rotate. fixes #2011Daniel Gultsch2016-09-122-11/+57
|/
* Merge pull request #2014 from licaon-kter/patch-1Daniel Gultsch2016-09-111-1/+1
|\
| * Fix typolicaon-kter2016-09-101-1/+1
|/
* add xep-0084 to docs/xep.md. wikipedia was complaining about it missingDaniel Gultsch2016-09-101-0/+1
* download own vcard avatar if none is set. fixes #2008Daniel Gultsch2016-09-094-11/+23
* version bump to 1.14.1 + changelog1.14.1Daniel Gultsch2016-09-092-2/+6
* pulled translations from transifexDaniel Gultsch2016-09-0814-2/+109
* provide hint on why conference can not be encryptedDaniel Gultsch2016-09-084-2/+74
* Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-09-071-1/+4
|\
| * add faq about grayed out omemoDaniel Gultsch2016-09-071-1/+4
* | be a bit more careful when deleting and deactivating accountsDaniel Gultsch2016-09-076-22/+47
|/
* show server not found muc errorDaniel Gultsch2016-09-064-2/+11
* remove explicit pebble support. treat as wear deviceDaniel Gultsch2016-09-061-25/+0
* show reply action on wear devicesDaniel Gultsch2016-09-061-2/+4
* don't use fileprovider when opening files on android M and belowDaniel Gultsch2016-09-042-7/+18
* don't crash when correcting waiting pgp encrypted messagesDaniel Gultsch2016-09-041-4/+12
* version bump to 1.14.01.14.0Daniel Gultsch2016-09-021-2/+2
* fixed recreation issues in StartConversationActivityDaniel Gultsch2016-08-313-977/+1031
* fixed typoDaniel Gultsch2016-08-311-2/+2
* don't show duplicate nofications on android 4Daniel Gultsch2016-08-311-15/+14
* broader exception catchersDaniel Gultsch2016-08-302-2/+3
* use file provider for taking picturesDaniel Gultsch2016-08-302-3/+5
* don't show up navigation in startConversation when there are no open conversa...Daniel Gultsch2016-08-301-1/+3
* add more logging to pgp engineDaniel Gultsch2016-08-302-15/+20
* version bump to 1.14.0-beta + changelogDaniel Gultsch2016-08-272-2/+8
* mark conversation as read when swiping a notification with quick reply awayDaniel Gultsch2016-08-272-1/+24
* don't automatically download files and avatars when datasaver is onDaniel Gultsch2016-08-275-5/+18
* bring back connectivity changed events on android nDaniel Gultsch2016-08-271-2/+4
* don't overwrite edited information in editaccount on rotateDaniel Gultsch2016-08-261-1/+3
* don't set notification mode to background when on pauseDaniel Gultsch2016-08-261-6/+0
* add missing depency to gradle fileDaniel Gultsch2016-08-261-0/+1
* wrap dynamic tags into multiple lines. fixes #2003Daniel Gultsch2016-08-265-9/+15
* some multi-window optimizations. set min width to 300Daniel Gultsch2016-08-266-4/+17
* attach contact to notificationDaniel Gultsch2016-08-263-15/+30