aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
Commit message (Expand)AuthorAgeFilesLines
* change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-252-4/+10
* fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
* revamp decrypt uiVincent Breitmoser2015-04-242-74/+19
* use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-4/+7
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2412-99/+406
|\
| * Merge pull request #1193 from adithyaphilip/auto-refresh-contactsDominik Schürmann2015-04-131-0/+1
| |\
| | * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-081-0/+1
| * | Simplify passphrase dialog designDominik Schürmann2015-03-311-1/+0
| * | Fix scrollbarDominik Schürmann2015-03-301-0/+1
| * | Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-303-63/+59
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-303-13/+23
| |\|
| | * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| * | Fixing crashes with new encrypt uiDominik Schürmann2015-03-291-2/+1
| * | Refactoring of EncryptTextActivityDominik Schürmann2015-03-271-4/+3
| * | Start refactoring encrypt ui, EncryptFileActivity no longer crashingDominik Schürmann2015-03-263-10/+8
| * | finish ui flow for yubikey importVincent Breitmoser2015-03-221-17/+58
| * | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-221-3/+8
| * | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-222-70/+115
| * | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-212-19/+88
| * | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-16/+85
| * | first steps toward yubikey activityVincent Breitmoser2015-03-212-17/+100
| |/
* | minor ui and wording changesVincent Breitmoser2015-04-091-4/+16
* | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
* | even more linked id ui workVincent Breitmoser2015-03-292-6/+8
* | more (subtle) ui workVincent Breitmoser2015-03-261-22/+19
* | 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