Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | work on certification ui | Vincent Breitmoser | 2015-03-15 | 2 | -27/+39 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 4 | -78/+73 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | Remove display of key id in other lists | Dominik Schürmann | 2015-03-15 | 1 | -1/+1 |
| | | |||||
| * | Dont display key ids in KeySpinner, display creation date when user ids ↵ | Dominik Schürmann | 2015-03-15 | 1 | -2/+2 |
| | | | | | | | | duplicate | ||||
| * | API 7 | Dominik Schürmann | 2015-03-10 | 2 | -75/+70 |
| | | |||||
* | | work on second step of identity creation | Vincent Breitmoser | 2015-03-13 | 4 | -190/+146 |
| | | |||||
* | | use ViewAnimator for progress, streamline text on first step | Vincent Breitmoser | 2015-03-13 | 7 | -65/+84 |
| | | |||||
* | | change finish button label to "link identity" | Vincent Breitmoser | 2015-03-13 | 3 | -3/+3 |
| | | |||||
* | | fix linked wizard buttons | Vincent Breitmoser | 2015-03-12 | 6 | -27/+48 |
| | | |||||
* | | twitter layout step3 -> step2 | Vincent Breitmoser | 2015-03-12 | 2 | -221/+77 |
| | | |||||
* | | finish implementing twitter resource | Vincent Breitmoser | 2015-03-12 | 1 | -1/+1 |
| | | |||||
* | | better state management in LinkedIdView, move confirm progress into card | Vincent Breitmoser | 2015-03-10 | 1 | -21/+27 |
| | | |||||
* | | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 33 | -59/+193 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml | ||||
| * | Ripple | Dominik Schürmann | 2015-03-10 | 22 | -37/+39 |
| | | |||||
| * | Merge branch 'contact-card' of ↵ | Dominik Schürmann | 2015-03-10 | 1 | -5/+50 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card Conflicts: Graphics/get-material-icons.sh OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java OpenKeychain/src/main/res/layout/create_key_email_fragment.xml OpenKeychain/src/main/res/values/strings.xml | ||||
| | * | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-10 | 1 | -0/+7 |
| | | | |||||
| | * | changed default drawable for linked system contact | Adithya Abraham Philip | 2015-03-10 | 1 | -3/+3 |
| | | | |||||
| | * | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-10 | 4 | -99/+201 |
| | | | |||||
| | * | added contact linking | Adithya Abraham Philip | 2015-03-10 | 1 | -3/+20 |
| | | | |||||
| | * | added card | Adithya Abraham Philip | 2015-03-10 | 1 | -5/+33 |
| | | | |||||
| * | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 4 | -0/+84 |
| | | | |||||
* | | | add expand item to linked id list | Vincent Breitmoser | 2015-03-10 | 1 | -1/+21 |
| | | | |||||
* | | | cleaner handling of verification state | Vincent Breitmoser | 2015-03-10 | 1 | -1/+2 |
| | | | |||||
* | | | Merge remote-tracking branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 25 | -446/+446 |
|\| | | |||||
| * | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-09 | 1 | -0/+7 |
| | | | |||||
| * | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 4 | -99/+201 |
| |/ | |||||
| * | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 1 | -17/+17 |
| | | |||||
| * | Fix colors for remote activity | Dominik Schürmann | 2015-03-09 | 2 | -13/+6 |
| | | |||||
| * | Merge pull request #1112 from chipset95/issue-1106-imp | Dominik Schürmann | 2015-03-09 | 2 | -2/+2 |
| |\ | | | | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 | ||||
| | * | Implemented NameEditText | chipset95 | 2015-03-09 | 2 | -2/+2 |
| | | | |||||
| * | | Redesign of encrypt activites finished | Dominik Schürmann | 2015-03-09 | 4 | -115/+17 |
| | | | |||||
| * | | Fix padding in create key | Dominik Schürmann | 2015-03-09 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-09 | 2 | -26/+9 |
| |\| | | | | | | | | | | development | ||||
| | * | minor xml code style correction | Adithya Abraham Philip | 2015-03-08 | 1 | -8/+8 |
| | | | |||||
| | * | cleaned up code | Adithya Abraham Philip | 2015-03-06 | 1 | -0/+1 |
| | | | |||||
| | * | changed default colors for PasswordStrengthView | Adithya Abraham Philip | 2015-03-06 | 1 | -5/+1 |
| | | | |||||
| | * | added PassphraseEditText to SetPassphraseDialogFragment | Adithya Abraham Philip | 2015-03-06 | 1 | -1/+1 |
| | | | |||||
| | * | added PassphraseEditText | Adithya Abraham Philip | 2015-03-06 | 1 | -17/+3 |
| | | | |||||
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-06 | 3 | -17/+33 |
| |\| | | | | | | | | | | development | ||||
| * | | Tryout design for encrypt, decrypt | Dominik Schürmann | 2015-03-06 | 5 | -3/+42 |
| | | | |||||
| * | | Fix elevation | Dominik Schürmann | 2015-03-06 | 6 | -104/+76 |
| | | | |||||
* | | | rearrange linked id layouts, add CertListWidget | Vincent Breitmoser | 2015-03-09 | 2 | -11/+102 |
| | | | |||||
* | | | add linked id certs uri to KeychainProvider | Vincent Breitmoser | 2015-03-09 | 1 | -52/+0 |
| | | | |||||
* | | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 1 | -0/+8 |
| | | | |||||
* | | | successfully certify linked ids | Vincent Breitmoser | 2015-03-08 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 4 | -21/+55 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | | Created EmailEditText, PasswordEditText and implemented wherever required | chipset95 | 2015-03-06 | 3 | -17/+33 |
| |/ | |||||
| * | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵ | Dominik Schürmann | 2015-03-05 | 1 | -8/+26 |
| |\ | | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java | ||||
| | * | Integrates passphrase strength indicator to create key wizard. | Lukas Zorich | 2015-03-03 | 1 | -18/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | This commit patches issue #1050. The padding set in the passphrase edit text is set programmatically because there is a bug in appcompat-v7 where padding via xml doesn't work: http://code.google.com/p/android/issues/detail?id=77982 | ||||
| | * | Add license to password strength view classes | Lukas Zorich | 2015-03-03 | 1 | -1/+12 |
| | | |