aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Merge pull request #1715 from fiaxh/gpg_decryption_failedDaniel Gultsch2016-02-241-0/+1
| |\
| | * Retry decryption from message menufiaxh2016-02-231-0/+1
* | | Merge branch 'siacs/master' into developmentChristian S2016-02-232-21/+25
|\| |
| * | reset pending subscription request when receiving roster updateDaniel Gultsch2016-02-231-0/+2
| * | made presences object final in contactDaniel Gultsch2016-02-231-5/+1
| |/
| * turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-221-15/+19
| * some mucs may grant voice to visitors in unmoderated roomsDaniel Gultsch2016-02-211-1/+3
* | Merge branch 'siacs/master' into developmentChristian S2016-02-203-20/+97
|\|
| * never parse show in presences as offlineDaniel Gultsch2016-02-191-11/+15
| * only offer message correction for the very last messageDaniel Gultsch2016-02-172-4/+26
| * added some OTR loggingDaniel Gultsch2016-02-161-4/+7
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-152-5/+53
* | optimized subtitle in MUCsChristian S2016-02-061-1/+1
* | match new presence modificationsChristian S2016-02-041-7/+0
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-048-149/+467
|\|
| * prepend instead off append mam messages to conversations when going in reverseDaniel Gultsch2016-02-041-1/+8
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-042-0/+20
| * add more fault tolerant checks for messages left on serverDaniel Gultsch2016-02-041-0/+9
| * cache server capsDaniel Gultsch2016-02-031-1/+18
| * refactored disco cache. avoid making duplicate call. check hashDaniel Gultsch2016-02-033-16/+49
| * Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...Daniel Gultsch2016-02-024-47/+316
| |\
| | * Fetch cached caps result on new presenceStephen Paul Weber2016-01-241-1/+4
| | * Use a Presence class for presence informationStephen Paul Weber2016-01-243-47/+71
| | * Persisitence and loading for ServiceDiscoveryResultStephen Paul Weber2016-01-231-10/+58
| | * Implement toJSON on ServiceDiscoveryResultStephen Paul Weber2016-01-231-0/+34
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 21:28:07 +0000