Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'siacs/master' into development | Christian S | 2016-03-04 | 1 | -17/+75 |
|\ | |||||
| * | let users confirm each member in a conference even if that contact is ↵ | Daniel Gultsch | 2016-03-01 | 1 | -9/+63 |
| | | | | | | | | already trusted | ||||
| * | refactored omemo to take multiple recipients | Daniel Gultsch | 2016-02-29 | 1 | -8/+12 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-27 | 1 | -3/+7 |
|\| | |||||
| * | made hard coded choice for encryptions more flexible and disable parsing | Daniel Gultsch | 2016-02-24 | 1 | -3/+7 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-20 | 1 | -4/+34 |
|\| | |||||
| * | only offer message correction for the very last message | Daniel Gultsch | 2016-02-17 | 1 | -4/+11 |
| | | |||||
| * | added some OTR logging | Daniel Gultsch | 2016-02-16 | 1 | -4/+7 |
| | | |||||
| * | basic support for XEP-0308: Last Message Correction. fixes #864 | Daniel Gultsch | 2016-02-15 | 1 | -0/+20 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-02-04 | 1 | -1/+29 |
|\| | |||||
| * | prepend instead off append mam messages to conversations when going in reverse | Daniel Gultsch | 2016-02-04 | 1 | -1/+8 |
| | | |||||
| * | prevent previoulsly cleared messages from reloading. fixes #1110 | Daniel Gultsch | 2016-02-04 | 1 | -0/+12 |
| | | |||||
| * | add more fault tolerant checks for messages left on server | Daniel Gultsch | 2016-02-04 | 1 | -0/+9 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-23 | 1 | -1/+1 |
|\| | |||||
| * | added config variable to allow non-tls connections | Daniel Gultsch | 2016-01-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-10 | 1 | -3/+25 |
|\| | |||||
| * | added Config.java variable to change the default notification behaviour to ↵ | Daniel Gultsch | 2016-01-08 | 1 | -1/+1 |
| | | | | | | | | always | ||||
| * | show per conference notification settings in details activity | Daniel Gultsch | 2016-01-08 | 1 | -1/+15 |
| | | |||||
| * | avoid duplicate messages when sending files to mucs. fixes #1635 | Daniel Gultsch | 2016-01-06 | 1 | -2/+10 |
| | | |||||
* | | copy commits | Christian S | 2015-12-28 | 1 | -1/+10 |
|\| | |||||
| * | fixed stuck at omemo encryption when x509 verification is being used | Daniel Gultsch | 2015-12-27 | 1 | -7/+7 |
| | | |||||
| * | only offer plain and omemo encryption when x509 verification is enabled | Daniel Gultsch | 2015-12-19 | 1 | -1/+10 |
| | | |||||
* | | copy commits | Christian S | 2015-12-16 | 1 | -1/+1 |
|\| | |||||
| * | splite PARANOIA_MODE into three different options | Daniel Gultsch | 2015-12-14 | 1 | -1/+1 |
| | | |||||
| * | get rid of lastMessageTransmitted in favor of db query | Daniel Gultsch | 2015-12-11 | 1 | -24/+6 |
| | | |||||
| * | introduced build-time paranoia mode that disables unencrypted chats and ↵ | Daniel Gultsch | 2015-12-01 | 1 | -2/+9 |
| | | | | | | | | forces TOR | ||||
* | | get rid of lastMessageTransmitted in favor of db query | Daniel Gultsch | 2015-12-12 | 1 | -24/+6 |
| | | |||||
* | | introduced build-time paranoia mode that disables unencrypted chats a… | Daniel Gultsch | 2015-12-04 | 1 | -2/+9 |
| | | | | | | | | …nd forces TOR | ||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-31 | 1 | -0/+1 |
|\| | |||||
| * | Decrypt PGP messages in background | fiaxh | 2015-10-28 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-22 | 1 | -5/+4 |
|\| | |||||
| * | fixed read conversations showing up as notifications after a restart | Daniel Gultsch | 2015-10-21 | 1 | -5/+4 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-16 | 1 | -7/+21 |
|\| | |||||
| * | make unread status and notifications presistent across restarts | Daniel Gultsch | 2015-10-14 | 1 | -7/+21 |
| | | |||||
* | | copy commits | Christian S | 2015-09-18 | 1 | -2/+2 |
|\| | |||||
| * | added missing type='submit' to mam queries | Daniel Gultsch | 2015-09-15 | 1 | -2/+2 |
| | | | | | | | | | | fixed some nasty inheritance problems along the way fixes #1411 | ||||
* | | Merge pull request #31 from siacs/master | Christian S. | 2015-08-30 | 1 | -0/+4 |
|\| | | | | | copy bugfixes | ||||
| * | fixed bug that prevented newly opened conversations to load the entire ↵ | Daniel Gultsch | 2015-08-30 | 1 | -0/+4 |
| | | | | | | | | history via mam. fixes #1328 | ||||
* | | Version 1.6.5 | Christian S | 2015-08-26 | 1 | -5/+16 |
|\| | |||||
| * | be more restrictive about marking messages as sent_received in muc parser | Daniel Gultsch | 2015-08-26 | 1 | -5/+16 |
| | | |||||
* | | Merge pull request #27 from siacs/development | Christian S. | 2015-08-24 | 1 | -2/+2 |
|\| | | | | | copy commits | ||||
| * | bugfix: next encryption is now being properly detected | Daniel Gultsch | 2015-08-23 | 1 | -2/+2 |
| | | |||||
* | | removed duplicates | Christian S | 2015-08-19 | 1 | -13/+0 |
| | | |||||
* | | Merge pull request #23 from kriztan/Subtitle | Christian S. | 2015-08-18 | 1 | -0/+13 |
|\ \ | | | | | | | modified strings for subtitle typing info | ||||
| * | | add subtitle to ActionBar in chatviews | Christian S | 2015-08-18 | 1 | -0/+13 |
| |/ | | | | | | | | | | | * display typing information in ActionBar as subtitle for single user chats * display participants in ActionBar as subtitle for conferences | ||||
* | | copy commits | Christian S | 2015-08-02 | 1 | -27/+36 |
|\| | |||||
| * | improved 'next encryption' selection | Daniel Gultsch | 2015-07-31 | 1 | -27/+36 |
| | | |||||
* | | changed subtitle a bit | Christian S | 2015-07-23 | 1 | -1/+2 |
| | | |||||
* | | add subtitle to ActionBar in chatviews | Christian S | 2015-07-23 | 1 | -0/+13 |
|\ \ | |/ |/| | | | | | * display typing info in ActionBar as subtitle for single user chats * display participants in ActionBar as subtitle in conferences | ||||
* | | treat private, non-anonymous mucs like 1:1 chats notification wise | Daniel Gultsch | 2015-07-22 | 1 | -0/+7 |
| | |