aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Conversation.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-301-1/+1
|\
| * Revert "always notify by default in conferences"Daniel Gultsch2016-05-291-1/+1
* | don't make OMEMO defaultChristian Schneppe2016-05-221-1/+2
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-221-0/+15
|\|
| * show first unread message on top after reinitDaniel Gultsch2016-05-221-0/+15
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-201-22/+1
|\|
| * remove unwanted 'use previous encryption' lookupDaniel Gultsch2016-05-191-22/+1
| * only default to omemo when all our devices support itDaniel Gultsch2016-05-131-0/+1
| * make omemo default when all resources support itDaniel Gultsch2016-05-121-7/+8
* | only default to omemo when all our devices support itDaniel Gultsch2016-05-131-0/+1
* | make omemo default when all resources support itDaniel Gultsch2016-05-131-7/+8
* | 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-091-0/+4
|\|
| * don't show contact details when in conversations with selfDaniel Gultsch2016-04-091-0/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-17/+75
|\|
| * let users confirm each member in a conference even if that contact is already...Daniel Gultsch2016-03-011-9/+63
| * refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-8/+12
* | Merge branch 'siacs/master' into developmentChristian S2016-02-271-3/+7
|\|
| * made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-3/+7
* | Merge branch 'siacs/master' into developmentChristian S2016-02-201-4/+34
|\|
| * only offer message correction for the very last messageDaniel Gultsch2016-02-171-4/+11
| * added some OTR loggingDaniel Gultsch2016-02-161-4/+7
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-0/+20
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-041-1/+29
|\|
| * 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-041-0/+12
| * add more fault tolerant checks for messages left on serverDaniel Gultsch2016-02-041-0/+9
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-1/+1
|\|
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-101-3/+25
|\|
| * 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
| * avoid duplicate messages when sending files to mucs. fixes #1635Daniel Gultsch2016-01-061-2/+10
* | copy commitsChristian S2015-12-281-1/+10
|\|
| * fixed stuck at omemo encryption when x509 verification is being usedDaniel Gultsch2015-12-271-7/+7
| * only offer plain and omemo encryption when x509 verification is enabledDaniel Gultsch2015-12-191-1/+10
* | copy commitsChristian S2015-12-161-1/+1
|\|
| * splite PARANOIA_MODE into three different optionsDaniel Gultsch2015-12-141-1/+1
| * get rid of lastMessageTransmitted in favor of db queryDaniel Gultsch2015-12-111-24/+6
| * introduced build-time paranoia mode that disables unencrypted chats and force...Daniel Gultsch2015-12-011-2/+9
* | get rid of lastMessageTransmitted in favor of db queryDaniel Gultsch2015-12-121-24/+6
* | introduced build-time paranoia mode that disables unencrypted chats a…Daniel Gultsch2015-12-041-2/+9
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-311-0/+1
|\|
| * Decrypt PGP messages in backgroundfiaxh2015-10-281-0/+1
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-221-5/+4
|\|
| * fixed read conversations showing up as notifications after a restartDaniel Gultsch2015-10-211-5/+4
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-161-7/+21
|\|
| * make unread status and notifications presistent across restartsDaniel Gultsch2015-10-141-7/+21
* | copy commitsChristian S2015-09-181-2/+2
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 01:42:04 +0000