aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add omemo fingerprints to web links as wellDaniel Gultsch2016-12-033-18/+33
* show warning dialog beforing verifying keys via a linkDaniel Gultsch2016-12-034-10/+92
* Merge branch 'feature-quotation' of https://github.com/Mishiranu/Conversation...Daniel Gultsch2016-12-0220-11/+305
|\
| * Add quotation supportMishiranu2016-11-2520-11/+305
* | default using internal storage to falseDaniel Gultsch2016-12-021-1/+1
* | Merge branch 'master' of https://github.com/Fenisu/Conversations into Fenisu-...Daniel Gultsch2016-12-0212-24/+150
|\ \
| * | Private files using a boolean flag from Config.java.Ignacio Quezada2016-11-0810-18/+147
* | | support for jid escapting when displaying localpart onlyDaniel Gultsch2016-12-014-3/+17
* | | use prepped string when building axolotl sessionDaniel Gultsch2016-12-011-3/+3
* | | don't use own jid joined from another client to generate muc titleDaniel Gultsch2016-12-011-1/+4
* | | don't show share button before account is setupDaniel Gultsch2016-12-011-0/+3
* | | only show contact related snackbars when conversation is singleDaniel Gultsch2016-12-011-3/+3
* | | made provider authorities relativ to deal with different package idsDaniel Gultsch2016-12-015-9/+15
* | | avoid binding multiple times from BarcodeServiceDaniel Gultsch2016-12-011-15/+22
* | | increment version code and release version 1.15.01.15.0Daniel Gultsch2016-11-301-2/+2
* | | pulled translations from transifexDaniel Gultsch2016-11-305-2/+61
* | | 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
| | |/ | |/|