Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | remove notiion of nonce/identifier | Vincent Breitmoser | 2015-03-13 | 17 | -103/+38 | |
| | | | | ||||||
* | | | | twitter layout step3 -> step2 | Vincent Breitmoser | 2015-03-12 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | regenerate twitter token | Vincent Breitmoser | 2015-03-12 | 1 | -4/+16 | |
| | | | | ||||||
* | | | | small fix for CreateFinalFragment | Vincent Breitmoser | 2015-03-12 | 2 | -5/+2 | |
| | | | | ||||||
* | | | | twitter Step3 -> Step2 | Vincent Breitmoser | 2015-03-12 | 2 | -12/+5 | |
| | | | | ||||||
* | | | | ditch custom text step for twitter | Vincent Breitmoser | 2015-03-12 | 3 | -174/+18 | |
| | | | | ||||||
* | | | | finish implementing twitter resource | Vincent Breitmoser | 2015-03-12 | 8 | -108/+214 | |
| | | | | ||||||
* | | | | better state management in LinkedIdView, move confirm progress into card | Vincent Breitmoser | 2015-03-10 | 1 | -27/+50 | |
| | | | | ||||||
* | | | | 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 | 7 | -13/+548 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | 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 | |
| |/ / / | ||||||
* | | | | 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 | 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 | 1 | -46/+64 | |
| | | | | ||||||
* | | | | Merge remote-tracking branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 24 | -432/+786 | |
|\| | | | ||||||
| * | | | 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 | |
| | | | | ||||||
| * | | | 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 | 5 | -84/+216 | |
| |\ \ \ | | | | | | | | | | | | | | | | development |