Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 15 | -126/+136 |
* | 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 | 11 | -578/+597 |
* | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 70 | -1927/+3537 |
|\ | |||||
| * | Bett API string | Dominik Schürmann | 2014-07-04 | 1 | -3/+3 |
| * | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 3 | -7/+18 |
| * | Pull from transifex | Dominik Schürmann | 2014-07-03 | 3 | -7/+30 |
| * | Pull from transifex | Dominik Schürmann | 2014-07-03 | 25 | -352/+1289 |
| * | Small strings fix | Dominik Schürmann | 2014-07-03 | 1 | -1/+1 |
| * | Remove old edit button, rename activities | Dominik Schürmann | 2014-07-03 | 8 | -819/+782 |
| * | cleanup, debug for passphrase set | Dominik Schürmann | 2014-07-03 | 1 | -5/+4 |
| * | fix no passphrase check | Dominik Schürmann | 2014-07-03 | 1 | -1/+3 |
| * | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 1 | -2/+2 |
| * | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 5 | -37/+152 |
| * | parcel newPassphrase | Dominik Schürmann | 2014-07-03 | 1 | -0/+4 |
| * | cleanup | Dominik Schürmann | 2014-07-03 | 2 | -0/+5 |
| * | edit key: subkey adapter | Dominik Schürmann | 2014-07-03 | 4 | -2/+458 |
| * | Work on edit | Dominik Schürmann | 2014-07-03 | 8 | -60/+69 |
| * | smaller dropdown items | Dominik Schürmann | 2014-07-03 | 2 | -4/+4 |
| * | Remove unnecessary error logs | Dominik Schürmann | 2014-07-02 | 2 | -2/+2 |
| * | A little bit less purple | Dominik Schürmann | 2014-07-02 | 2 | -7/+4 |
| * | merge KeychainIntentService | Dominik Schürmann | 2014-07-02 | 9 | -105/+343 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 16 | -461/+341 |
| | |\ | |||||
| | * \ | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 9 | -104/+342 |
| | |\ \ | |||||
| | | * | | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 3 | -4/+115 |
| | | * | | use expert create key for key creation testing (revert this later on!) | Vincent Breitmoser | 2014-07-02 | 1 | -5/+50 |
| | | * | | fix subkey addition | Vincent Breitmoser | 2014-07-02 | 2 | -37/+62 |
| | | * | | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 7 | -61/+118 |
| * | | | | fix nullpointer, cleanup | Dominik Schürmann | 2014-07-02 | 3 | -10/+9 |
| * | | | | remove init methods from adapter | Dominik Schürmann | 2014-07-02 | 4 | -88/+53 |
| | |_|/ | |/| | | |||||
| * | | | edit key: work on saving | Dominik Schürmann | 2014-07-02 | 4 | -31/+24 |
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-02 | 3 | -2/+7 |
| |\| | | |||||
| | * | | forgot a line in previous commit | Vincent Breitmoser | 2014-07-02 | 1 | -0/+1 |
| | * | | don't use zero plural string for english | Vincent Breitmoser | 2014-07-02 | 2 | -2/+6 |
| * | | | Edit key: adding user ids | Dominik Schürmann | 2014-07-02 | 14 | -236/+330 |
| * | | | edit key: part 3 | Dominik Schürmann | 2014-07-01 | 5 | -387/+180 |
| |/ / | |||||
* | | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 36 | -346/+898 |
* | | | Add support for multiple input/output URIs to KeychainIntentService | mar-v-in | 2014-07-03 | 1 | -35/+56 |
* | | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 12 | -152/+216 |
* | | | Add temporary file storage as discussed in #665 | mar-v-in | 2014-07-01 | 5 | -0/+201 |
* | | | 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 | 113 | -621/+2177 |
|\| | | |||||
| * | | remove leftover of AndroidBootstrap | Dominik Schürmann | 2014-06-30 | 1 | -0/+0 |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-30 | 58 | -159/+268 |
| |\ \ | |||||
| | * | | Fixed Bootstrap resource | Daniel Albert | 2014-06-30 | 1 | -1/+1 |
| | * | | (should have) fixed Travis builds | Daniel Albert | 2014-06-30 | 2 | -7/+2 |
| | * | | Deprecated Android Bootstrap, thus fixing #597 | Daniel Albert | 2014-06-30 | 1 | -1/+0 |
| | * | | Fixed, issue #702 | Daniel Albert | 2014-06-30 | 1 | -1/+1 |
| | * | | Merge branch 'master' of https://github.com/open-keychain/open-keychain | Daniel Albert | 2014-06-30 | 30 | -309/+1460 |
| | |\| | |||||
| | * | | Converted all other buttons | Daniel Albert | 2014-06-30 | 23 | -60/+48 |