aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Test new iconDominik Schürmann2015-01-076-0/+0
* OpenPGP instead of PGPDominik Schürmann2015-01-071-5/+5
* PIn not pin passphraseDominik Schürmann2015-01-071-1/+1
* OpenPGP not PGPDominik Schürmann2015-01-072-2/+2
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-069-56/+74
|\
| * 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-029-49/+51
| * 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-3018-29/+29
| |\
| * | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-301-0/+2
| * | introduce handling of notation direct key signatures, and experimental pin no...Vincent Breitmoser2014-12-309-9/+11
* | | Passphrase wizard testsDominik Schürmann2015-01-067-0/+280
| |/ |/|
* | New work on PIN and lock pattern UIDominik Schürmann2014-12-2918-28/+29
|/
* Update target and support libs to SDK 21, fixing compile issuesDominik Schürmann2014-12-042-2/+0
* Fix spelling of 'K-9 Mail' in FAQcketti2014-11-261-3/+3
* NFC activity designDominik Schürmann2014-11-214-19/+14
* Pull from transifexDominik Schürmann2014-11-0223-17/+182
* ChangelogDominik Schürmann2014-11-021-0/+5
* Pull from transifexDominik Schürmann2014-10-3027-101/+467
* Changelog 3.1.1Dominik Schürmann2014-10-301-0/+6
* Pull from transifexDominik Schürmann2014-10-2620-0/+220
* Pull from transifexDominik Schürmann2014-10-2656-878/+3333
* Changelog 3.1Dominik Schürmann2014-10-261-0/+12
* Rename multi certify files to certifyDominik Schürmann2014-10-265-299/+85
* Display error on certification attempt with yubikeyVincent Breitmoser2014-10-261-0/+1
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-261-4/+4
|\
| * Use new safe slinger activity from share tabDominik Schürmann2014-10-261-4/+4
* | add descriptive text to safeslinger activityVincent Breitmoser2014-10-263-16/+36
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-261-1/+1
|\
| * implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-261-1/+1
* | Move advanced info into own activityDominik Schürmann2014-10-266-80/+111
|/
* 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-263-12/+19
| |\
| * | 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-262-8/+15
* | Fix layout of select key adapterDominik Schürmann2014-10-261-4/+4
|/
* Remove empty layoutDominik Schürmann2014-10-252-49/+1
* Remove tabs from import keys activityDominik Schürmann2014-10-251-7/+3
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-251-5/+5
|\
| * shorter certification explanationVincent Breitmoser2014-10-251-1/+1
| * more rewordingVincent Breitmoser2014-10-251-4/+4
* | Fixes and icons for apps list, also add Password StoreDominik Schürmann2014-10-253-0/+0
|/
* 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-253-11/+110
|\
| * 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-253-11/+110
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 00:21:41 +0000