Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 440 | -1997/+4656 |
|\ | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-13 | 2 | -5/+6 |
| |\ | |||||
| | * | Removed unused Toast import | Daniel Haß | 2014-05-11 | 1 | -1/+0 |
| | | | |||||
| | * | Toast replacement | Daniel Haß | 2014-05-11 | 1 | -2/+4 |
| | | | |||||
| | * | Fixed wrong AppMsg-Style | Daniel Haß | 2014-05-11 | 1 | -2/+2 |
| | | | |||||
| * | | 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 |
| | | |||||
| * | Version 2.7 | Dominik Schürmann | 2014-05-08 | 1 | -2/+2 |
| | | |||||
| * | Translations from transifex | Dominik Schürmann | 2014-05-08 | 19 | -3/+141 |
| | | |||||
| * | Changelog 2.7 | Dominik Schürmann | 2014-05-08 | 1 | -0/+9 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-08 | 12 | -28/+63 |
| |\ | |||||
| | * | ui: purplize dialog headers (huge hack inside) | Vincent Breitmoser | 2014-05-08 | 12 | -28/+63 |
| | | | |||||
| * | | Translations from transifex | Dominik Schürmann | 2014-05-08 | 4 | -8/+12 |
| |/ | |||||
| * | proper null checks and closing of cursors everywhere | Vincent Breitmoser | 2014-05-08 | 6 | -148/+189 |
| | | |||||
| * | use longsparsearrays instead of hashmaps in that one place | Vincent Breitmoser | 2014-05-08 | 1 | -16/+19 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-08 | 3 | -5/+1 |
| |\ | |||||
| | * | use setEncryptToSigner for asymmetric encryption | Vincent Breitmoser | 2014-05-08 | 3 | -5/+1 |
| | | | | | | | | | | | | (tested and works, closes #569) | ||||
| * | | Use flat buttons where appropriate | Dominik Schürmann | 2014-05-08 | 15 | -40/+77 |
| |/ | |||||
| * | use LoaderFragment in ViewKey tabs | Vincent Breitmoser | 2014-05-08 | 7 | -53/+35 |
| | | | | | | | | Closes #616 | ||||
| * | extract generic LoaderFragment superclass from KeyList | Vincent Breitmoser | 2014-05-08 | 4 | -144/+181 |
| | | |||||
| * | Update from transifex | Dominik Schürmann | 2014-05-08 | 27 | -14/+202 |
| | | |||||
| * | Don't allow certification using keys where primary subkey is stripped | Vincent Breitmoser | 2014-05-07 | 1 | -4/+7 |
| | | | | | | | | Closes #596 | ||||
| * | Add applications section to help | Dominik Schürmann | 2014-05-07 | 9 | -25/+11 |
| | | |||||
| * | Move API libs and API example into their own git repos | Dominik Schürmann | 2014-05-07 | 1 | -4/+4 |
| | | |||||
| * | Remove code for sharing whole key via qr code | Dominik Schürmann | 2014-05-07 | 2 | -129/+16 |
| | | |||||
| * | Start app menu item for registered apps | Dominik Schürmann | 2014-05-07 | 7 | -4/+31 |
| | | |||||
| * | GET_KEY: also return PendingIntent to key view | Dominik Schürmann | 2014-05-07 | 2 | -2/+11 |
| | | |||||
| * | Better handling of actionbars back | Dominik Schürmann | 2014-05-07 | 8 | -51/+65 |
| | | |||||
| * | Design fixes for certification activity | Dominik Schürmann | 2014-05-07 | 4 | -55/+71 |
| | | |||||
| * | 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 | 27 | -223/+180 |
| |\ | |||||
| | * | 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 | 2 | -20/+35 |
| | | | |||||
| | * | ui: primary certification icon was a pixel or two off | Vincent Breitmoser | 2014-05-07 | 1 | -2/+3 |
| | | | |||||
| | * | small fix for 6aafb3, forgot to commit this line | Vincent Breitmoser | 2014-05-07 | 1 | -0/+1 |
| | | | |||||
| | * | ui: purplize searchtext in keylist | Vincent Breitmoser | 2014-05-07 | 2 | -0/+10 |
| | | | |||||
| | * | display AppMsg warning when no encryption subkey is available | Vincent Breitmoser | 2014-05-07 | 2 | -0/+13 |
| | | | |||||
| | * | ui: slight edit icon cosmetics in keylist | Vincent Breitmoser | 2014-05-07 | 3 | -6/+13 |
| | | | |||||
| | * | ui: move revocation/expiry notes above tab slider | Vincent Breitmoser | 2014-05-07 | 4 | -54/+61 |
| | | | |||||
| | * | ui: purplize edge overscroll glow effect | Vincent Breitmoser | 2014-05-07 | 1 | -0/+20 |
| | | | |||||
| | * | ui: purpelize fastscroll thumb | Vincent Breitmoser | 2014-05-07 | 15 | -142/+23 |
| | | | |||||
| * | | Clarify language | Dominik Schürmann | 2014-05-07 | 4 | -8/+8 |
| |/ | |||||
| * | Clarify language | Dominik Schürmann | 2014-05-06 | 14 | -31/+31 |
| | | |||||
| * | Some small style fixes | Dominik Schürmann | 2014-05-06 | 8 | -33/+46 |
| | |