Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 11 | -550/+317 |
|\ | |||||
| * | Temporary program flow fixes | Dominik Schürmann | 2014-07-16 | 1 | -0/+3 |
| * | Simple create key | Dominik Schürmann | 2014-07-16 | 1 | -1/+0 |
| * | Simple create key | Dominik Schürmann | 2014-07-16 | 2 | -46/+57 |
| * | New first time screen | Dominik Schürmann | 2014-07-16 | 4 | -474/+230 |
| * | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 2 | -4/+4 |
| * | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 2 | -4/+4 |
| * | some fixes for edit | Dominik Schürmann | 2014-07-15 | 1 | -3/+4 |
| * | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 3 | -10/+234 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 4 | -53/+247 |
| |\ \ | |||||
| * | | | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 5 | -24/+21 |
* | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-software | Daniel Albert | 2014-07-13 | 2 | -7/+222 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-12 | 1 | -3/+12 |
| |\ \ \ | |||||
| * | | | | more work on edit key | Dominik Schürmann | 2014-07-12 | 2 | -7/+222 |
| | |_|/ | |/| | | |||||
* | | | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 1 | -0/+17 |
| |/ / |/| | | |||||
* | | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 1 | -2/+2 |
* | | | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 1 | -3/+12 |
|/ / | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-08 | 1 | -1/+2 |
|\| | |||||
| * | Prefer composition to inheritance is the mantra these das | Art O Cathain | 2014-07-06 | 1 | -1/+2 |
* | | 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 | 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 |