aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Message.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-0/+8
|\
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-0/+8
* | Imports organizedsteckbrief2016-02-121-1/+0
* | Compilation errors and merge mixups fixedsteckbrief2016-02-111-1/+1
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-26/+111
|\|
| * try to make in-valid-session detection work for pgpDaniel Gultsch2016-01-291-3/+10
| * Correct uuid check according to RFC 4122fiaxh2016-01-051-1/+1
| * rely on message id if message id is uuid and pgp encryption was used to dedup...Daniel Gultsch2015-12-041-1/+3
| * Show status message when contact requests presenceSam Whited2015-12-021-1/+1
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-1/+1
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-2/+2
| * make unread status and notifications presistent across restartsDaniel Gultsch2015-10-141-7/+9
| * Issues with URLs with multiple dots in file. fixes #1373Daniel Gultsch2015-09-041-7/+15
| * Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub2015-08-011-2/+2
| * improved 'next encryption' selectionDaniel Gultsch2015-07-311-1/+1
| * Fix session logic: enforce same type of encryptionAndreas Straub2015-07-301-0/+31
| * Tag carbon messages in parser, adapt session logicAndreas Straub2015-07-291-3/+21
| * Refactor out inner classes, cache trust storeAndreas Straub2015-07-291-2/+2
| * removed recursion in message.getMerged*()Daniel Gultsch2015-07-281-13/+19
| * Don't merge messages with different trust statusesAndreas Straub2015-07-191-1/+7
| * Show trust status of messages' originating sessionAndreas Straub2015-07-191-0/+4
| * Overhauled Message taggingAndreas Straub2015-07-191-9/+10
| * Tag messages with originating sessionAndreas Straub2015-07-191-0/+4
| * Reworked axolotl protocol layerAndreas Straub2015-07-191-10/+4
| * CryptoNext persistance layer mockupAndreas Straub2015-07-191-0/+13
| * account for downloaded http files in dup checkerDaniel Gultsch2015-07-181-8/+18
| * renamed downloadable to transferableDaniel Gultsch2015-07-101-12/+12
| * refactored sendMessage and merged with resendMessageDaniel Gultsch2015-07-051-0/+20
| * also offer http download for some 'well known extensions'Daniel Gultsch2015-07-021-1/+2
| * refactored message context menuDaniel Gultsch2015-07-021-1/+1
| * changed mime type handlingDaniel Gultsch2015-07-011-29/+56
| * made httpconnection (download) ready all kind of filesfeature/http_uploadDaniel Gultsch2015-06-301-53/+55
| * refactored bodyContainsDownloadable to be more flexibleDaniel Gultsch2015-06-301-33/+35
| * initial http upload supportDaniel Gultsch2015-06-291-0/+8
| * changed paragraph dividerDaniel Gultsch2015-06-101-1/+1
| * added mam stuff to new message parserDaniel Gultsch2015-05-201-1/+1
| * made white space check in bodyContainsDownloadable less aggresiveDaniel Gultsch2015-05-161-1/+1
| * use zero width white space as message seperatorDaniel Gultsch2015-05-131-1/+1
| * avoid using paragraph style breaks by accidentDaniel Gultsch2015-05-111-1/+3
| * add a little bit of space between merged messages.Daniel Gultsch2015-05-111-1/+1
| * optimized heart render code a bitDaniel Gultsch2015-05-101-4/+1
| * added white heart to new rendering as wellDaniel Gultsch2015-05-101-1/+3
| * paint single unicode hearts as red and slightly largerDaniel Gultsch2015-05-101-32/+40
| * fixed typosiNPUTmice2015-04-131-1/+1
| * Bugfix for issue #1121lookshe2015-04-131-10/+18
* | Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-161-19/+13
* | Fixes FS#38 - Issues with URLs with multiple dots in file namelookshe2015-08-121-7/+18
* | Fixes FS#33 - Get back the commentlookshe2015-08-121-0/+5
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-130/+209
* | check with lowercase to also match JPEG, JPeg ...lookshe2015-04-131-1/+1