aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove unused NFC Beam htmlDominik Schürmann2015-03-1024-268/+0
|
* API 7Dominik Schürmann2015-03-103-76/+72
|
* 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
| |
* | 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
| | |
| * | add support for certification of user attributesVincent Breitmoser2015-03-081-2/+5
| |/
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-063-17/+33
|\| | | | | | | development
| * Created EmailEditText, PasswordEditText and implemented wherever requiredchipset952015-03-063-17/+33
| |
* | Tryout design for encrypt, decryptDominik Schürmann2015-03-0628-7/+76
| |
* | Fix elevationDominik Schürmann2015-03-066-104/+76
|/
* 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
| |
* | Rewording secret_key_deletion_confirmationDominik Schürmann2015-03-041-1/+1
| |
* | Use material save iconDominik Schürmann2015-03-0410-1/+1
| |
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵Dominik Schürmann2015-03-046-0/+22
|\ \ | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-03-022-2/+3
| |\ \ | | | | | | | | | | | | into development
| * | | added logging, notify for log exportAdithya Abraham Philip2015-03-011-0/+7
| | | |
| * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-2857-452/+1294
| |\ \ \ | | | | | | | | | | | | | | | into development
| * \ \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-2811-159/+229
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into development
| * \ \ \ \ merged dialogAdithya Abraham Philip2015-02-26614-1759/+5032
| |\ \ \ \ \
| * | | | | | initial Log Display functionAdithya Abraham Philip2015-02-266-0/+15
| | | | | | |
* | | | | | | Remove help button for nowDominik Schürmann2015-03-046-15/+3
| | | | | | |
* | | | | | | More icon naming fixes and designDominik Schürmann2015-03-0421-40/+53
| | | | | | |
* | | | | | | Partially fix file namesDominik Schürmann2015-03-04158-13/+13
| | | | | | |