aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Imports organizedsteckbrief2016-02-124-7/+2
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-112-2/+3
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-119-460/+636
|\| |
| * | refactored user handling in conferences. show try again button when conferenc...Daniel Gultsch2016-02-011-84/+57
| * | try to make in-valid-session detection work for pgpDaniel Gultsch2016-01-291-3/+10
| |/
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+1
| * made constructor private in Account entityDaniel Gultsch2016-01-161-5/+1
| * added Config.java variable to change the default notification behaviour to al...Daniel Gultsch2016-01-081-1/+1
| * show per conference notification settings in details activityDaniel Gultsch2016-01-081-1/+15
| * Merge pull request #1641 from fiaxh/uuid-fixDaniel Gultsch2016-01-081-1/+1
| |\
| | * Correct uuid check according to RFC 4122fiaxh2016-01-051-1/+1
| * | avoid duplicate messages when sending files to mucs. fixes #1635Daniel Gultsch2016-01-061-2/+10
| |/
| * only report error after third unsuccesful attempt to connectDaniel Gultsch2016-01-041-1/+1
| * fixed stuck at omemo encryption when x509 verification is being usedDaniel Gultsch2015-12-271-7/+7
| * use presence name not server name when verification is being usedDaniel Gultsch2015-12-191-3/+3
| * only offer plain and omemo encryption when x509 verification is enabledDaniel Gultsch2015-12-191-1/+10
| * prefer server name over address book name when x509 verification is being usedDaniel Gultsch2015-12-191-1/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 14:12:17 +0000