Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Add Log.d for QueryFailedException | Tim Bray | 2014-05-23 | 1 | -3/+3 | |
| | | | ||||||
| * | | Pull from transifex | Dominik Schürmann | 2014-05-31 | 92 | -649/+1314 | |
| |/ | ||||||
* | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-21 | 10 | -67/+59 | |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| * | Layout fixes for key import | Dominik Schürmann | 2014-05-19 | 9 | -66/+58 | |
| | | ||||||
| * | Clarify help start | Dominik Schürmann | 2014-05-14 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 366 | -941/+2107 | |
|\| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | Add pgpauth app to help, update html-textview | Dominik Schürmann | 2014-05-13 | 3 | -27/+4 | |
| | | ||||||
| * | Add Tim Bray to about | Dominik Schürmann | 2014-05-09 | 1 | -0/+1 | |
| | | ||||||
| * | Translations from transifex | Dominik Schürmann | 2014-05-08 | 19 | -3/+141 | |
| | | ||||||
| * | Changelog 2.7 | Dominik Schürmann | 2014-05-08 | 1 | -0/+9 | |
| | | ||||||
| * | Translations from transifex | Dominik Schürmann | 2014-05-08 | 4 | -8/+12 | |
| | | ||||||
| * | Use flat buttons where appropriate | Dominik Schürmann | 2014-05-08 | 12 | -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 | |
| | | ||||||
| * | Update from transifex | Dominik Schürmann | 2014-05-08 | 27 | -14/+202 | |
| | | ||||||
| * | Add applications section to help | Dominik Schürmann | 2014-05-07 | 5 | -20/+6 | |
| | | ||||||
| * | Start app menu item for registered apps | Dominik Schürmann | 2014-05-07 | 6 | -0/+7 | |
| | | ||||||
| * | 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 | 3 | -11/+28 | |
| | | ||||||
| * | Alignment in certify activity | Dominik Schürmann | 2014-05-07 | 1 | -0/+1 | |
| | | ||||||
| * | Change drawer nav icon back to gray | Dominik Schürmann | 2014-05-07 | 8 | -0/+0 | |
| | | ||||||
| * | Translations from transifex | Dominik Schürmann | 2014-05-07 | 1 | -5/+6 | |
| | | ||||||
| * | Use paste icon, clarify language once again | Dominik Schürmann | 2014-05-07 | 8 | -7/+8 | |
| | | ||||||
| * | Pull translations from transifex | Dominik Schürmann | 2014-05-07 | 6 | -7/+3 | |
| | | ||||||
| * | Clarify language | Dominik Schürmann | 2014-05-07 | 2 | -3/+4 | |
| | | ||||||
| * | Pull translations from transifex | Dominik Schürmann | 2014-05-07 | 17 | -102/+151 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-07 | 22 | -171/+78 | |
| |\ | ||||||
| | * | ui: apply theme to tab buttons | Vincent Breitmoser | 2014-05-07 | 1 | -0/+2 | |
| | | | ||||||
| | * | 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: purplize searchtext in keylist | Vincent Breitmoser | 2014-05-07 | 1 | -0/+7 | |
| | | | ||||||
| | * | display AppMsg warning when no encryption subkey is available | Vincent Breitmoser | 2014-05-07 | 1 | -0/+1 | |
| | | | ||||||
| | * | 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 | |
| | | | ||||||
| | * | ui: purpelize fastscroll thumb | Vincent Breitmoser | 2014-05-07 | 15 | -142/+23 | |
| | | | ||||||
| * | | Clarify language | Dominik Schürmann | 2014-05-07 | 2 | -6/+6 | |
| |/ | ||||||
| * | Clarify language | Dominik Schürmann | 2014-05-06 | 13 | -30/+30 | |
| | | ||||||
| * | Some small style fixes | Dominik Schürmann | 2014-05-06 | 8 | -33/+46 | |
| | | ||||||
| * | edit button with image | Dominik Schürmann | 2014-05-06 | 1 | -2/+3 | |
| | | ||||||
| * | Always use section style instead of custom class | Dominik Schürmann | 2014-05-06 | 4 | -12/+8 | |
| | | ||||||
| * | ui: apply purple theme (twi is best color) | Vincent Breitmoser | 2014-05-06 | 229 | -26/+570 | |
| | | ||||||
| * | ui: use textview buttons in decrypt verify dialogue | Vincent Breitmoser | 2014-05-06 | 3 | -47/+69 | |
| | | ||||||
| * | ui: use textviews instead of bootstrap buttons in SignEncrypt | Vincent Breitmoser | 2014-05-06 | 3 | -35/+42 | |
| | | ||||||
| * | ui: make primary star icon slightly larger | Vincent Breitmoser | 2014-05-06 | 8 | -0/+0 | |
| | | ||||||
| * | ui: use primary icon color for certification status | Vincent Breitmoser | 2014-05-06 | 9 | -6/+0 | |
| | | ||||||
| * | ui: show revocation and expiry status on info tab | Vincent Breitmoser | 2014-05-06 | 1 | -19/+34 | |
| | | ||||||
| * | ui: subkey view redesign | Vincent Breitmoser | 2014-05-05 | 1 | -62/+80 | |
| | | ||||||
| * | ui: remove primary subkey info | Vincent Breitmoser | 2014-05-05 | 2 | -118/+1 | |
| | | ||||||
| * | Merge pull request #603 from timbray/master | Dominik Schürmann | 2014-05-05 | 3 | -0/+55 | |
| |\ | | | | | | | Adds first level of keybase support | |||||
| | * | can search openkeychain, retrieve & install & use keys from there | Tim Bray | 2014-04-29 | 3 | -0/+55 | |
| | | |