Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Small strings fix | Dominik Schürmann | 2014-07-03 | 1 | -1/+1 |
* | 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 | 3 | -12/+3 |
* | A little bit less purple | Dominik Schürmann | 2014-07-02 | 2 | -7/+4 |
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 5 | -83/+72 |
|\ | |||||
| * | edit key: work on saving | Dominik Schürmann | 2014-07-02 | 1 | -8/+0 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-02 | 1 | -1/+1 |
| |\ | |||||
| * | | 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 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 1 | -0/+4 |
|\ \ \ | |_|/ |/| | | |||||
| * | | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 1 | -0/+2 |
| * | | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 1 | -0/+2 |
* | | | don't use zero plural string for english | Vincent Breitmoser | 2014-07-02 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-30 | 42 | -90/+216 |
|\ \ | |||||
| * | | (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 | 8 | -10/+345 |
| |\| | |||||
| * | | Converted all other buttons | Daniel Albert | 2014-06-30 | 18 | -30/+28 |
| * | | Ported even more buttons to use new design (Key and User editor) | Daniel Albert | 2014-06-29 | 13 | -24/+90 |
| * | | 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 | 7 | -10/+45 |
| * | | Updated file_dialog to use the new buttons | Daniel Albert | 2014-06-29 | 1 | -6/+3 |
| * | | Improved button style | Daniel Albert | 2014-06-29 | 3 | -21/+12 |
| * | | Added button_rounded style | Daniel Albert | 2014-06-28 | 2 | -3/+49 |
* | | | 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 |
* | | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 1 | -10/+23 |
* | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-06-28 | 7 | -0/+316 |
|\ \ | |/ |/| | |||||
| * | Magic to find possible mails and names of device owner | Dominik Schürmann | 2014-06-28 | 1 | -1/+1 |
| * | More wizardry | Dominik Schürmann | 2014-06-27 | 2 | -15/+43 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-27 | 1 | -0/+8 |
| |\ | |||||
| * | | Start work on a first-time wizard | Dominik Schürmann | 2014-06-27 | 5 | -0/+218 |
| * | | new edit key: first version to add user ids | Dominik Schürmann | 2014-06-24 | 2 | -0/+70 |
* | | | Switched to the dark icons | Daniel Albert | 2014-06-28 | 4 | -0/+0 |
* | | | Added unlock icon, fixed drawer items, switched to icons from resource in drawer | Daniel Albert | 2014-06-27 | 5 | -3/+5 |
* | | | Swapped out FontawesomeText with normal ImageView | Daniel Albert | 2014-06-26 | 1 | -10/+6 |
| |/ |/| | |||||
* | | Temporary fix for #648 | Daniel Albert | 2014-06-25 | 1 | -0/+8 |
|/ | |||||
* | Rename registered apps to apps | Dominik Schürmann | 2014-06-24 | 1 | -2/+2 |
* | remove margin in import keys (leftover from nav drawer) | Dominik Schürmann | 2014-06-23 | 1 | -2/+0 |
* | new edit key: diff for existing user ids | Dominik Schürmann | 2014-06-22 | 2 | -10/+21 |
* | add buttons in edit key | Dominik Schürmann | 2014-06-22 | 1 | -0/+64 |
* | Revert hint_keybase_search | Dominik Schürmann | 2014-06-22 | 1 | -1/+1 |
* | Merge pull request #668 from timbray/master | Dominik Schürmann | 2014-06-21 | 1 | -1/+1 |
|\ | |||||
| * | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -1/+1 |
* | | Start new designed activity | Dominik Schürmann | 2014-06-21 | 3 | -0/+73 |
|/ | |||||
* | Use actionbar button for log activity | Dominik Schürmann | 2014-06-20 | 1 | -30/+0 |
* | Fix onTouchEvent delegation, with workaround for Android bug | Dominik Schürmann | 2014-06-20 | 1 | -8/+0 |
* | Remove unused code to import splitted qr codes | Dominik Schürmann | 2014-06-19 | 1 | -19/+0 |
* | Reference ic_launcher instead of icon | Dominik Schürmann | 2014-06-18 | 4 | -4/+4 |