Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 40 | -64/+200 |
|\ | |||||
| * | Ripple | Dominik Schürmann | 2015-03-10 | 23 | -41/+39 |
| * | Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain... | Dominik Schürmann | 2015-03-10 | 2 | -5/+53 |
| |\ | |||||
| | * | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-10 | 2 | -0/+8 |
| | * | 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 | 34 | -115/+219 |
| | * | added contact linking | Adithya Abraham Philip | 2015-03-10 | 2 | -3/+22 |
| | * | added card | Adithya Abraham Philip | 2015-03-10 | 2 | -5/+34 |
| * | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 10 | -1/+88 |
* | | | add expand item to linked id list | Vincent Breitmoser | 2015-03-10 | 3 | -1/+36 |
* | | | cleaner handling of verification state | Vincent Breitmoser | 2015-03-10 | 1 | -1/+2 |
* | | | Merge remote-tracking branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 82 | -474/+507 |
|\| | | |||||
| * | | Show passphrase checkbox in create key | Dominik Schürmann | 2015-03-09 | 2 | -0/+8 |
| * | | Make create key wizard step-by-step | Dominik Schürmann | 2015-03-09 | 34 | -115/+219 |
| |/ | |||||
| * | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 2 | -19/+19 |
| * | 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 |
| |\ | |||||
| | * | Implemented NameEditText | chipset95 | 2015-03-09 | 2 | -2/+2 |
| * | | Redesign of encrypt activites finished | Dominik Schürmann | 2015-03-09 | 9 | -115/+17 |
| * | | 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 |
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-03-09 | 3 | -28/+14 |
| |\| | |||||
| | * | Merge pull request #1111 from adithyaphilip/passphrase-strength-indicator | Dominik Schürmann | 2015-03-09 | 2 | -26/+9 |
| | |\ | |||||
| | | * | 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 dev... | Dominik Schürmann | 2015-03-06 | 3 | -17/+33 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Tryout design for encrypt, decrypt | Dominik Schürmann | 2015-03-06 | 28 | -7/+76 |
| * | | | Fix elevation | Dominik Schürmann | 2015-03-06 | 6 | -104/+76 |
* | | | | rearrange linked id layouts, add CertListWidget | Vincent Breitmoser | 2015-03-09 | 2 | -11/+102 |
* | | | | add linked id certs uri to KeychainProvider | Vincent Breitmoser | 2015-03-09 | 1 | -52/+0 |
* | | | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 1 | -0/+8 |
* | | | | successfully certify linked ids | Vincent Breitmoser | 2015-03-08 | 1 | -0/+1 |
* | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 20 | -75/+110 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -2/+5 |
| | |/ | |/| | |||||
| * | | Created EmailEditText, PasswordEditText and implemented wherever required | chipset95 | 2015-03-06 | 3 | -17/+33 |
| |/ | |||||
| * | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into pa... | Dominik Schürmann | 2015-03-05 | 2 | -8/+40 |
| |\ | |||||
| | * | Integrates passphrase strength indicator to create key wizard. | Lukas Zorich | 2015-03-03 | 1 | -18/+25 |
| | * | Add license to password strength view classes | Lukas Zorich | 2015-03-03 | 1 | -1/+12 |
| | * | Implemented Matt Allen password strength indicator | Lukas Zorich | 2015-03-03 | 1 | -0/+14 |
| * | | Check for insecure hash and symmetric encryption algos on decrypt | Dominik Schürmann | 2015-03-05 | 1 | -0/+2 |
| * | | Remove advanced preferences, move compression as menu item in encrypt activit... | Dominik Schürmann | 2015-03-05 | 5 | -51/+33 |
| * | | Design fixes for decryption screen | Dominik Schürmann | 2015-03-05 | 12 | -2/+2 |
* | | | work on certification step | Vincent Breitmoser | 2015-03-08 | 1 | -1/+10 |
* | | | first steps in ui towards confirmation of linked ids | Vincent Breitmoser | 2015-03-06 | 4 | -6/+100 |
* | | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 3 | -80/+8 |
* | | | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 2 | -6/+6 |
* | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 486 | -950/+370 |
|\| | |