aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | | | | | | | 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 listsDominik Schürmann2015-03-151-1/+1
| |
| * Dont display key ids in KeySpinner, display creation date when user ids ↵Dominik Schürmann2015-03-151-2/+2
| | | | | | | | duplicate
| * 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
|\| | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 06:45:10 +0000