Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 3 | -79/+108 |
| | |||||
* | 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 |
| | | | | | | | | | | | | 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 | 2 | -10/+8 |
| | | | | | | | | | | | | 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 | 2 | -15/+6 |
| | | | | | | | | | | | | | | | centered buttons removed commented-out button | ||||
| * | | Added button_rounded style | Daniel Albert | 2014-06-28 | 1 | -3/+9 |
| | | | | | | | | | | | | 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 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-06-28 | 6 | -0/+315 |
|\ \ | |/ |/| | |||||
| * | 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 |
| | | |||||
| * | Start work on a first-time wizard | Dominik Schürmann | 2014-06-27 | 4 | -0/+217 |
| | | |||||
| * | new edit key: first version to add user ids | Dominik Schürmann | 2014-06-24 | 2 | -0/+70 |
| | | |||||
* | | Added unlock icon, fixed drawer items, switched to icons from resource in drawer | Daniel Albert | 2014-06-27 | 1 | -3/+5 |
| | | |||||
* | | Swapped out FontawesomeText with normal ImageView | Daniel Albert | 2014-06-26 | 1 | -10/+6 |
|/ | |||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | 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 | 3 | -3/+3 |
| | |||||
* | 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 | 1 | -2/+2 |
| | | | | naming conventions | ||||
* | consistent button design in import activity | Dominik Schürmann | 2014-06-18 | 2 | -18/+0 |
| | |||||
* | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 9 | -120/+201 |
| | |||||
* | Added notification area to decrypt content | Daniel Haß | 2014-06-16 | 1 | -0/+2 |
| | |||||
* | Added notification area as reusable layout | Daniel Haß | 2014-06-16 | 1 | -0/+12 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 2 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle | ||||
| * | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage | Dominik Schürmann | 2014-06-06 | 2 | -2/+2 |
| | | |||||
* | | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 1 | -1/+9 |
| | | |||||
* | | import-log: add LogDisplay activity | Vincent Breitmoser | 2014-06-10 | 4 | -17/+91 |
|/ | |||||
* | Layout fixes for key import | Dominik Schürmann | 2014-05-19 | 9 | -66/+58 |
| | |||||
* | Use flat buttons where appropriate | Dominik Schürmann | 2014-05-08 | 4 | -26/+67 |
| | |||||
* | use LoaderFragment in ViewKey tabs | Vincent Breitmoser | 2014-05-08 | 3 | -9/+3 |
| | | | | Closes #616 | ||||
* | extract generic LoaderFragment superclass from KeyList | Vincent Breitmoser | 2014-05-08 | 2 | -83/+93 |
| | |||||
* | Better handling of actionbars back | Dominik Schürmann | 2014-05-07 | 1 | -3/+3 |
| | |||||
* | Design fixes for certification activity | Dominik Schürmann | 2014-05-07 | 1 | -2/+27 |
| | |||||
* | Alignment in certify activity | Dominik Schürmann | 2014-05-07 | 1 | -0/+1 |
| | |||||
* | Use paste icon, clarify language once again | Dominik Schürmann | 2014-05-07 | 2 | -3/+3 |
| | |||||
* | Clarify language | Dominik Schürmann | 2014-05-07 | 1 | -1/+1 |
| | |||||
* | ui: use SlidingTabLayout in help activity | Vincent Breitmoser | 2014-05-07 | 1 | -0/+5 |
| | |||||
* | ui: primary certification icon was a pixel or two off | Vincent Breitmoser | 2014-05-07 | 1 | -2/+3 |
| | |||||
* | ui: slight edit icon cosmetics in keylist | Vincent Breitmoser | 2014-05-07 | 2 | -6/+9 |
| | |||||
* | ui: move revocation/expiry notes above tab slider | Vincent Breitmoser | 2014-05-07 | 2 | -22/+29 |
| |