Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | | | | Closes #695 | ||||
| * | 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 |
| | | | | | | | | closes #703 | ||||
* | | 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 |
| | | | | | | | | | | | | Added drawables for them | ||||
| * | | Converted AsymetricKeyFragment to new button style | Daniel Albert | 2014-06-29 | 1 | -5/+3 |
| | | | |||||
| * | | Added new button style and converted account_settings and the ↵ | Daniel Albert | 2014-06-29 | 7 | -10/+45 |
| | | | | | | | | | | | | select_secret_key_layout to use it | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | centered buttons removed commented-out button | ||||
| * | | Added button_rounded style | Daniel Albert | 2014-06-28 | 2 | -3/+49 |
| | | | | | | | | | | | | converted decrypt_file_fragment to new style | ||||
* | | | 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 |
| | | | | | | | | closes #698 | ||||
* | | 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 | ||||
| * | 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 |
| | |||||
* | decrease size of search icons in import | Dominik Schürmann | 2014-06-18 | 2 | -2/+2 |
| | |||||
* | Fix new actionbar icon sizes, rename icon to ic_launcher following Android ↵ | Dominik Schürmann | 2014-06-18 | 15 | -2/+2 |
| | | | | naming conventions | ||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-18 | 1 | -3/+4 |
|\ | |||||
| * | canonicalize: missed two logging entries | Vincent Breitmoser | 2014-06-18 | 1 | -3/+4 |
| | | |||||
* | | consistent button design in import activity | Dominik Schürmann | 2014-06-18 | 2 | -18/+0 |
|/ | |||||
* | Merge branch 'new-edit' | Vincent Breitmoser | 2014-06-18 | 1 | -1/+19 |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | new-edit: add logging to modifySecretKeyRing operation | Vincent Breitmoser | 2014-06-17 | 1 | -0/+19 |
| | | |||||
* | | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -1/+2 |
| | | |||||
* | | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 1 | -3/+4 |
| | | |||||
* | | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 1 | -3/+3 |
| | | |||||
* | | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 1 | -6/+8 |
| | |