aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Conversation.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-261-29/+10
|\
| * 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
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-0/+1
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-181-12/+0
|\| |
* | | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-1/+5
|\ \ \ | | |/ | |/|
| * | always notify by default in conferencesDaniel Gultsch2016-04-141-1/+1
| * | don't show contact details when in conversations with selfDaniel Gultsch2016-04-091-0/+4
* | | Added method to get body from message if hasMeCommand and harmonized extracti...lookshe2016-03-121-1/+1
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-5/+1
|\ \ \ | | |/ | |/|
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-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
* | | Implements: FS#142 - Fix Conference notificationslookshe2016-03-061-4/+4
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-3/+7
|\| |
| * | made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-3/+7
* | | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-231-12/+0
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-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 tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-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
* | | Imports organizedsteckbrief2016-02-121-1/+1
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-1/+2
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-64/+129
|\| |
| * | added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+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
| * | avoid duplicate messages when sending files to mucs. fixes #1635Daniel Gultsch2016-01-061-2/+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
| * | 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
| * | Decrypt PGP messages in backgroundfiaxh2015-10-281-0/+1
| * | fixed read conversations showing up as notifications after a restartDaniel Gultsch2015-10-211-5/+4
| * | make unread status and notifications presistent across restartsDaniel Gultsch2015-10-141-7/+21
| * | added missing type='submit' to mam queriesDaniel Gultsch2015-09-151-2/+2
| * | fixed bug that prevented newly opened conversations to load the entire histor...Daniel Gultsch2015-08-301-0/+4
| * | be more restrictive about marking messages as sent_received in muc parserDaniel Gultsch2015-08-261-5/+16
| * | bugfix: next encryption is now being properly detected1.6.2Daniel Gultsch2015-08-231-2/+2
| * | improved 'next encryption' selectionDaniel Gultsch2015-07-311-27/+36
| * | treat private, non-anonymous mucs like 1:1 chats notification wiseDaniel Gultsch2015-07-221-0/+7
| * | Fetch bundles on-demand, encrypt in backgroundAndreas Straub2015-07-191-3/+3
| * | avoid unnessary muc mam queries when message count is 0 after subjectDaniel Gultsch2015-06-021-0/+6
| * | renamed OtrEngine to OtrServiceDaniel Gultsch2015-05-261-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 02:09:25 +0000