aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| * RippleDominik Schürmann2015-03-1023-41/+39
| |
| * Merge branch 'contact-card' of ↵Dominik Schürmann2015-03-102-5/+53
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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
| |\ | | | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106
| | * 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
| | |
| * | Fix padding in create keyDominik Schürmann2015-03-091-0/+2
| | |
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-093-28/+14
| |\| | | | | | | | | | development
| | * Merge pull request #1111 from adithyaphilip/passphrase-strength-indicatorDominik Schürmann2015-03-092-26/+9
| | |\ | | | | | | | | Passphrase strength indicator
| | | * 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 ↵Dominik Schürmann2015-03-063-17/+33
| |\ \ \ | | | |/ | | |/| | | | | development
| * | | Tryout design for encrypt, decryptDominik Schürmann2015-03-0628-7/+76
| | | |
| * | | 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
| | | |
* | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-091-0/+8
| | | |
* | | | successfully certify linked idsVincent Breitmoser2015-03-081-0/+1
| | | |
* | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0820-75/+110
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | add support for certification of user attributesVincent Breitmoser2015-03-081-2/+5
| | |/ | |/|
| * | Created EmailEditText, PasswordEditText and implemented wherever requiredchipset952015-03-063-17/+33
| |/
| * Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵Dominik Schürmann2015-03-052-8/+40
| |\ | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
| | * Integrates passphrase strength indicator to create key wizard.Lukas Zorich2015-03-031-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 classesLukas Zorich2015-03-031-1/+12
| | |
| | * Implemented Matt Allen password strength indicatorLukas Zorich2015-03-031-0/+14
| | | | | | | | | | | | | | | | | | | | | I used most of Matt Allen password strength indicator code available here https://github.com/matt-allen/android-password-strength-indicator, but modified it a little bit in order to customize the view's colors through the xml.
| * | Check for insecure hash and symmetric encryption algos on decryptDominik Schürmann2015-03-051-0/+2
| | |
| * | Remove advanced preferences, move compression as menu item in encrypt ↵Dominik Schürmann2015-03-055-51/+33
| | | | | | | | | | | | activites, select hash and encryption algo based on hardcoded preferred lists
| * | Design fixes for decryption screenDominik Schürmann2015-03-0512-2/+2
| | |
* | | work on certification stepVincent Breitmoser2015-03-081-1/+10
| | |
* | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-064-6/+100
| | |
* | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-053-80/+8
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 22:02:03 +0000