Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Disable maybe methods in ImportKeysListEntry for now | Dominik Schürmann | 2015-03-10 | 1 | -2/+3 |
| | |||||
* | Fix expiry, revoked checks in OpenPgpSignatureResultBuilder | Dominik Schürmann | 2015-03-10 | 1 | -2/+2 |
| | |||||
* | API 7 | Dominik Schürmann | 2015-03-10 | 8 | -204/+555 |
| | |||||
* | Ripple | Dominik Schürmann | 2015-03-10 | 1 | -3/+1 |
| | |||||
* | Merge branch 'contact-card' of ↵ | Dominik Schürmann | 2015-03-10 | 1 | -3/+70 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | 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/+19 |
| | | |||||
| * | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-10 | 5 | -35/+312 |
| | | |||||
| * | cleaned up code, added comments | Adithya Abraham Philip | 2015-03-10 | 2 | -9/+16 |
| | | | | | | | | optimised imports | ||||
| * | added contact linking | Adithya Abraham Philip | 2015-03-10 | 2 | -9/+80 |
| | | |||||
| * | added card | Adithya Abraham Philip | 2015-03-10 | 1 | -0/+18 |
| | | |||||
* | | Merge pull request #1121 from adithyaphilip/rawcontact-deletion | Dominik Schürmann | 2015-03-10 | 1 | -3/+47 |
|\ \ | | | | | | | Fixed contact deletion Issue #1120 | ||||
| * | | added CALLER_IS_SYNCADAPTER parameter to delete queries | Adithya Abraham Philip | 2015-03-10 | 1 | -3/+47 |
| | | | |||||
* | | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 5 | -6/+433 |
|/ / | |||||
* | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-09 | 1 | -0/+19 |
| | | |||||
* | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 5 | -35/+312 |
|/ | |||||
* | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 1 | -22/+27 |
| | |||||
* | Fix ascii armor in encrypt activity | Dominik Schürmann | 2015-03-09 | 1 | -3/+2 |
| | |||||
* | Fix compression check in activities | Dominik Schürmann | 2015-03-09 | 3 | -4/+3 |
| | |||||
* | API: If signature key is known return pi to show key | Dominik Schürmann | 2015-03-09 | 1 | -73/+72 |
| | |||||
* | Fix colors for remote activity | Dominik Schürmann | 2015-03-09 | 1 | -1/+1 |
| | |||||
* | Cleanup new widgets | Dominik Schürmann | 2015-03-09 | 3 | -38/+41 |
| | |||||
* | Merge pull request #1112 from chipset95/issue-1106-imp | Dominik Schürmann | 2015-03-09 | 4 | -54/+53 |
|\ | | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 | ||||
| * | Implemented NameEditText | chipset95 | 2015-03-09 | 4 | -96/+10 |
| | | |||||
| * | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 | chipset95 | 2015-03-09 | 3 | -101/+85 |
| | | |||||
* | | Redesign of encrypt activites finished | Dominik Schürmann | 2015-03-09 | 7 | -57/+123 |
| | | |||||
* | | Removed unused PasswordEditText | Dominik Schürmann | 2015-03-09 | 1 | -101/+0 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-09 | 8 | -81/+228 |
|\| | | | | | | | development | ||||
| * | Merge pull request #1111 from adithyaphilip/passphrase-strength-indicator | Dominik Schürmann | 2015-03-09 | 4 | -64/+131 |
| |\ | | | | | | | Passphrase strength indicator | ||||
| | * | minor code style correction | Adithya Abraham Philip | 2015-03-07 | 3 | -2/+10 |
| | | | |||||
| | * | removed created by comment | Adithya Abraham Philip | 2015-03-06 | 1 | -3/+0 |
| | | | |||||
| | * | cleaned up code | Adithya Abraham Philip | 2015-03-06 | 2 | -52/+37 |
| | | | |||||
| | * | changed default colors for PasswordStrengthView | Adithya Abraham Philip | 2015-03-06 | 1 | -3/+5 |
| | | | |||||
| | * | added PassphraseEditText to SetPassphraseDialogFragment | Adithya Abraham Philip | 2015-03-06 | 2 | -5/+5 |
| | | | |||||
| | * | added PassphraseEditText | Adithya Abraham Philip | 2015-03-06 | 2 | -14/+89 |
| | | | |||||
| * | | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 4 | -17/+97 |
| |/ | |||||
* | | Remove dublicate email check | Dominik Schürmann | 2015-03-06 | 1 | -3/+1 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-06 | 1 | -38/+74 |
|\| | | | | | | | development | ||||
| * | Merge pull request #1108 from tdjogi010/development | Vincent | 2015-03-06 | 1 | -38/+74 |
| |\ | | | | | | | Asks Passphrase for key delete/export in ViewKeyActivity. | ||||
| | * | Asks Passphrase for key delete/export in ViewKeyActivity. | tdjogi010@gmail.com | 2015-03-06 | 1 | -38/+74 |
| | | | |||||
* | | | Improve way of getting possible names by filtering out emails | Dominik Schürmann | 2015-03-06 | 1 | -1/+25 |
| | | | |||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-06 | 5 | -84/+216 |
|\| | | | | | | | | | | | development | ||||
| * | | Added GPLv3 License | chipset95 | 2015-03-06 | 2 | -0/+34 |
| | | | |||||
| * | | Created EmailEditText, PasswordEditText and implemented wherever required | chipset95 | 2015-03-06 | 5 | -84/+182 |
| | | | |||||
* | | | Fix elevation | Dominik Schürmann | 2015-03-06 | 1 | -2/+2 |
|/ / | |||||
* | | Format code of merged password strength widget | Dominik Schürmann | 2015-03-05 | 2 | -40/+49 |
| | | |||||
* | | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵ | Dominik Schürmann | 2015-03-05 | 4 | -0/+496 |
|\ \ | | | | | | | | | | | | | | | | | | | 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 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -0/+68 |
| | | | |||||
| * | | Implemented Matt Allen password strength indicator | Lukas Zorich | 2015-03-03 | 2 | -0/+420 |
| |/ | | | | | | | | | | | | | 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. | ||||
* | | Use ArrayList instead of LinkedList | Dominik Schürmann | 2015-03-05 | 5 | -11/+13 |
| | |