aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* Pull from transifexDominik Schürmann2014-09-2438-213/+948
|
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-243-9/+14
|\
| * propose apps in apps listDominik Schürmann2014-09-243-9/+14
| |
* | show message about saving multiple files rather than hide the buttonVincent Breitmoser2014-09-241-0/+1
|/
* add subtle attention seeker to decryptactivity with available clipboard dataVincent Breitmoser2014-09-241-0/+1
| | | | | | Thanks Cyril Mottier https://plus.google.com/+CyrilMottier/posts/FABaJhRMCuy
* Fix strings reported by yahoe.001Dominik Schürmann2014-09-242-3/+3
|
* Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ↵Dominik Schürmann2014-09-242-0/+30
| | | | need to separate
* Fix new decrypt buttonDominik Schürmann2014-09-241-3/+0
|
* cleanupDominik Schürmann2014-09-241-28/+0
|
* Button text for decryptDominik Schürmann2014-09-242-13/+79
|
* Implement buttons in DecryptTextFragmentDominik Schürmann2014-09-232-3/+5
|
* DecryptTextActivity reworkDominik Schürmann2014-09-231-1/+2
|
* be more precise on importresult overall errorVincent Breitmoser2014-09-231-3/+6
|
* take failed keys into account in importkeyresult notificationVincent Breitmoser2014-09-231-0/+4
|
* passphrasecache: cache by master key, introduce preference for cache by subkeyVincent Breitmoser2014-09-232-0/+5
|
* reject keys with duplicate subkeys altogetherVincent Breitmoser2014-09-231-0/+1
| | | | closes #870
* log "unspecified" flags differentlyVincent Breitmoser2014-09-221-0/+2
|
* show authenticate flag in logsVincent Breitmoser2014-09-221-16/+32
|
* Hack to fix #805Dominik Schürmann2014-09-222-14/+14
|
* Fix custom key configuration for primary user idsDominik Schürmann2014-09-211-0/+2
|
* Fix ConsolidateResult, needed parcelable methodsDominik Schürmann2014-09-211-2/+2
|
* Feature to change key configuration in create keyDominik Schürmann2014-09-212-2/+53
|
* Small UI fixesDominik Schürmann2014-09-216-47/+41
|
* Merge user ids in import list for better displayDominik Schürmann2014-09-212-31/+11
|
* New key flags icons, subkey adapter redesign, support authanticate flag in ↵Dominik Schürmann2014-09-2028-7/+18
| | | | database
* respect user id revocation signaturesVincent Breitmoser2014-09-201-1/+5
| | | | Closes #836
* Beautify key id (thanks to Tim Bray)Dominik Schürmann2014-09-193-5/+2
|
* Remove certificate validation code from ViewCertActivity, they are already ↵Dominik Schürmann2014-09-192-23/+3
| | | | validated by import
* Use key icons in import, prettify itemsDominik Schürmann2014-09-181-30/+24
|
* Swipe-to-refresh fixesDominik Schürmann2014-09-181-3/+10
|
* Use key icons in spinnersDominik Schürmann2014-09-172-44/+40
|
* Result parcel refactorings (WIP)Dominik Schürmann2014-09-171-1/+1
|
* Work on new result handling (WIP)Dominik Schürmann2014-09-172-1/+2
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-1561-264/+982
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/res/values-de/strings.xml
| * Pull from transifexDominik Schürmann2014-09-1542-161/+732
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-1510-84/+97
| |\
| | * Keys found on multiple servers are now imported from all of themTim Bray2014-09-132-11/+9
| | |
| | * Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵Tim Bray2014-09-131-2/+2
| | | | | | | | | | | | side is revoked/expired, the merge reflects that
| | * Restore Yubikey setting, lost in fumble-fingered mergeTim Bray2014-09-131-0/+7
| | |
| | * Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefsTim Bray2014-09-1310-89/+94
| | |
| * | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵Dominik Schürmann2014-09-159-13/+150
| | | | | | | | | | | | non-decodable characters)
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-141-1/+25
| |\ \
| * | | First work on decryptDominik Schürmann2014-09-143-2/+2
| | | |
* | | | move LogLevel info into LogType enumVincent Breitmoser2014-09-159-30/+30
| |_|/ |/| |
* | | work on OperationResultParcelVincent Breitmoser2014-09-141-2/+5
| |/ |/|
* | add SignEncryptResult parcel (probably break stuff)Vincent Breitmoser2014-09-141-1/+25
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-131-1/+1
|\
| * add key id to trailing asym data log msgVincent Breitmoser2014-09-131-1/+1
| |
* | Custom actionbar to indicate swipe down effectDominik Schürmann2014-09-132-0/+15
|/
* log warning on bad uid encodingVincent Breitmoser2014-09-131-0/+1
|