aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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.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
| * | 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
* | | Implements: FS#142 - Fix Conference notificationslookshe2016-03-061-4/+4
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-4/+12
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-4/+0
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-286-28/+61
|\| |
| * | 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
| * | | 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
* | | Reviewed commit for FS#34 after mergesteckbrief2016-02-242-2/+2
* | | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-232-20/+0
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-224-21/+100
|\| |
| * | some mucs may grant voice to visitors in unmoderated roomsDaniel Gultsch2016-02-211-1/+3
| * | 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
* | | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-167-50/+410
|\| |
| * | 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
| | * | Generate capHash from any discovery resultStephen Paul Weber2016-01-231-4/+80
| | * | Factor out a representation of XEP-0030 resultsStephen Paul Weber2016-01-231-0/+84
| * | | re-read common name from certificates on startupDaniel Gultsch2016-02-021-2/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 09:10:00 +0000