aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Message.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-137/+32
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-3/+14
|\|
* | Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-2/+2
|\ \
| * | save otr fingerprint in messageDaniel Gultsch2016-03-311-2/+2
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-211-4/+19
|\ \ \ | | |/ | |/|
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-18/+14
|\| |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-9/+31
|\| |
* | | small bugfixeslookshe2016-03-121-0/+3
* | | removed duplicated sourcelookshe2016-03-121-8/+5
* | | Added method to get body from message if hasMeCommand and harmonized extracti...lookshe2016-03-121-9/+22
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-101/+2
|\| |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-587/+0
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-6/+18
|\ \ \ | | |/ | |/|
| * | mark oob messages and always display download buttonDaniel Gultsch2016-03-041-3/+15
| * | add a few more know file extensionsDaniel Gultsch2016-03-041-3/+3
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-0/+1
|\| |
| * | Retry decryption from message menufiaxh2016-02-231-0/+1
* | | Reviewed commit for FS#34 after mergesteckbrief2016-02-241-1/+1
* | | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-231-8/+0
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-5/+48
|\| |
| * | only offer message correction for the very last messageDaniel Gultsch2016-02-171-0/+15
| * | basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-5/+33
* | | Merge tag '1.9.4' into trz/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 18:16:33 +0000