Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 133 | -546/+975 |
|\ | |||||
| * | identity instead of credentials | Dominik Schürmann | 2014-08-01 | 1 | -1/+1 |
| * | Start fixing CachedPublicKeyRing | Dominik Schürmann | 2014-08-01 | 1 | -1/+0 |
| * | Certifying instead of signing | Dominik Schürmann | 2014-08-01 | 1 | -0/+1 |
| * | move upload/update buttons from menu to buttons | Vincent Breitmoser | 2014-07-31 | 4 | -19/+47 |
| * | Remove private/secret key language from strings | Dominik Schürmann | 2014-07-31 | 1 | -9/+5 |
| * | Fixes for upload | Dominik Schürmann | 2014-07-31 | 1 | -0/+1 |
| * | Create key: design fixes | Dominik Schürmann | 2014-07-31 | 8 | -22/+45 |
| * | Fix animations in create key | Dominik Schürmann | 2014-07-31 | 2 | -25/+13 |
| * | Add notify layouts to some activities | Dominik Schürmann | 2014-07-31 | 4 | -80/+104 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 1 | -0/+14 |
| |\ | |||||
| | * | completely overengineer progress indication in {modify,create}SecretKeyRing m... | Vincent Breitmoser | 2014-07-31 | 1 | -0/+14 |
| * | | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 9 | -15/+36 |
| |/ | |||||
| * | Fix string | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| * | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 9 | -21/+23 |
| * | Smaller notes | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| * | Exception handling with keyserver queries | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| * | Better exception handling for import of keys | Dominik Schürmann | 2014-07-31 | 6 | -6/+6 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 1 | -0/+1 |
| |\ | |||||
| | * | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 1 | -0/+1 |
| * | | Create key: work on upload | Dominik Schürmann | 2014-07-30 | 3 | -182/+219 |
| |/ | |||||
| * | Create key: repeat passphrase | Dominik Schürmann | 2014-07-30 | 3 | -4/+14 |
| * | Create key: upload | Dominik Schürmann | 2014-07-30 | 1 | -0/+2 |
| * | Fix drawer in key list | Dominik Schürmann | 2014-07-30 | 1 | -4/+4 |
| * | Create key: layout above buttons | Dominik Schürmann | 2014-07-30 | 2 | -4/+8 |
| * | Fix conflicts | Dominik Schürmann | 2014-07-30 | 1 | -2/+23 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 12 | -70/+33 |
| |\ | |||||
| | * | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 12 | -70/+33 |
| | |\ | |||||
| | | * | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 7 | -7/+7 |
| | | * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 5 | -67/+21 |
| | | * | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 11 | -227/+183 |
| | | |\ | |||||
| | | * | | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 3 | -1/+7 |
| | | * | | get rid of AppMsg library | Vincent Breitmoser | 2014-07-07 | 1 | -0/+1 |
| * | | | | Create key with fragments | Dominik Schürmann | 2014-07-30 | 9 | -80/+261 |
| |/ / / | |||||
| * | | | Fix build by removing old icon reference | Dominik Schürmann | 2014-07-28 | 1 | -1/+0 |
| * | | | Use new icons in other key related activites, delete old icons | Dominik Schürmann | 2014-07-28 | 31 | -30/+28 |
| * | | | Use verified icon for certify action | Dominik Schürmann | 2014-07-28 | 1 | -11/+40 |
| * | | | Use icons in key view | Dominik Schürmann | 2014-07-28 | 3 | -21/+25 |
| * | | | Use new status icons in key list | Dominik Schürmann | 2014-07-28 | 1 | -24/+6 |
| * | | | Smaller status images, green test | Dominik Schürmann | 2014-07-28 | 60 | -0/+0 |
| * | | | Fix resource names, add small test | Dominik Schürmann | 2014-07-28 | 61 | -2/+2 |
| * | | | Add icons from ModernPGP project | Dominik Schürmann | 2014-07-28 | 60 | -0/+0 |
| * | | | Fix background color of notify area | Dominik Schürmann | 2014-07-27 | 1 | -2/+0 |
| * | | | Redesigned QR Code view | Dominik Schürmann | 2014-07-27 | 4 | -19/+47 |
| * | | | Open keyboard on passphrase dialog, this should now work on all Android versi... | Dominik Schürmann | 2014-07-27 | 1 | -0/+2 |
| * | | | Prettify buttons | Dominik Schürmann | 2014-07-27 | 1 | -34/+70 |
| * | | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 4 | -84/+120 |
| | |/ | |/| | |||||
| * | | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 1 | -0/+1 |
* | | | Remove support for V3 signatures | Dominik Schürmann | 2014-07-22 | 2 | -10/+3 |
|/ / | |||||
* | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 1 | -0/+2 |