Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | hack loadSystemContact back in | Vincent Breitmoser | 2015-03-10 | 2 | -5/+13 |
| | |||||
* | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 6 | -7/+500 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml | ||||
| * | 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 | 1 | -9/+15 |
| | | | | | | | | | | | | optimised imports | ||||
| | * | added contact linking | Adithya Abraham Philip | 2015-03-10 | 1 | -9/+52 |
| | | | |||||
| | * | added card | Adithya Abraham Philip | 2015-03-10 | 1 | -0/+18 |
| | | | |||||
| * | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 5 | -6/+433 |
| | | | |||||
* | | | add expand item to linked id list | Vincent Breitmoser | 2015-03-10 | 2 | -4/+43 |
| | | | |||||
* | | | filter out unknown linked ids | Vincent Breitmoser | 2015-03-10 | 2 | -22/+40 |
| | | | |||||
* | | | minor additions to CertListWidget | Vincent Breitmoser | 2015-03-10 | 2 | -9/+18 |
| | | | |||||
* | | | cleaner handling of verification state | Vincent Breitmoser | 2015-03-10 | 1 | -46/+64 |
| | | | |||||
* | | | Merge remote-tracking branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 22 | -354/+687 |
|\| | | |||||
| * | | 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 |
| | | |||||
| * | 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 | 4 | -64/+131 |
| |\| | | | | | | | | | | development | ||||
| | * | 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 |
| | | | |||||
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-06 | 1 | -38/+74 |
| |\| | | | | | | | | | | development | ||||
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-06 | 5 | -84/+216 |
| |\ \ | | | | | | | | | | | | | development | ||||
| * | | | Fix elevation | Dominik Schürmann | 2015-03-06 | 1 | -2/+2 |
| | | | | |||||
* | | | | concurrency and continuity fixes for verification backstack handling | Vincent Breitmoser | 2015-03-10 | 1 | -14/+26 |
| | | | | |||||
* | | | | support backstack for verification | Vincent Breitmoser | 2015-03-09 | 1 | -12/+26 |
| | | | | |||||
* | | | | rearrange linked id layouts, add CertListWidget | Vincent Breitmoser | 2015-03-09 | 3 | -69/+192 |
| | | | | |||||
* | | | | fix transition animation | Vincent Breitmoser | 2015-03-09 | 3 | -9/+41 |
| | | | | |||||
* | | | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 6 | -109/+251 |
| | | | | |||||
* | | | | successfully certify linked ids | Vincent Breitmoser | 2015-03-08 | 4 | -21/+80 |
| | | | | |||||
* | | | | return key ids from PassphraseDialogActivity, accept null userids | Vincent Breitmoser | 2015-03-08 | 3 | -5/+3 |
| | | | | |||||
* | | | | minor changes, add convertFingerprintToKeyId method | Vincent Breitmoser | 2015-03-08 | 2 | -1/+6 |
| | | | | |||||
* | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 14 | -281/+839 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | | | 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 |
| | | | | |||||
| * | | | Added GPLv3 License | chipset95 | 2015-03-06 | 2 | -0/+34 |
| | | | | |||||
| * | | | Created EmailEditText, PasswordEditText and implemented wherever required | chipset95 | 2015-03-06 | 5 | -84/+182 |
| | |/ | |/| | |||||
| * | | 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 | 3 | -0/+494 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java |