Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix OperationResultParcel | mar-v-in | 2014-07-09 | 1 | -8/+8 |
* | Fix nullpointer in API, fix #693 | Dominik Schürmann | 2014-07-08 | 1 | -1/+7 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-08 | 2 | -6/+27 |
|\ | |||||
| * | Prefer composition to inheritance is the mantra these das | Art O Cathain | 2014-07-06 | 2 | -6/+27 |
* | | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 4 | -52/+246 |
|/ | |||||
* | 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 | 6 | -801/+780 |
* | 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 |
* | parcel newPassphrase | Dominik Schürmann | 2014-07-03 | 1 | -0/+4 |
* | 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 | 5 | -48/+66 |
* | 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 | 7 | -104/+339 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 11 | -378/+269 |
| |\ | |||||
| * \ | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 7 | -103/+338 |
| |\ \ | |||||
| | * | | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 2 | -4/+113 |
| | * | | use expert create key for key creation testing (revert this later on!) | Vincent Breitmoser | 2014-07-02 | 1 | -5/+50 |
| | * | | fix subkey addition | Vincent Breitmoser | 2014-07-02 | 2 | -37/+62 |
| | * | | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 5 | -60/+116 |
* | | | | fix nullpointer, cleanup | Dominik Schürmann | 2014-07-02 | 3 | -10/+9 |
* | | | | remove init methods from adapter | Dominik Schürmann | 2014-07-02 | 4 | -88/+53 |
| |_|/ |/| | | |||||
* | | | edit key: work on saving | Dominik Schürmann | 2014-07-02 | 3 | -23/+24 |
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-02 | 2 | -1/+6 |
|\| | | |||||
| * | | forgot a line in previous commit | Vincent Breitmoser | 2014-07-02 | 1 | -0/+1 |
| * | | don't use zero plural string for english | Vincent Breitmoser | 2014-07-02 | 1 | -1/+5 |
* | | | Edit key: adding user ids | Dominik Schürmann | 2014-07-02 | 10 | -221/+258 |
* | | | 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 | 15 | -68/+52 |
|\ \ | |||||
| * | | 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 | 21 | -299/+1109 |
| |\| | |||||
| * | | 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 | 2 | -9/+6 |
| * | | 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 | 4 | -34/+82 |
| |/ |/| | |||||
* | | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 4 | -83/+119 |
* | | fix nullpointerexception in importkeyactivity | Vincent Breitmoser | 2014-06-28 | 3 | -3/+20 |
* | | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 8 | -144/+117 |
* | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-06-28 | 11 | -71/+855 |
|\ \ | |/ |/| | |||||
| * | Magic to find possible mails and names of device owner | Dominik Schürmann | 2014-06-28 | 3 | -4/+145 |
| * | 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 | 6 | -91/+217 |
| |\ |