aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-112-13/+13
|\
| * Fix Bluetooth share without breaking othersWilliam Faulk2015-05-041-0/+1
| * Merge branch 'development' of https://github.com/Hiperzone/open-keychain into...Dominik Schürmann2015-05-041-0/+1
| |\
| | * Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Daniel Ramos2015-04-263-23/+11
| | |\
| | * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into de...Daniel Ramos2015-04-241-0/+1
| | |\ \
| | | * | -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-141-0/+1
| * | | | Fix yubikey stringsDominik Schürmann2015-05-011-5/+6
| * | | | Fix key creation string and displayDominik Schürmann2015-04-301-2/+3
| * | | | API: Allow selection of decryption keys when decryption failsDominik Schürmann2015-04-301-0/+1
| * | | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-271-1/+1
| * | | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+1
| | |_|/ | |/| |
| * | | UI fixes for Android < 5Dominik Schürmann2015-04-261-6/+1
* | | | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-091-6/+6
* | | | small ui nicetiesVincent Breitmoser2015-04-271-5/+5
* | | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-271-1/+1
* | | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+1
* | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-263-10/+18
|\| | |
| * | | Switch to new support lib version 22.1Dominik Schürmann2015-04-251-1/+1
| * | | Remove old navigation drawer dependencyDominik Schürmann2015-04-252-9/+1
| * | | revamp decrypt uiVincent Breitmoser2015-04-241-7/+8
| |/ /
| * | Fixed Snackbar behind layoutManoj Khanna2015-04-221-0/+1
| * | keyserver verification on additionAdithya Abraham Philip2015-04-221-0/+12
| * | 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-251-6/+7
* | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-251-0/+4
* | revamp decrypt uiVincent Breitmoser2015-04-241-7/+8
* | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-0/+1
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-62/+78
|\|
| * Rename advanced to extendedDominik Schürmann2015-03-311-7/+7
| * From passphrase to passwordDominik Schürmann2015-03-311-47/+47
| * Simplify passphrase dialog designDominik Schürmann2015-03-311-1/+1
| * fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-1/+0
| * Fix strings with email addressDominik Schürmann2015-03-291-2/+2
| * Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-291-0/+1
| |\
| * \ Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-25/+12
| |\ \
| * | | further improve yubikey error handlingVincent Breitmoser2015-03-231-0/+1
| * | | nicer handling of nfc errorsVincent Breitmoser2015-03-231-0/+1
| * | | enable nfc in import dialog as wellVincent Breitmoser2015-03-221-1/+2
| * | | finish ui flow for yubikey importVincent Breitmoser2015-03-221-6/+8
| * | | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-1/+3
| * | | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-221-0/+4
| * | | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-221-0/+2
| * | | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+1
| * | | fix unit tests (for real)Vincent Breitmoser2015-03-201-2/+4
| * | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-201-3/+5
| |\ \ \
| * | | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-1/+2
| * | | | yubikey certifications!Vincent Breitmoser2015-03-181-1/+1
* | | | | minor ui and wording changesVincent Breitmoser2015-04-091-4/+4
* | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-25/+13
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | -Fixed a situation where additional emails could be duplicated when creating ...Daniel Ramos2015-03-271-0/+1
| | |_|/ | |/| |