aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
* slightly change wording in merge logsVincent Breitmoser2014-10-251-2/+2
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-251-6/+1
|\
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-251-0/+10
| |\
| * | Safe slinger activity prepsDominik Schürmann2014-10-251-6/+1
* | | change the way merging is loggedVincent Breitmoser2014-10-251-1/+5
| |/ |/|
* | more work on import loggingVincent Breitmoser2014-10-251-5/+5
* | add logging to import and change order of import, keyservers firstVincent Breitmoser2014-10-251-0/+10
|/
* Qr code button textDominik Schürmann2014-10-241-1/+1
* reword sync messageTim Bray2014-10-221-1/+1
* Make the Certify screen a little more self-explanatoryTim Bray2014-10-211-3/+3
* Group passphrase cache settingsDominik Schürmann2014-10-131-1/+2
* wordingDominik Schürmann2014-10-131-3/+3
* Added option for num keypad for YubiKeyJerzy Kołosowski2014-10-131-0/+1
* rewrite export with new operation styleVincent Breitmoser2014-10-131-0/+24