| Commit message (Expand) | Author | Age | Files | Lines |
* | Add license headers | Dominik Schürmann | 2014-08-04 | 2 | -0/+34 |
* | Fix nullpointer, remove unused window feature | Dominik Schürmann | 2014-08-04 | 1 | -1/+0 |
* | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 2 | -3/+4 |
* | More cleanup | Dominik Schürmann | 2014-08-04 | 1 | -3/+4 |
* | Even more smaller nitpicks | Dominik Schürmann | 2014-08-04 | 1 | -12/+23 |
* | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 4 | -10/+82 |
* | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 1 | -6/+6 |
* | Remove old edit key stuff | Dominik Schürmann | 2014-08-04 | 3 | -1066/+0 |
* | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 8 | -325/+123 |
* | button language in encrypt | Dominik Schürmann | 2014-08-04 | 1 | -1/+0 |
* | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 3 | -1/+10 |
* | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 16 | -941/+1220 |
|\ |
|
| * | Minor cleanup | mar-v-in | 2014-08-02 | 2 | -2/+1 |
| * | Fix focusing with To field | mar-v-in | 2014-08-02 | 2 | -3/+18 |
| * | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 4 | -21/+40 |
| * | Cache input file thumbnail. | mar-v-in | 2014-08-01 | 1 | -3/+20 |
| * | Fix first key is not used erroneously | mar-v-in | 2014-08-01 | 1 | -1/+0 |
| * | Fixes after merge | mar-v-in | 2014-08-01 | 1 | -2/+5 |
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 11 | -132/+171 |
| |\ |
|
| * | | Fix string resources | mar-v-in | 2014-07-31 | 1 | -1/+1 |
| * | | Fix merge | mar-v-in | 2014-07-31 | 3 | -37/+19 |
| * | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 31 | -1706/+1688 |
| |\ \ |
|
| * | | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 8 | -86/+95 |
| * | | | Make DecryptFragment abstract, as it should be | mar-v-in | 2014-07-25 | 1 | -4/+2 |
| * | | | Load of rework on EncryptActivity, still some TODOs | mar-v-in | 2014-07-20 | 7 | -557/+541 |
| * | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 23 | -1314/+1608 |
| |\ \ \ |
|
| * | | | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 6 | -98/+524 |
| * | | | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 7 | -66/+99 |
| * | | | | Missing import after merge | mar-v-in | 2014-07-01 | 1 | -0/+1 |
| * | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 28 | -260/+907 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-06-24 | 8 | -54/+461 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-... | mar-v-in | 2014-06-22 | 15 | -79/+495 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 9 | -379/+162 |
* | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 1 | -2/+2 |
| | |_|_|_|_|_|/
| |/| | | | | | |
|
* / | | | | | | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 7 | -155/+366 |
|/ / / / / / / |
|
* | | | | | | | Start fixing CachedPublicKeyRing | Dominik Schürmann | 2014-08-01 | 1 | -13/+17 |
* | | | | | | | Certifying instead of signing | Dominik Schürmann | 2014-08-01 | 1 | -7/+6 |
* | | | | | | | Use darker colors | Dominik Schürmann | 2014-08-01 | 3 | -9/+9 |
* | | | | | | | Show file tab only for import of existing keys | Dominik Schürmann | 2014-08-01 | 1 | -15/+42 |
* | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 3 | -32/+43 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | move upload/update buttons from menu to buttons | Vincent Breitmoser | 2014-07-31 | 3 | -32/+43 |
* | | | | | | | | Show revoked and expired for private keys | Dominik Schürmann | 2014-07-31 | 1 | -29/+28 |
|/ / / / / / / |
|
* | | | | | | | Fixes for upload | Dominik Schürmann | 2014-07-31 | 3 | -15/+19 |
* | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 2 | -25/+15 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | fix bug in UploadKeyActivity, minor work on uri handling | Vincent Breitmoser | 2014-07-31 | 2 | -25/+15 |
| | |_|_|_|_|/
| |/| | | | | |
|
* / | | | | | | Create key: design fixes | Dominik Schürmann | 2014-07-31 | 1 | -1/+7 |
|/ / / / / / |
|
* | | | | | | Fix animations in create key | Dominik Schürmann | 2014-07-31 | 3 | -22/+18 |
* | | | | | | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 5 | -17/+16 |
* | | | | | | Parcelable data over 1MB can not be send through binder, parcel into a cache ... | Dominik Schürmann | 2014-07-31 | 1 | -9/+21 |