Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | API 7 | Dominik Schürmann | 2015-03-10 | 2 | -75/+70 |
| | |||||
* | 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 |
| | | |||||
* | | 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 | ||||
| * | 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 | 5 | -3/+42 |
| | | |||||
* | | 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 | 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 |
| | | |||||
* | | Design fixes for decryption screen | Dominik Schürmann | 2015-03-05 | 1 | -1/+1 |
| | | |||||
* | | Remove help button for now | Dominik Schürmann | 2015-03-04 | 1 | -15/+3 |
| | | |||||
* | | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 7 | -36/+49 |
| | | |||||
* | | Partially fix file names | Dominik Schürmann | 2015-03-04 | 12 | -13/+13 |
| | | |||||
* | | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 1 | -17/+20 |
| | | |||||
* | | Crop image view to center | Dominik Schürmann | 2015-03-04 | 1 | -4/+4 |
| | | |||||
* | | Full height contact pic in key view | Dominik Schürmann | 2015-03-04 | 1 | -1/+7 |
| | | |||||
* | | Fix status bar orange | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1097 from ishan1604/orange-toolbar | Dominik Schürmann | 2015-03-04 | 3 | -2/+33 |
|\ \ | | | | | | | Orange toolbar for certify and fingerprint activity added | ||||
| * | | Orange Toolbar Added Fixes #1088 | Ishan Khanna | 2015-03-04 | 3 | -2/+33 |
| | | | |||||
* | | | Merge branch 'development' of https://github.com/vectorijk/open-keychain ↵ | Dominik Schürmann | 2015-03-03 | 23 | -39/+39 |
|\ \ \ | | | | | | | | | | | | | into vectorijk-development | ||||
| * | | | change icon name in layout files | jiangkai | 2015-03-03 | 23 | -39/+39 |
| | |/ | |/| | |||||
* | | | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 1 | -17/+43 |
| | | | |||||
* | | | Prettify passphrase dialog, it no longer resizes on unlocking the key | Dominik Schürmann | 2015-03-03 | 1 | -9/+18 |
| |/ |/| | |||||
* | | Fix toolbar margins on Android lower 5 | Dominik Schürmann | 2015-03-03 | 6 | -6/+6 |
| | | |||||
* | | Use spinner DatePicker, not full calendar, also on Android 5 | Dominik Schürmann | 2015-03-03 | 2 | -37/+59 |
|/ | |||||
* | make userattributeadapter superclass of useridsadapter | Vincent Breitmoser | 2015-03-02 | 2 | -7/+19 |
| | |||||
* | control flow for moving the fab up with snackbar | Vincent Breitmoser | 2015-02-28 | 1 | -2/+4 |
| | |||||
* | Upload new keys to keyserver by default | Dominik Schürmann | 2015-02-28 | 1 | -0/+1 |
| | |||||
* | padding fixes for key list | Dominik Schürmann | 2015-02-28 | 1 | -2/+1 |
| |