aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Expand)AuthorAgeFilesLines
* Improve file deletion stringsDominik Schürmann2015-03-121-3/+4
* Updated fix for Issue #1116Manoj Khanna2015-03-111-3/+4
* Pull from transifexDominik Schürmann2015-03-101-1/+1
* API 7Dominik Schürmann2015-03-101-1/+2
* RippleDominik Schürmann2015-03-101-4/+0
* Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain...Dominik Schürmann2015-03-101-0/+3
|\
| * Show passphrase checkbox in create keyDominik Schürmann2015-03-101-0/+1
| * Make create key wizard step-by-stepDominik Schürmann2015-03-101-2/+4
| * added contact linkingAdithya Abraham Philip2015-03-101-0/+2
| * added cardAdithya Abraham Philip2015-03-101-0/+1
* | Add additional email addresses in create keyDominik Schürmann2015-03-101-1/+4
* | Show passphrase checkbox in create keyDominik Schürmann2015-03-091-0/+1
* | Make create key wizard step-by-stepDominik Schürmann2015-03-091-2/+4
|/
* Some fixes for delete after encryptionDominik Schürmann2015-03-091-2/+2
* Improve iconsDominik Schürmann2015-03-091-7/+7
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-091-2/+5
|\
| * add support for certification of user attributesVincent Breitmoser2015-03-081-2/+5
* | Tryout design for encrypt, decryptDominik Schürmann2015-03-061-2/+4
|/
* Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into pa...Dominik Schürmann2015-03-051-0/+14
|\
| * Implemented Matt Allen password strength indicatorLukas Zorich2015-03-031-0/+14
* | Check for insecure hash and symmetric encryption algos on decryptDominik Schürmann2015-03-051-0/+2
* | Remove advanced preferences, move compression as menu item in encrypt activit...Dominik Schürmann2015-03-051-0/+1
* | Design fixes for decryption screenDominik Schürmann2015-03-051-1/+1
* | Rewording secret_key_deletion_confirmationDominik Schürmann2015-03-041-1/+1
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ...Dominik Schürmann2015-03-041-0/+11
|\ \
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-03-022-2/+3
| |\|
| * | added logging, notify for log exportAdithya Abraham Philip2015-03-011-0/+7
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-02-281-15/+16
| |\ \
| * \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-02-281-0/+58
| |\ \ \
| * \ \ \ merged dialogAdithya Abraham Philip2015-02-269-139/+67
| |\ \ \ \
| * | | | | initial Log Display functionAdithya Abraham Philip2015-02-261-0/+4
* | | | | | Simplified language: Confirm keysDominik Schürmann2015-03-041-16/+15
* | | | | | More simplification of delete stringsDominik Schürmann2015-03-041-1/+1
* | | | | | Simplify certify stringsDominik Schürmann2015-03-041-11/+2
* | | | | | Simplify dialogs according to Material DesignDominik Schürmann2015-03-041-4/+4
* | | | | | Fix expiry dialog, reorder layoutsDominik Schürmann2015-03-031-2/+3
* | | | | | Fix toolbar margins on Android lower 5Dominik Schürmann2015-03-031-0/+1
| |_|_|_|/ |/| | | |
* | | | | Search string simplifiedDominik Schürmann2015-03-021-2/+1
* | | | | Re-add black colorDominik Schürmann2015-03-021-0/+2
| |_|_|/ |/| | |
* | | | Strings: File sizeDominik Schürmann2015-02-281-2/+2
* | | | Fix strings based on transifex reportsDominik Schürmann2015-02-281-13/+13
* | | | Keybase header textDominik Schürmann2015-02-271-0/+1
| |_|/ |/| |
* | | Merge keybase-proof branchDominik Schürmann2015-02-271-0/+58
|\ \ \ | |_|/ |/| |
| * | Check fingerprint match between proof & databaseTim Bray2014-11-221-0/+1
| * | Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-211-4/+5
| |\ \
| * | | Prevent multiple cloud-trust-search launches. Handle DNS query failure grace...Tim Bray2014-11-191-0/+1
| * | | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ...Tim Bray2014-11-181-0/+1
| * | | All keybase proofs now in placeTim Bray2014-11-111-0/+7
| * | | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-0/+48
* | | | Remove old Holo design resourcesDominik Schürmann2015-02-264-87/+0