aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* 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
* | remove notiion of nonce/identifierVincent Breitmoser2015-03-131-2/+0
* | change finish button label to "link identity"Vincent Breitmoser2015-03-134-3/+4
* | fix linked wizard buttonsVincent Breitmoser2015-03-126-27/+48
* | twitter layout step3 -> step2Vincent Breitmoser2015-03-122-221/+77
* | finish implementing twitter resourceVincent Breitmoser2015-03-121-1/+1
* | better state management in LinkedIdView, move confirm progress into cardVincent Breitmoser2015-03-101-21/+27
* | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-1040-64/+200
|\|
| * RippleDominik Schürmann2015-03-1023-41/+39
| * Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain...Dominik Schürmann2015-03-102-5/+53
| |\
| | * Show passphrase checkbox in create keyDominik Schürmann2015-03-102-0/+8
| | * changed default drawable for linked system contactAdithya Abraham Philip2015-03-101-3/+3
| | * Make create key wizard step-by-stepDominik Schürmann2015-03-1034-115/+219
| | * added contact linkingAdithya Abraham Philip2015-03-102-3/+22
| | * added cardAdithya Abraham Philip2015-03-102-5/+34
| * | Add additional email addresses in create keyDominik Schürmann2015-03-1010-1/+88
* | | add expand item to linked id listVincent Breitmoser2015-03-103-1/+36
* | | cleaner handling of verification stateVincent Breitmoser2015-03-101-1/+2
* | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-1082-474/+507
|\| |
| * | Show passphrase checkbox in create keyDominik Schürmann2015-03-092-0/+8
| * | Make create key wizard step-by-stepDominik Schürmann2015-03-0934-115/+219
| |/
| * Some fixes for delete after encryptionDominik Schürmann2015-03-092-19/+19
| * Fix colors for remote activityDominik Schürmann2015-03-092-13/+6
| * Merge pull request #1112 from chipset95/issue-1106-impDominik Schürmann2015-03-092-2/+2
| |\
| | * Implemented NameEditTextchipset952015-03-092-2/+2
| * | Redesign of encrypt activites finishedDominik Schürmann2015-03-099-115/+17
| * | Improve iconsDominik Schürmann2015-03-0916-7/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 05:52:07 +0000