aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Expand)AuthorAgeFilesLines
* prevent recursive consolidateVincent Breitmoser2015-01-311-0/+1
* Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-291-1/+1
|\
| * use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-191-1/+1
* | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-271-0/+2
|\ \
| * \ Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-271-0/+2
| |\ \
| | * | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-271-0/+1
| | * | move last parts of import logic from kis into operationVincent Breitmoser2015-01-261-0/+1
* | | | Temporary nav drawer fixesDominik Schürmann2015-01-272-2/+11
|/ / /
* / / Material Design DrawerDominik Schürmann2015-01-261-0/+5
|/ /
* | Material Design: Full screen dialogsDominik Schürmann2015-01-262-2/+2
* | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-251-0/+7
* | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-0/+2
|/
* Toolbar for settingsDominik Schürmann2015-01-141-1/+1
* Integrate QR Code library instead of requiring the app to be installed, also ...Dominik Schürmann2015-01-141-0/+1
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-141-0/+1
|\
| * small fixes to user attribute handlingVincent Breitmoser2015-01-141-0/+1
* | Fix SearchViewDominik Schürmann2015-01-142-0/+22
|/
* Better way to have dark toolbar and light themeDominik Schürmann2015-01-141-31/+0
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-141-1/+36
|\
| * actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-0/+17
| * support addition of user attributesVincent Breitmoser2015-01-131-0/+3
| * add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-121-1/+16
* | GreenDominik Schürmann2015-01-134-1/+87
* | Start working on Material DesignDominik Schürmann2015-01-133-12/+86
|/
* OpenPGP instead of PGPDominik Schürmann2015-01-071-5/+5
* PIn not pin passphraseDominik Schürmann2015-01-071-1/+1
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-061-13/+31
|\
| * make certify routines more robust (#1016)Vincent Breitmoser2015-01-031-0/+1
| * add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-031-0/+1
| * encapsulate high level edit key into new operation classVincent Breitmoser2015-01-031-0/+8
| * deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-021-6/+7
| * extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-021-6/+8
| * small improvements regarding pin tests and loggingVincent Breitmoser2015-01-011-1/+3
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-12-301-3/+3
| |\
| * | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-301-0/+2
| * | introduce handling of notation direct key signatures, and experimental pin no...Vincent Breitmoser2014-12-301-1/+3
* | | Passphrase wizard testsDominik Schürmann2015-01-061-0/+27
| |/ |/|
* | New work on PIN and lock pattern UIDominik Schürmann2014-12-291-2/+3
|/
* NFC activity designDominik Schürmann2014-11-211-4/+5
* Display error on certification attempt with yubikeyVincent Breitmoser2014-10-261-0/+1
* add descriptive text to safeslinger activityVincent Breitmoser2014-10-261-0/+1
* Move advanced info into own activityDominik Schürmann2014-10-261-0/+2
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-261-0/+1
|\
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-261-2/+2
| |\
| * | Retry canonicalization with pubkey self certs if first attempt failedVincent Breitmoser2014-10-261-0/+1
* | | Fixes from transifexDominik Schürmann2014-10-261-37/+37
| |/ |/|
* | Move some multi select items in overflow menu, rename importDominik Schürmann2014-10-261-2/+2
|/
* Remove empty layoutDominik Schürmann2014-10-251-5/+1
* shorter certification explanationVincent Breitmoser2014-10-251-1/+1
* more rewordingVincent Breitmoser2014-10-251-4/+4