aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (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-2611-158/+490
|\
| * sync around individual calls instead of synchronizing entire objectDaniel Gultsch2016-05-191-49/+79
| * remove unwanted 'use previous encryption' lookupDaniel Gultsch2016-05-191-22/+1
| * also save form elements in disco storageDaniel Gultsch2016-05-191-2/+56
| * don't NPE on rare race condition while fetching MAMDaniel Gultsch2016-05-191-0/+9
| * improved ordering of muc participantsDaniel Gultsch2016-05-171-2/+23
| * refactored muc item parsing to also parse muc status messagesDaniel Gultsch2016-05-171-8/+4
| * offer offline members to be invited againDaniel Gultsch2016-05-171-2/+16
| * change affiliation for in memory users that are currently not joined in a con...Daniel Gultsch2016-05-161-3/+5
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-161-45/+129
| * use the same typo in both saving disco and reading discoDaniel Gultsch2016-05-151-1/+2
| * escape HTML in OTR messages if other client is PidginDaniel Gultsch2016-05-151-1/+1
| * don't show duplicate status message in contact detailsDaniel Gultsch2016-05-131-3/+3
| * only default to omemo when all our devices support itDaniel Gultsch2016-05-131-0/+1
| * show presence of other resources as templateDaniel Gultsch2016-05-133-0/+35
| * make omemo default when all resources support itDaniel Gultsch2016-05-123-14/+36
| * always show download button when link is encryptedDaniel Gultsch2016-05-101-5/+1
| * report host-account as account state in UIDaniel Gultsch2016-05-101-1/+4
| * report bind failure as account stateDaniel Gultsch2016-05-051-1/+4
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-2/+2
| * fixed presence template dedup for 'online' statusDaniel Gultsch2016-05-031-1/+2
| * removed unused config variablesDaniel Gultsch2016-04-272-6/+2
| * prevent user from accidentally changing password after using magic createDaniel Gultsch2016-04-261-0/+1
| * show status messages in contact detailsDaniel Gultsch2016-04-231-0/+14
| * expert setting to manually change presenceDaniel Gultsch2016-04-226-50/+132
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-232-3/+15
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-181-12/+0
|\| |
* | | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-172-1/+8
|\ \ \ | | |/ | |/|
| * | always notify by default in conferencesDaniel Gultsch2016-04-141-1/+1
| * | return own jid as true counterpart on self messages in mucDaniel Gultsch2016-04-131-0/+3
| * | don't show contact details when in conversations with selfDaniel Gultsch2016-04-091-0/+4
* | | Merge tag '1.11.3' into trz/rebaselookshe2016-04-054-17/+45
|\| |
| * | add methods to check max file size for http uploadDaniel Gultsch2016-03-312-1/+18
| * | save otr fingerprint in messageDaniel Gultsch2016-03-311-2/+2
| * | include form fields into caps hash calculationDaniel Gultsch2016-03-311-2/+17
| * | made setting aes keys in DownloadableFile more readableDaniel Gultsch2016-03-311-12/+8
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-1/+1
|\ \ \ | | |/ | |/|
* | | 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/rebase' into trz/merge_1.11.1trz/merge_1.11.1lookshe2016-03-201-9/+31
|\ \ \
| * | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-9/+31
| |\| |
* | | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-11/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | simplified getUsers(max) codeDaniel Gultsch2016-03-131-11/+2
* | | 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-122-10/+23
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-112-106/+3
|\ \ \ | | |/ | |/|
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-085-36/+118
|\ \ \ | | |/ | |/|
| * | mark oob messages and always display download buttonDaniel Gultsch2016-03-041-3/+15
| * | add a few more know file extensionsDaniel Gultsch2016-03-042-6/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 11:34:53 +0000