Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 1 | -1/+0 |
* | Remove old edit key stuff | Dominik Schürmann | 2014-08-04 | 3 | -309/+0 |
* | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 6 | -236/+136 |
* | button language in encrypt | Dominik Schürmann | 2014-08-04 | 1 | -2/+1 |
* | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 3 | -30/+31 |
* | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 26 | -255/+367 |
|\ | |||||
| * | Minor cleanup | mar-v-in | 2014-08-02 | 2 | -1/+2 |
| * | Fix focusing with To field | mar-v-in | 2014-08-02 | 1 | -0/+2 |
| * | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 2 | -14/+35 |
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 10 | -51/+99 |
| |\ \ | |||||
| * | | | Fix string resources | mar-v-in | 2014-07-31 | 2 | -5/+6 |
| * | | | Fix merge | mar-v-in | 2014-07-31 | 1 | -0/+2 |
| * | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 136 | -672/+1008 |
| |\ \ \ | |||||
| * | | | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 4 | -30/+27 |
| * | | | | Load of rework on EncryptActivity, still some TODOs | mar-v-in | 2014-07-20 | 3 | -13/+43 |
| * | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 36 | -483/+1601 |
| |\ \ \ \ | |||||
| * | | | | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 24 | -237/+261 |
| * | | | | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 4 | -79/+110 |
| * | | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 63 | -115/+578 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-06-24 | 3 | -10/+83 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-... | mar-v-in | 2014-06-22 | 5 | -38/+73 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -0/+1 |
* | | | | | | | | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 7 | -70/+64 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | 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 |
|\ \ \ \ \ \ |