aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* renamed foreground service preferenceDaniel Gultsch2016-11-303-3/+4
* pulled translations from transifexDaniel Gultsch2016-11-294-0/+5
* better handle the case when same user is joined with multiple nicks in the sa...Daniel Gultsch2016-11-292-8/+26
* pulled translations from transifexDaniel Gultsch2016-11-285-0/+36
* mark conversations as read after receiving blocklist push for that conversationsDaniel Gultsch2016-11-281-0/+9
* allow fingerprint verification via context menuDaniel Gultsch2016-11-287-20/+100
* add support for body paramater in xmpp uriDaniel Gultsch2016-11-282-6/+36
* sent messages from unverified devices show red lockDaniel Gultsch2016-11-281-1/+1
* pulled translations from transifexDaniel Gultsch2016-11-2529-50/+128
* fixed migrations from pre-btbv phaseDaniel Gultsch2016-11-251-3/+7
* Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-11-251-1/+1
|\
| * Merge pull request #2147 from licaon-kter/patch-5Daniel Gultsch2016-11-251-1/+1
| |\
| | * Typo in Readmelicaon-kter2016-11-241-1/+1
| |/
* / changed blind trust before verification summary to a slightly longer oneDaniel Gultsch2016-11-241-3/+3
|/
* Merge pull request #2146 from licaon-kter/patch-4Daniel Gultsch2016-11-241-0/+4
|\
| * Add FAQ about the new trust conceptlicaon-kter2016-11-241-0/+4
* | always force close a connection when disabling from error stateDaniel Gultsch2016-11-242-1/+5
* | bumped gradle to 1.15.0-betaDaniel Gultsch2016-11-242-2/+9
* | pulled translations from transifexDaniel Gultsch2016-11-2430-422/+804
* | changed design language to match BTBV proposalDaniel Gultsch2016-11-243-8/+14
* | update the conversations view (and the lock icon) after receiving device listDaniel Gultsch2016-11-241-0/+1
|/
* explictly scan for aztec and qr codes onlyDaniel Gultsch2016-11-233-31/+4
* introduced blind trust before verification modeDaniel Gultsch2016-11-238-7/+62
* Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-11-221-3/+3
|\
| * Merge pull request #2130 from da2x/patch-2Daniel Gultsch2016-11-201-3/+3
| |\
| | * Fix up the langauge in some Settings stringsDaniel Aleksandersen2016-11-191-3/+3
* | | added share button to account detailsDaniel Gultsch2016-11-227-25/+288
* | | show proper avatar for 'self' contact. fixes #2138Daniel Gultsch2016-11-222-2/+9
* | | offer verification directly from the trust keys screenDaniel Gultsch2016-11-2216-3/+96
* | | use aztec code instead of qrDaniel Gultsch2016-11-212-12/+7
* | | use constants for some preferencesDaniel Gultsch2016-11-213-15/+20
* | | when swiping don't clean startup counter entirely. just don't count last startupDaniel Gultsch2016-11-212-5/+10
|/ /
* | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-11-201-0/+5
|\|
| * added section to FAQ about default encryptionDaniel Gultsch2016-11-181-0/+5
* | introduced custom tls socket factory to make tls1.2 work for http connectionsDaniel Gultsch2016-11-202-12/+71
* | remove omemo devices from annoucement after 7 days of inactivityDaniel Gultsch2016-11-194-22/+69
* | don't show omemo keys by default in account detailsDaniel Gultsch2016-11-191-1/+1
* | don't use xmpp uri for self verification if account is disabledDaniel Gultsch2016-11-191-1/+1
* | save last activation time in fingerprint statusDaniel Gultsch2016-11-195-8/+58
* | removed some unecessary lockingDaniel Gultsch2016-11-191-20/+19
* | close socket after failed stream openDaniel Gultsch2016-11-191-1/+4
* | check if thread was interrupted before doing operations on socketDaniel Gultsch2016-11-192-76/+77
* | fixed regression that would crash create contact dialog. fixes #2131Daniel Gultsch2016-11-191-2/+4
* | show 'clear devices' button underneath own devicesDaniel Gultsch2016-11-187-53/+55
* | removed some unecessary logging from omemo message generationDaniel Gultsch2016-11-181-4/+0
* | lower own otr fingerprintDaniel Gultsch2016-11-181-1/+2
* | issue ping after network changeDaniel Gultsch2016-11-182-3/+3
* | lower reconnection timeDaniel Gultsch2016-11-181-1/+1
* | synchronzie on xmpp service around all state changesDaniel Gultsch2016-11-181-106/+113
* | don't reset last connect time on network changeDaniel Gultsch2016-11-182-7/+9