Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 5 | -24/+21 |
* | Prefer composition to inheritance is the mantra these das | Art O Cathain | 2014-07-06 | 1 | -1/+2 |
* | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 1 | -3/+4 |
* | Remove old edit button, rename activities | Dominik Schürmann | 2014-07-03 | 5 | -796/+775 |
* | cleanup, debug for passphrase set | Dominik Schürmann | 2014-07-03 | 1 | -5/+4 |
* | fix no passphrase check | Dominik Schürmann | 2014-07-03 | 1 | -1/+3 |
* | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 1 | -2/+2 |
* | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 3 | -30/+60 |
* | cleanup | Dominik Schürmann | 2014-07-03 | 2 | -0/+5 |
* | edit key: subkey adapter | Dominik Schürmann | 2014-07-03 | 2 | -1/+361 |
* | Work on edit | Dominik Schürmann | 2014-07-03 | 4 | -41/+59 |
* | smaller dropdown items | Dominik Schürmann | 2014-07-03 | 2 | -4/+4 |
* | Remove unnecessary error logs | Dominik Schürmann | 2014-07-02 | 2 | -2/+2 |
* | merge KeychainIntentService | Dominik Schürmann | 2014-07-02 | 1 | -5/+50 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 10 | -362/+254 |
| |\ | |||||
| * \ | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 1 | -5/+50 |
| |\ \ | |||||
| | * | | use expert create key for key creation testing (revert this later on!) | Vincent Breitmoser | 2014-07-02 | 1 | -5/+50 |
* | | | | fix nullpointer, cleanup | Dominik Schürmann | 2014-07-02 | 3 | -10/+9 |
* | | | | remove init methods from adapter | Dominik Schürmann | 2014-07-02 | 3 | -88/+52 |
| |_|/ |/| | | |||||
* | | | edit key: work on saving | Dominik Schürmann | 2014-07-02 | 3 | -23/+24 |
* | | | Edit key: adding user ids | Dominik Schürmann | 2014-07-02 | 9 | -205/+243 |
* | | | edit key: part 3 | Dominik Schürmann | 2014-07-01 | 4 | -327/+180 |
|/ / | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-30 | 14 | -64/+49 |
|\ \ | |||||
| * | | Fixed Bootstrap resource | Daniel Albert | 2014-06-30 | 1 | -1/+1 |
| * | | Fixed, issue #702 | Daniel Albert | 2014-06-30 | 1 | -1/+1 |
| * | | Merge branch 'master' of https://github.com/open-keychain/open-keychain | Daniel Albert | 2014-06-30 | 13 | -154/+763 |
| |\| | |||||
| * | | Converted all other buttons | Daniel Albert | 2014-06-30 | 5 | -30/+20 |
| * | | Ported even more buttons to use new design (Key and User editor) | Daniel Albert | 2014-06-29 | 4 | -13/+12 |
| * | | Converted AsymetricKeyFragment to new button style | Daniel Albert | 2014-06-29 | 1 | -4/+3 |
| * | | Added new button style and converted account_settings and the select_secret_k... | Daniel Albert | 2014-06-29 | 1 | -5/+3 |
| * | | Updated file_dialog to use the new buttons | Daniel Albert | 2014-06-29 | 2 | -7/+6 |
| * | | Added button_rounded style | Daniel Albert | 2014-06-28 | 1 | -3/+3 |
* | | | work on edit key | Dominik Schürmann | 2014-06-30 | 3 | -33/+80 |
| |/ |/| | |||||
* | | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 2 | -81/+24 |
* | | fix nullpointerexception in importkeyactivity | Vincent Breitmoser | 2014-06-28 | 2 | -1/+10 |
* | | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 3 | -5/+11 |
* | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-06-28 | 10 | -69/+720 |
|\ \ | |/ |/| | |||||
| * | Magic to find possible mails and names of device owner | Dominik Schürmann | 2014-06-28 | 2 | -2/+10 |
| * | More wizardry | Dominik Schürmann | 2014-06-27 | 3 | -89/+159 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-27 | 1 | -1/+5 |
| |\ | |||||
| * | | Start work on a first-time wizard | Dominik Schürmann | 2014-06-27 | 2 | -4/+399 |
| * | | new edit key: first version to add user ids | Dominik Schürmann | 2014-06-24 | 5 | -58/+236 |
* | | | Added unlock icon, fixed drawer items, switched to icons from resource in drawer | Daniel Albert | 2014-06-27 | 1 | -11/+15 |
| |/ |/| | |||||
* | | Fix for #687 | Daniel Albert | 2014-06-24 | 1 | -1/+5 |
|/ | |||||
* | new edit key: change passphrase | Dominik Schürmann | 2014-06-22 | 1 | -63/+107 |
* | new edit key: diff for existing user ids | Dominik Schürmann | 2014-06-22 | 5 | -26/+379 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-22 | 2 | -2/+2 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-06-22 | 5 | -8/+326 |
| |\ | |||||
| * | | use hashcode instead of keyid in import list (keyids may not be unique!) | Vincent Breitmoser | 2014-06-22 | 2 | -2/+2 |
* | | | Rename adapter | Dominik Schürmann | 2014-06-22 | 6 | -29/+39 |
| |/ |/| |