aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/parser/MessageParser.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-2/+7
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-091-3/+4
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-1/+6
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-161-1/+1
|\|
* | Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-1/+5
|\ \
| * | save otr fingerprint in messageDaniel Gultsch2016-03-311-4/+7
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-301-0/+3
|\ \ \ | | |/ | |/|
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-4/+10
|\| |
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-3/+17
|\ \ \ | | |/ | |/|
| * | mark oob messages and always display download buttonDaniel Gultsch2016-03-041-1/+5
| * | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-2/+12
* | | Fixes FS#151 - Missing button on image-linkslookshe2016-03-071-2/+1
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-7/+5
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-4/+4
|\| |
| * | made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-4/+3
| * | update notification after message correctionDaniel Gultsch2016-02-231-0/+1
* | | Fixes FS#48 and FS#136lookshe2016-02-281-1/+2
* | | Removed stupid message correctionsteckbrief2016-02-231-35/+0
* | | Removed unnecessary dependencies to XmppConnectionService and added allowMess...steckbrief2016-02-231-1/+1
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-23/+66
|\| |
| * | change uuid when replacing messagesDaniel Gultsch2016-02-201-1/+4
| * | decrypt pgp message correctionsDaniel Gultsch2016-02-191-8/+9
| * | only offer message correction for the very last messageDaniel Gultsch2016-02-171-1/+5
| * | log reason why otr message won't be parsedDaniel Gultsch2016-02-161-1/+2
| * | added setting to opt-out of message correction. renamed preferences and optio...Daniel Gultsch2016-02-161-1/+1
| * | basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-14/+47
* | | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-5/+7
|\| |
| * | prepend instead off append mam messages to conversations when going in reverseDaniel Gultsch2016-02-041-1/+5
| * | count all messages in a queryDaniel Gultsch2016-02-031-4/+2
| * | Revert "get rid of broken totalMessageCount for mam queries"Daniel Gultsch2016-02-031-2/+4
| * | get rid of broken totalMessageCount for mam queriesDaniel Gultsch2016-02-021-4/+2
* | | Fixes FS#135: condition NOT message.isRead() added to check if notification s...steckbrief2016-02-131-1/+1
* | | Imports organizedsteckbrief2016-02-121-2/+2
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-44/+133
|\| |
| * | fixed false set of subject in conference with empty body tagDaniel Gultsch2016-01-311-1/+1
| * | use actual message timestamp instead of delay when updating last seen. fixes ...Daniel Gultsch2015-12-311-3/+4
| * | let message parser not artifically fail on messages with no to attributeDaniel Gultsch2015-12-171-4/+4
| * | set bookmark name to room subject if no subject has been set beforeDaniel Gultsch2015-12-111-2/+10
| * | get rid of lastMessageTransmitted in favor of db queryDaniel Gultsch2015-12-111-6/+1
| * | notify on mam catchup messagesDaniel Gultsch2015-12-101-5/+15
| * | properly clean up timed out mam queriesDaniel Gultsch2015-12-101-1/+1
| * | check for query object as condition to trigger deduplication instead of serverIdDaniel Gultsch2015-12-051-1/+1
| * | parse stanza-id from messagesDaniel Gultsch2015-12-041-3/+19
| * | parse vcard avatars from muc presencesDaniel Gultsch2015-12-031-1/+1
| * | combine multiple message receipts into single messageDaniel Gultsch2015-12-011-6/+7
| * | Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-301-1/+9
| |\ \
| | * | Decrypt PGP messages in backgroundfiaxh2015-10-281-1/+9
| * | | push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-291-1/+1
| |/ /
| * | update last seen in mucs. fixes #1508Daniel Gultsch2015-10-191-1/+5
| * | work with muc services that change the message idDaniel Gultsch2015-10-141-1/+1