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 | 47 | -77/+748 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml | ||||
| * | Ripple | Dominik Schürmann | 2015-03-10 | 24 | -44/+40 |
| | | |||||
| * | Merge branch 'contact-card' of ↵ | Dominik Schürmann | 2015-03-10 | 3 | -8/+123 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -0/+27 |
| | | | |||||
| | * | 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 | 40 | -151/+532 |
| | | | |||||
| | * | 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 | 4 | -12/+102 |
| | | | |||||
| | * | added card | Adithya Abraham Philip | 2015-03-10 | 3 | -5/+52 |
| | | | |||||
| * | | 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 | 15 | -7/+521 |
| |/ / | |||||
* | | | add expand item to linked id list | Vincent Breitmoser | 2015-03-10 | 5 | -5/+79 |
| | | | |||||
* | | | filter out unknown linked ids | Vincent Breitmoser | 2015-03-10 | 3 | -22/+116 |
| | | | |||||
* | | | minor additions to CertListWidget | Vincent Breitmoser | 2015-03-10 | 2 | -9/+18 |
| | | | |||||
* | | | cleaner handling of verification state | Vincent Breitmoser | 2015-03-10 | 2 | -47/+66 |
| | | | |||||
* | | | Merge remote-tracking branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 107 | -907/+1294 |
|\| | | |||||
| * | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-09 | 3 | -0/+27 |
| | | | |||||
| * | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 40 | -151/+532 |
| |/ | |||||
| * | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 3 | -41/+46 |
| | | |||||
| * | 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 | 3 | -14/+7 |
| | | |||||
| * | 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 | 6 | -56/+55 |
| |\ | | | | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 | ||||
| | * | Implemented NameEditText | chipset95 | 2015-03-09 | 6 | -98/+12 |
| | | | |||||
| | * | 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 | 16 | -172/+140 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | 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 | 11 | -109/+242 |
| |\| | | | | | | | | | | development | ||||
| | * | Merge pull request #1111 from adithyaphilip/passphrase-strength-indicator | Dominik Schürmann | 2015-03-09 | 6 | -90/+140 |
| | |\ | | | | | | | | | Passphrase strength indicator | ||||
| | | * | minor xml code style correction | Adithya Abraham Philip | 2015-03-08 | 1 | -8/+8 |
| | | | | |||||
| | | * | 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 | 3 | -52/+38 |
| | | | | |||||
| | | * | changed default colors for PasswordStrengthView | Adithya Abraham Philip | 2015-03-06 | 2 | -8/+6 |
| | | | | |||||
| | | * | added PassphraseEditText to SetPassphraseDialogFragment | Adithya Abraham Philip | 2015-03-06 | 3 | -6/+6 |
| | | | | |||||
| | | * | added PassphraseEditText | Adithya Abraham Philip | 2015-03-06 | 3 | -31/+92 |
| | | | | |||||
| * | | | 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 | ||||
| * | | | 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 | 8 | -101/+249 |
| |\ \ \ | | | | | | | | | | | | | | | | development | ||||
| * | | | | Tryout design for encrypt, decrypt | Dominik Schürmann | 2015-03-06 | 28 | -7/+76 |
| | | | | | |||||
| * | | | | Fix elevation | Dominik Schürmann | 2015-03-06 | 7 | -106/+78 |
| | | | | | |||||
* | | | | | 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 |
| | | | | |