aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
Commit message (Expand)AuthorAgeFilesLines
* some linked id ui fine tuningVincent Breitmoser2015-03-269-125/+70
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-246-147/+165
|\
| * Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-201-5/+15
| * Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-201-4/+21
| * Manage my keys wizardDominik Schürmann2015-03-193-138/+107
| * Allow selection of none in SelectSignKeyIdActivityDominik Schürmann2015-03-151-0/+22
* | support github resource (re)Vincent Breitmoser2015-03-243-0/+321
* | work on certification uiVincent Breitmoser2015-03-152-27/+39
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-154-78/+73
|\|
| * 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
| * API 7Dominik Schürmann2015-03-102-75/+70
* | work on second step of identity creationVincent Breitmoser2015-03-134-190/+146
* | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-137-65/+84
* | change finish button label to "link identity"Vincent Breitmoser2015-03-133-3/+3
* | 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-1033-59/+193
|\|
| * RippleDominik Schürmann2015-03-1022-37/+39
| * Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain...Dominik Schürmann2015-03-101-5/+50
| |\
| | * Show passphrase checkbox in create keyDominik Schürmann2015-03-101-0/+7
| | * changed default drawable for linked system contactAdithya Abraham Philip2015-03-101-3/+3
| | * Make create key wizard step-by-stepDominik Schürmann2015-03-104-99/+201
| | * added contact linkingAdithya Abraham Philip2015-03-101-3/+20
| | * added cardAdithya Abraham Philip2015-03-101-5/+33
| * | Add additional email addresses in create keyDominik Schürmann2015-03-104-0/+84
* | | add expand item to linked id listVincent Breitmoser2015-03-101-1/+21
* | | cleaner handling of verification stateVincent Breitmoser2015-03-101-1/+2
* | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-1025-446/+446
|\| |
| * | Show passphrase checkbox in create keyDominik Schürmann2015-03-091-0/+7
| * | Make create key wizard step-by-stepDominik Schürmann2015-03-094-99/+201
| |/
| * Some fixes for delete after encryptionDominik Schürmann2015-03-091-17/+17
| * 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-094-115/+17
| * | Fix padding in create keyDominik Schürmann2015-03-091-0/+2
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-092-26/+9
| |\|
| | * minor xml code style correctionAdithya Abraham Philip2015-03-081-8/+8
| | * cleaned up codeAdithya Abraham Philip2015-03-061-0/+1
| | * changed default colors for PasswordStrengthViewAdithya Abraham Philip2015-03-061-5/+1
| | * added PassphraseEditText to SetPassphraseDialogFragmentAdithya Abraham Philip2015-03-061-1/+1
| | * added PassphraseEditTextAdithya Abraham Philip2015-03-061-17/+3
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-063-17/+33
| |\|
| * | Tryout design for encrypt, decryptDominik Schürmann2015-03-065-3/+42
| * | Fix elevationDominik Schürmann2015-03-066-104/+76
* | | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-092-11/+102
* | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-091-52/+0