aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-211-5/+15
| |\ \ \ \
| * | | | | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+1
| * | | | | fix unit tests (for real)Vincent Breitmoser2015-03-201-2/+4
| * | | | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2029-164/+152
| |\ \ \ \ \
| * | | | | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-1/+2
| * | | | | | yubikey certifications!Vincent Breitmoser2015-03-181-1/+1
* | | | | | | minor ui and wording changesVincent Breitmoser2015-04-092-8/+20
* | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-09191-7866/+9359
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| | |_|_|_|/ | |/| | | |
| * | | | | -Fixed a situation where additional emails could be duplicated when creating ...Daniel Ramos2015-03-271-0/+1
| | |_|_|/ | |/| | |
| * | | | 3.2beta3Dominik Schürmann2015-03-231-1/+1
| * | | | translation fixesDominik Schürmann2015-03-238-113/+93
| * | | | Fix language problems reported by yahoe.001 on transifexDominik Schürmann2015-03-234-11/+16
| * | | | Pull from transifexDominik Schürmann2015-03-23110-199/+8849
| * | | | Remove remaining html entities in changelogDominik Schürmann2015-03-231-3/+3
| * | | | introduced multi-threadingAdithya Abraham Philip2015-03-232-0/+7
| * | | | Markdown commentsDominik Schürmann2015-03-235-5/+5
| * | | | Remove changelog in main folder, update commentsDominik Schürmann2015-03-234-0/+4
| * | | | Use markdown for in-app helpDominik Schürmann2015-03-2378-7635/+481
| | |_|/ | |/| |
* | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
* | | | even more linked id ui workVincent Breitmoser2015-03-293-6/+9
* | | | more (subtle) ui workVincent Breitmoser2015-03-262-30/+27
* | | | more linked id ui fine tuningVincent Breitmoser2015-03-2616-0/+0
* | | | some linked id ui fine tuningVincent Breitmoser2015-03-2634-126/+115
* | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-241-0/+9
* | | | work on cookie scanning during creationVincent Breitmoser2015-03-241-0/+7
* | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-2434-176/+222
|\| | |
| * | | Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-201-5/+15
| | |/ | |/|
| * | Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-206-4/+21
| * | Manage my keys wizardDominik Schürmann2015-03-1923-160/+131
| |/
| * Disable hidden recipients for nowDominik Schürmann2015-03-162-10/+10
| * Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-163-2/+16
| * Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-163-5/+17
| * Clarify certification help screenDominik Schürmann2015-03-161-2/+2
| * Allow selection of none in SelectSignKeyIdActivityDominik Schürmann2015-03-151-0/+22
* | support github resource (re)Vincent Breitmoser2015-03-244-1/+331
* | support github resource (pa)Vincent Breitmoser2015-03-242-0/+3
* | work on certification uiVincent Breitmoser2015-03-1514-33/+71
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-15101-1504/+1475
|\|
| * Remove display of key id in other listsDominik Schürmann2015-03-151-1/+1
| * Dont display key ids in KeySpinner, display creation date when user ids dupli...Dominik Schürmann2015-03-151-2/+2
| * Improve file deletion stringsDominik Schürmann2015-03-121-3/+4
| * Updated fix for Issue #1116Manoj Khanna2015-03-1120-54/+58
| * Version 3.2beta2Dominik Schürmann2015-03-101-1/+2
| * Pull from transifexDominik Schürmann2015-03-1071-1105/+1328
| * Changelog 3.2beta1Dominik Schürmann2015-03-101-0/+14
| * Remove unused NFC Beam htmlDominik Schürmann2015-03-1024-268/+0
| * API 7Dominik Schürmann2015-03-103-76/+72
* | work on second step of identity creationVincent Breitmoser2015-03-135-204/+161
* | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-138-85/+102