aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-151-3/+6
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-151-4/+11
| |\
| | * Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefsTim Bray2014-09-131-2/+6
| * | New decrypt activity design (WIP), saner UTF8 decoding (replacing non-decodab...Dominik Schürmann2014-09-151-1/+0
* | | move LogLevel info into LogType enumVincent Breitmoser2014-09-151-4/+4
| |/ |/|
* | 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-131-0/+1
|/
* log warning on bad uid encodingVincent Breitmoser2014-09-131-0/+1
* some DecryptVerify log refinementsVincent Breitmoser2014-09-131-2/+2
* add a ton of logging to DecryptVerifyVincent Breitmoser2014-09-131-0/+38
* add ui support for stripping subkeysVincent Breitmoser2014-09-111-0/+3
* introduce SingletonResult for... singleton resultsVincent Breitmoser2014-09-081-3/+3
* Properly handle uneditable key types in EditKeyFragmentVincent Breitmoser2014-09-081-0/+5
* Fix problems in strings.xmlDominik Schürmann2014-09-071-31/+36
* Put quotes around all strings, should fix transifex consistency problems, als...Dominik Schürmann2014-09-071-646/+646
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-071-0/+1
|\
| * add proper async check for correct passphrase to passphrasedialogVincent Breitmoser2014-09-071-0/+1
* | Two buttons to encrypt files and text, some fixesDominik Schürmann2014-09-071-1/+2
|/
* More UI reworkDominik Schürmann2014-09-071-7/+6
* Add experimental support for yubikey PINs, remove caching of empty passphrasesDominik Schürmann2014-09-051-0/+1
* Add yubikey default PIN preferenceDominik Schürmann2014-09-051-0/+2
* Fix stringsDominik Schürmann2014-09-021-2/+2
* Catch security exception, known problem...Dominik Schürmann2014-09-021-0/+1
* cache key s2k type in database, for later useVincent Breitmoser2014-09-021-3/+8
* split EncryptActivity into Encrypt{Text,File}ActivityVincent Breitmoser2014-09-011-2/+4
* remove "sign" and "verify" from drawer textsVincent Breitmoser2014-09-011-2/+2
* small ui changes in encryptVincent Breitmoser2014-09-011-3/+3
* remove "by holding..." explanation from button textVincent Breitmoser2014-09-011-1/+1
* Fix transifex linebreaks by adding apostrophs to strings with linebreaksDominik Schürmann2014-09-011-15/+15
* Prepare API for OpenPgpSignatureResult extensionsDominik Schürmann2014-08-311-3/+3
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-311-1/+6
|\
| * add cancel support to edit key actionVincent Breitmoser2014-08-311-1/+4
| * Add cancelable mechanism and support in key importVincent Breitmoser2014-08-311-0/+2
* | Better leyout for account settingsDominik Schürmann2014-08-311-0/+2
|/
* canonicalize: add check for algorithm typeVincent Breitmoser2014-08-301-2/+4
* Merge pull request #796 from open-keychain/developDominik Schürmann2014-08-281-3/+23
|\
| * add ecc supportVincent Breitmoser2014-08-241-3/+21
| * Add ECDH and ECDSA valuesDominik Schürmann2014-08-211-0/+2
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-271-3/+5
|\ \
| * | small language fixes for previous commitVincent Breitmoser2014-08-271-3/+5
* | | Strip out duplicate user idsDominik Schürmann2014-08-271-1/+2
|/ /
* | Abort import of pubkeys where secret keys exist but new pubkey has more subke...Dominik Schürmann2014-08-271-0/+1
* | Cleanup FoldableLinearLayoutDominik Schürmann2014-08-271-2/+0
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-201-1/+3
|\
| * move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-201-0/+1
| * consolidate: small ui thingsVincent Breitmoser2014-08-201-1/+2
* | improve certs_textDominik Schürmann2014-08-201-1/+1
|/