aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-1140-288/+404
|\
| * Version 3.2Dominik Schürmann2015-05-0623-23/+23
| * Pull from transifexDominik Schürmann2015-05-0610-141/+163
| * Renaming for consisitencyDominik Schürmann2015-05-061-5/+5
| * Move error overlay into generalized DecryptFragment, better error handling in...Dominik Schürmann2015-05-061-76/+126
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-05-051-0/+1
| |\
| | * Fix Bluetooth share without breaking othersWilliam Faulk2015-05-041-0/+1
| * | Fix nullpointer in file decryptionDominik Schürmann2015-05-051-1/+1
| |/
| * Fix revoked/expired state in decrypt activityDominik Schürmann2015-05-041-3/+3
| * Merge branch 'development' of https://github.com/Hiperzone/open-keychain into...Dominik Schürmann2015-05-041-0/+1
| |\
| | * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-302-2/+0
| | * Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Daniel Ramos2015-04-2624-226/+237
| | |\
| | * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into de...Daniel Ramos2015-04-243-0/+3
| | |\ \
| | | * | -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-143-0/+3
| * | | | Fix yubikey stringsDominik Schürmann2015-05-012-7/+7
| * | | | Fix key creation string and displayDominik Schürmann2015-04-301-2/+3
| * | | | API: Allow selection of decryption keys when decryption failsDominik Schürmann2015-04-302-0/+39
| * | | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-3/+15
| * | | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+1
| | |_|/ | |/| |
| * | | UI fixes for Android < 5Dominik Schürmann2015-04-262-11/+13
* | | | linked-ids: small compatibility changesVincent Breitmoser2015-05-111-0/+1
* | | | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-091-6/+6
* | | | small ui nicetiesVincent Breitmoser2015-04-272-6/+6
* | | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-3/+15
* | | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+1
* | | | small changes for performanceVincent Breitmoser2015-04-271-3/+4
* | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-263-140/+0
|\| | |
| * | | Remove unused decrypt result layoutDominik Schürmann2015-04-263-140/+0
* | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-2625-43/+273
|\| | |
| * | | Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-2614-4/+149
| * | | Switch to new support lib version 22.1Dominik Schürmann2015-04-252-2/+2
| * | | Update in-app contributor listDominik Schürmann2015-04-251-3/+22
| * | | Update lib section in aboutDominik Schürmann2015-04-251-2/+2
| * | | Remove old navigation drawer dependencyDominik Schürmann2015-04-252-9/+1
| * | | Merge pull request #1220 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-252-0/+28
| |\ \ \
| | * | | Fix #1197 Switch to MaterialDrawer libraryvectorijk2015-04-241-2/+4
| | * | | Introduce and Switch to mikepenz/MaterialDrawervectorijk2015-04-242-0/+26
| | |/ /
| * | | fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
| * | | revamp decrypt uiVincent Breitmoser2015-04-244-81/+44
| |/ /
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-04-224-16/+57
| |\ \
| | * | Fixed Snackbar behind layoutManoj Khanna2015-04-223-16/+16
| | * | keyserver verification on additionAdithya Abraham Philip2015-04-222-0/+41
| * | | Update changelogDominik Schürmann2015-04-221-6/+8
| |/ /
| * | support for handling keyserver urls from browser, added documentationAdithya Abraham Philip2015-04-201-0/+3
* | | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-254-16/+12
* | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-253-4/+14
* | | fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
* | | revamp decrypt uiVincent Breitmoser2015-04-244-81/+44
* | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-242-4/+8
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-24135-1276/+2044
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-21 22:13:28 +0000