aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/parser (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-202-9/+16
|\
* | 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-082-5/+23
|\ \ \ | | |/ | |/|
| * | mark oob messages and always display download buttonDaniel Gultsch2016-03-041-1/+5
| * | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-292-4/+18
* | | Fixes FS#151 - Missing button on image-linkslookshe2016-03-071-2/+1
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-022-10/+8
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-282-13/+17
|\| |
| * | 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
| * | turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-221-9/+13
* | | 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-222-24/+67
|\| |
| * | change uuid when replacing messagesDaniel Gultsch2016-02-201-1/+4
| * | decrypt pgp message correctionsDaniel Gultsch2016-02-191-8/+9
| * | never parse show in presences as offlineDaniel Gultsch2016-02-191-1/+1
| * | 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-163-12/+26
|\| |
| * | catch all axolotl parse exception at once. fixes #1692Daniel Gultsch2016-02-111-5/+4
| * | prepend instead off append mam messages to conversations when going in reverseDaniel Gultsch2016-02-041-1/+5
| * | removed unecessary logging when muc tiles updateDaniel Gultsch2016-02-041-1/+0
| * | 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
| * | refactored disco cache. avoid making duplicate call. check hashDaniel Gultsch2016-02-031-26/+7
| * | Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...Daniel Gultsch2016-02-021-3/+33
| |\ \
| | * | Do disco for caps hashes we have never seenStephen Paul Weber2016-01-241-2/+23
| | * | Fetch cached caps result on new presenceStephen Paul Weber2016-01-241-2/+10
| | * | Use a Presence class for presence informationStephen Paul Weber2016-01-241-1/+2
| * | | get rid of broken totalMessageCount for mam queriesDaniel Gultsch2016-02-021-4/+2
| * | | catch a few NPE when parsing invalid pep nodesDaniel Gultsch2016-02-021-3/+3
* | | | Fixes FS#135: condition NOT message.isRead() added to check if notification s...steckbrief2016-02-131-1/+1
* | | | Imports organizedsteckbrief2016-02-124-7/+2
* | | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-5/+7
* | | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-114-66/+498
|\| | |
| * | | refactored user handling in conferences. show try again button when conferenc...Daniel Gultsch2016-02-011-1/+8
| * | | 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-312-7/+8
| * | let message parser not artifically fail on messages with no to attributeDaniel Gultsch2015-12-171-4/+4
| * | more detailed loggingDaniel Gultsch2015-12-121-2/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 22:55:27 +0000