aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-162-2/+3
|\
| * 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
* | 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-133-14/+36
* | always show download button when link is encryptedDaniel Gultsch2016-05-131-5/+1
* | report host-account as account state in UIDaniel Gultsch2016-05-131-1/+4
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-061-1/+4
|\|
| * report bind failure as account stateDaniel Gultsch2016-05-051-1/+4
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-051-2/+2
|\|
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-2/+2
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into HEADChristian S2016-05-047-56/+150
|\|
| * 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 'refs/remotes/siacs/master' into developmentChristian S2016-04-151-1/+1
|\|
| * always notify by default in conferencesDaniel Gultsch2016-04-141-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-141-0/+3
|\|
| * return own jid as true counterpart on self messages in mucDaniel Gultsch2016-04-131-0/+3
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-091-0/+4
|\|
| * don't show contact details when in conversations with selfDaniel Gultsch2016-04-091-0/+4
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-034-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 branch 'siacs/master' into developmentChristian S2016-03-171-11/+2
|\|
| * simplified getUsers(max) codeDaniel Gultsch2016-03-131-11/+2
* | reformated codeChristian S2016-03-051-64/+64
* | Merge branch 'siacs/master' into developmentChristian S2016-03-052-59/+72
|\|
| * 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
* | Merge branch 'siacs/master' into developmentChristian S2016-03-043-27/+94
|\|
| * let users confirm each member in a conference even if that contact is already...Daniel Gultsch2016-03-011-9/+63
| * use correct jid when leaving a conference. fixes #1732Daniel Gultsch2016-02-291-1/+1
| * refactored omemo to take multiple recipientsDaniel Gultsch2016-02-292-8/+23
| * made hashtable in roster store jids instead of stringsDaniel Gultsch2016-02-281-9/+7
* | Merge branch 'siacs/master' into developmentChristian S2016-02-275-8/+39
|\|
| * optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-243-5/+31
| * made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-3/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 14:17:17 +0000