Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 4 | -11/+26 |
* | Smaller notes | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
* | Create key: work on upload | Dominik Schürmann | 2014-07-30 | 3 | -182/+219 |
* | Create key: repeat passphrase | Dominik Schürmann | 2014-07-30 | 2 | -2/+11 |
* | Create key: upload | Dominik Schürmann | 2014-07-30 | 1 | -0/+2 |
* | Fix drawer in key list | Dominik Schürmann | 2014-07-30 | 1 | -4/+4 |
* | Create key: layout above buttons | Dominik Schürmann | 2014-07-30 | 2 | -4/+8 |
* | Fix conflicts | Dominik Schürmann | 2014-07-30 | 1 | -2/+23 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 4 | -63/+24 |
|\ | |||||
| * | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 4 | -63/+24 |
| |\ | |||||
| | * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 5 | -67/+21 |
| | * | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 7 | -218/+131 |
| | |\ | |||||
| | * | | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 2 | -1/+6 |
* | | | | Create key with fragments | Dominik Schürmann | 2014-07-30 | 3 | -80/+229 |
|/ / / | |||||
* | | | Fix build by removing old icon reference | Dominik Schürmann | 2014-07-28 | 1 | -1/+0 |
* | | | Use new icons in other key related activites, delete old icons | Dominik Schürmann | 2014-07-28 | 3 | -30/+28 |
* | | | Use verified icon for certify action | Dominik Schürmann | 2014-07-28 | 1 | -11/+40 |
* | | | Use icons in key view | Dominik Schürmann | 2014-07-28 | 2 | -21/+21 |
* | | | Use new status icons in key list | Dominik Schürmann | 2014-07-28 | 1 | -24/+6 |
* | | | Fix resource names, add small test | Dominik Schürmann | 2014-07-28 | 1 | -2/+2 |
* | | | Fix background color of notify area | Dominik Schürmann | 2014-07-27 | 1 | -2/+0 |
* | | | Redesigned QR Code view | Dominik Schürmann | 2014-07-27 | 2 | -19/+14 |
* | | | Open keyboard on passphrase dialog, this should now work on all Android versi... | Dominik Schürmann | 2014-07-27 | 1 | -0/+2 |
* | | | Prettify buttons | Dominik Schürmann | 2014-07-27 | 1 | -34/+70 |
* | | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 3 | -84/+115 |
| |/ |/| | |||||
* | | New first time screen | Dominik Schürmann | 2014-07-16 | 5 | -204/+102 |
* | | cleanup | Dominik Schürmann | 2014-07-08 | 1 | -30/+0 |
* | | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 3 | -14/+59 |
|/ | |||||
* | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 1 | -4/+4 |
* | Remove old edit button, rename activities | Dominik Schürmann | 2014-07-03 | 1 | -16/+0 |
* | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 2 | -7/+92 |
* | edit key: subkey adapter | Dominik Schürmann | 2014-07-03 | 2 | -1/+97 |
* | Work on edit | Dominik Schürmann | 2014-07-03 | 2 | -8/+0 |
* | A little bit less purple | Dominik Schürmann | 2014-07-02 | 2 | -7/+4 |
* | edit key: work on saving | Dominik Schürmann | 2014-07-02 | 1 | -8/+0 |
* | Edit key: adding user ids | Dominik Schürmann | 2014-07-02 | 4 | -15/+72 |
* | edit key: part 3 | Dominik Schürmann | 2014-07-01 | 1 | -60/+0 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-30 | 15 | -90/+60 |
|\ | |||||
| * | (should have) fixed Travis builds | Daniel Albert | 2014-06-30 | 2 | -7/+2 |
| * | Merge branch 'master' of https://github.com/open-keychain/open-keychain | Daniel Albert | 2014-06-30 | 7 | -0/+321 |
| |\ | |||||
| * | | Converted all other buttons | Daniel Albert | 2014-06-30 | 5 | -30/+23 |
| * | | Ported even more buttons to use new design (Key and User editor) | Daniel Albert | 2014-06-29 | 4 | -21/+13 |
| * | | Converted AsymetricKeyFragment to new button style | Daniel Albert | 2014-06-29 | 1 | -5/+3 |
| * | | Added new button style and converted account_settings and the select_secret_k... | Daniel Albert | 2014-06-29 | 2 | -10/+8 |
| * | | Updated file_dialog to use the new buttons | Daniel Albert | 2014-06-29 | 1 | -6/+3 |
| * | | Improved button style | Daniel Albert | 2014-06-29 | 2 | -15/+6 |
| * | | Added button_rounded style | Daniel Albert | 2014-06-28 | 1 | -3/+9 |
* | | | work on edit key | Dominik Schürmann | 2014-06-30 | 3 | -6/+2 |
| |/ |/| | |||||
* | | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 1 | -0/+6 |
* | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-06-28 | 6 | -0/+315 |
|\ \ | |/ |/| |