Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Remove unused NFC Beam html | Dominik Schürmann | 2015-03-10 | 24 | -268/+0 | |
| | ||||||
* | API 7 | Dominik Schürmann | 2015-03-10 | 3 | -76/+72 | |
| | ||||||
* | Ripple | Dominik Schürmann | 2015-03-10 | 23 | -41/+39 | |
| | ||||||
* | Merge branch 'contact-card' of ↵ | Dominik Schürmann | 2015-03-10 | 2 | -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 key | Dominik Schürmann | 2015-03-10 | 2 | -0/+8 | |
| | | ||||||
| * | 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 | 34 | -115/+219 | |
| | | ||||||
| * | added contact linking | Adithya Abraham Philip | 2015-03-10 | 2 | -3/+22 | |
| | | ||||||
| * | added card | Adithya Abraham Philip | 2015-03-10 | 2 | -5/+34 | |
| | | ||||||
* | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 10 | -1/+88 | |
| | | ||||||
* | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-09 | 2 | -0/+8 | |
| | | ||||||
* | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 34 | -115/+219 | |
|/ | ||||||
* | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 2 | -19/+19 | |
| | ||||||
* | 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 | 9 | -115/+17 | |
| | | ||||||
* | | Improve icons | Dominik Schürmann | 2015-03-09 | 16 | -7/+7 | |
| | | ||||||
* | | 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 | 3 | -28/+14 | |
|\| | | | | | | | development | |||||
| * | Merge pull request #1111 from adithyaphilip/passphrase-strength-indicator | Dominik Schürmann | 2015-03-09 | 2 | -26/+9 | |
| |\ | | | | | | | Passphrase strength indicator | |||||
| | * | 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 | |
| | | | ||||||
| * | | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -2/+5 | |
| |/ | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-06 | 3 | -17/+33 | |
|\| | | | | | | | development | |||||
| * | Created EmailEditText, PasswordEditText and implemented wherever required | chipset95 | 2015-03-06 | 3 | -17/+33 | |
| | | ||||||
* | | Tryout design for encrypt, decrypt | Dominik Schürmann | 2015-03-06 | 28 | -7/+76 | |
| | | ||||||
* | | Fix elevation | Dominik Schürmann | 2015-03-06 | 6 | -104/+76 | |
|/ | ||||||
* | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵ | Dominik Schürmann | 2015-03-05 | 2 | -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 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 | |
| | | ||||||
| * | Implemented Matt Allen password strength indicator | Lukas Zorich | 2015-03-03 | 1 | -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 decrypt | Dominik Schürmann | 2015-03-05 | 1 | -0/+2 | |
| | | ||||||
* | | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 5 | -51/+33 | |
| | | | | | | | | activites, select hash and encryption algo based on hardcoded preferred lists | |||||
* | | Design fixes for decryption screen | Dominik Schürmann | 2015-03-05 | 12 | -2/+2 | |
| | | ||||||
* | | Rewording secret_key_deletion_confirmation | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 | |
| | | ||||||
* | | Use material save icon | Dominik Schürmann | 2015-03-04 | 10 | -1/+1 | |
| | | ||||||
* | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵ | Dominik Schürmann | 2015-03-04 | 6 | -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 Philip | 2015-03-02 | 2 | -2/+3 | |
| |\ \ | | | | | | | | | | | | | into development | |||||
| * | | | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 1 | -0/+7 | |
| | | | | ||||||
| * | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 57 | -452/+1294 | |
| |\ \ \ | | | | | | | | | | | | | | | | into development | |||||
| * \ \ \ | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 11 | -159/+229 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into development | |||||
| * \ \ \ \ | merged dialog | Adithya Abraham Philip | 2015-02-26 | 614 | -1759/+5032 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 6 | -0/+15 | |
| | | | | | | | ||||||
* | | | | | | | Remove help button for now | Dominik Schürmann | 2015-03-04 | 6 | -15/+3 | |
| | | | | | | | ||||||
* | | | | | | | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 21 | -40/+53 | |
| | | | | | | | ||||||
* | | | | | | | Partially fix file names | Dominik Schürmann | 2015-03-04 | 158 | -13/+13 | |
| | | | | | | |