Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 2 | -2/+11 |
* | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 2 | -0/+5 |
* | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-bads... | Vincent Breitmoser | 2014-07-09 | 8 | -830/+1 |
|\ | |||||
| * | actually provide a tostring | Art O Cathain | 2014-07-07 | 1 | -1/+1 |
| * | prevent odd ambiguous method toString error | Art O Cathain | 2014-07-07 | 1 | -1/+1 |
| * | (c) headers, tidy imports | Art O Cathain | 2014-07-07 | 6 | -7/+100 |
| * | use KeyringTestHelper.diffKeyrings method for unit test | Vincent Breitmoser | 2014-07-07 | 1 | -1/+1 |
| * | add diffKeyrings method | Vincent Breitmoser | 2014-07-07 | 1 | -0/+133 |
| * | Actually test canonicalize | Art O Cathain | 2014-07-06 | 2 | -75/+160 |
| * | data fixes | Art O Cathain | 2014-07-06 | 1 | -13/+14 |
| * | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 |
| * | actually canonicalize | Art O Cathain | 2014-07-06 | 1 | -1/+10 |
| * | work in progress | Art O Cathain | 2014-07-06 | 3 | -1/+511 |
* | | use KeyringTestHelper.diffKeyrings method for unit test | Vincent Breitmoser | 2014-07-07 | 1 | -1/+1 |
* | | add diffKeyrings method | Vincent Breitmoser | 2014-07-07 | 1 | -0/+133 |
* | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' | Vincent Breitmoser | 2014-07-07 | 4 | -1/+530 |
|\ \ | |/ |/| | |||||
| * | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 |
| * | actually canonicalize | Art O Cathain | 2014-07-06 | 1 | -1/+10 |
| * | work in progress | Art O Cathain | 2014-07-06 | 3 | -1/+511 |
* | | Prefer composition to inheritance is the mantra these das | Art O Cathain | 2014-07-06 | 2 | -6/+27 |
|/ | |||||
* | 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 |