aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/Fenisu/Conversations into Fenisu-...Daniel Gultsch2016-12-023-1/+17
|\
| * Private files using a boolean flag from Config.java.Ignacio Quezada2016-11-083-1/+17
* | pulled translations from transifexDaniel Gultsch2016-11-305-2/+61
* | renamed foreground service preferenceDaniel Gultsch2016-11-301-1/+1
* | pulled translations from transifexDaniel Gultsch2016-11-294-0/+5
* | pulled translations from transifexDaniel Gultsch2016-11-285-0/+36
* | allow fingerprint verification via context menuDaniel Gultsch2016-11-283-0/+6
* | pulled translations from transifexDaniel Gultsch2016-11-2529-50/+128
* | changed blind trust before verification summary to a slightly longer oneDaniel Gultsch2016-11-241-3/+3
* | pulled translations from transifexDaniel Gultsch2016-11-2430-422/+804
* | changed design language to match BTBV proposalDaniel Gultsch2016-11-241-0/+1
* | introduced blind trust before verification modeDaniel Gultsch2016-11-232-0/+8
* | 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-222-0/+19
* | | | offer verification directly from the trust keys screenDaniel Gultsch2016-11-2214-0/+18
* | | | use aztec code instead of qrDaniel Gultsch2016-11-211-2/+2
|/ / /
* | | don't show omemo keys by default in account detailsDaniel Gultsch2016-11-191-1/+1
* | | show 'clear devices' button underneath own devicesDaniel Gultsch2016-11-182-5/+9
|/ /
* | parse omemo fingerprints from urisDaniel Gultsch2016-11-171-0/+1
* | slightly darken verified icon + mark inactiveDaniel Gultsch2016-11-1640-0/+0
* | refactor omemo fingerprint UI codeDaniel Gultsch2016-11-1544-31/+65
* | pulled ru translation from transifexDaniel Gultsch2016-11-131-0/+3
* | pulled translations from transifexDaniel Gultsch2016-11-113-0/+8
* | pulled translations from transifexDaniel Gultsch2016-11-0814-26/+112
* | Fix typolicaon-kter2016-11-081-1/+1
* | show warning in account details when data saver is enabledDaniel Gultsch2016-11-072-7/+12
* | add error message to failed messages. accessible via context menuDaniel Gultsch2016-10-262-0/+6
* | Remove spans on copying or pasting a textMishiranu2016-10-192-2/+2
* | don't trigger context menu in message adapter manually. fixes #2077Daniel Gultsch2016-10-182-0/+6
* | Merge branch 'feature-selection' of https://github.com/Mishiranu/Conversation...Daniel Gultsch2016-10-173-0/+6
|\ \ | |/ |/|
| * Add "Select text" context menu optionMishiranu2016-09-173-0/+6
* | clarified fineprint a little bitDaniel Gultsch2016-10-136-8/+10
* | pulled more translations from transifexDaniel Gultsch2016-10-092-0/+7
* | pulled translations from transifexDaniel Gultsch2016-10-0929-170/+301
* | added disclaimer that conversations.im account is 8 euro / yearDaniel Gultsch2016-10-085-4/+34
* | warn user if account is offline during avatar publicationDaniel Gultsch2016-10-061-0/+1
* | fixed omemo shown as unavailable in 1:1 chatsDaniel Gultsch2016-10-031-0/+2
* | added nick to conference jid exampleDaniel Gultsch2016-09-281-1/+1
* | simplified code that invokes the export logs serviceDaniel Gultsch2016-09-281-1/+1
* | expert 'setting' to remove omemo identity. fixes #2038Daniel Gultsch2016-09-282-0/+7
* | Merge pull request #2028 from Mishiranu/feature-more-tablesDaniel Gultsch2016-09-203-19/+55
|\ \
| * | Update Russian translationMishiranu2016-09-201-8/+8
| * | Fix "More table" layoutMishiranu2016-09-202-11/+47
* | | fixed styling in blocking dialogDaniel Gultsch2016-09-201-1/+1
* | | pulled translations from transifexDaniel Gultsch2016-09-202-5/+15
|/ /
* | add support for XEP-0377: Spam ReportingDaniel Gultsch2016-09-182-0/+26
* | use proper paddings in dialogs on android < 5Daniel Gultsch2016-09-187-20/+43
|/
* pulled translations from transifexDaniel Gultsch2016-09-1610-4/+68
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 22:44:38 +0000