aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/parser (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-264-27/+112
|\
| * update ui after affiliation changesDaniel Gultsch2016-05-211-0/+3
| * resetting fetch status error when mutual subscription is reestablishedshow_members_in_conferenceDaniel Gultsch2016-05-192-1/+18
| * improved ordering of muc participantsDaniel Gultsch2016-05-171-1/+1
| * refactored muc item parsing to also parse muc status messagesDaniel Gultsch2016-05-173-5/+36
| * change affiliation for in memory users that are currently not joined in a con...Daniel Gultsch2016-05-161-1/+3
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-162-11/+4
| * escape HTML in OTR messages if other client is PidginDaniel Gultsch2016-05-151-3/+40
| * log incoming iq requestsDaniel Gultsch2016-05-151-0/+5
| * do not process self presenceDaniel Gultsch2016-05-131-2/+2
| * do not show last-seen metric in UIDaniel Gultsch2016-05-103-12/+4
| * don't request disco from selfDaniel Gultsch2016-04-281-1/+1
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-1/+2
* | 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#136trz/merge_1.10.0lookshe2016-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.4trz/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 23:22:13 +0000