Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Cleanup AsyncTask code for NFC | Dominik Schürmann | 2014-04-10 | 1 | -6/+8 | |
| | ||||||
* | Cleanup imports | Dominik Schürmann | 2014-04-10 | 1 | -2/+0 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-04-10 | 2 | -10/+11 | |
|\ | ||||||
| * | Merge pull request #545 from danielhass/toast_replacement | Dominik Schürmann | 2014-04-10 | 2 | -10/+11 | |
| |\ | | | | | | | Toast replacement | |||||
| | * | Deleted wrong AppMsg | Daniel Haß | 2014-04-10 | 1 | -3/+0 | |
| | | | ||||||
| | * | Replaced Toasts in ViewKeyActivity | Daniel Haß | 2014-04-09 | 1 | -7/+11 | |
| | | | ||||||
| | * | Removed unused Toast import in ViewKeyActivityJB | Daniel Haß | 2014-04-09 | 1 | -1/+0 | |
| | | | ||||||
| | * | Replaced Toasts in ImportKeysOrCodeFragment | Daniel Haß | 2014-04-09 | 1 | -3/+3 | |
| | | | ||||||
* | | | Integrate NFC functionality into ViewKeyActivity | Dominik Schürmann | 2014-04-10 | 4 | -157/+111 | |
|/ / | ||||||
* | | Prettify more layouts, fix edit and encrypt intents from key view | Dominik Schürmann | 2014-04-09 | 6 | -19/+35 | |
| | | ||||||
* | | Temporary disable of master key id extraction from uri | Dominik Schürmann | 2014-04-09 | 1 | -7/+7 | |
| | | ||||||
* | | Prettify some layouts | Dominik Schürmann | 2014-04-09 | 6 | -48/+45 | |
| | | ||||||
* | | certs: fix verification in ViewKeyActivity (how embarassing) | Vincent Breitmoser | 2014-04-09 | 1 | -2/+2 | |
| | | | | | | | | Fixes #541 | |||||
* | | Fix gitignore for lint | Dominik Schürmann | 2014-04-09 | 2 | -6/+5 | |
| | | ||||||
* | | Fix certification layout | Dominik Schürmann | 2014-04-09 | 1 | -29/+21 | |
| | | ||||||
* | | Fix NFC | Dominik Schürmann | 2014-04-09 | 2 | -45/+50 | |
| | | ||||||
* | | Fix save keyring, improve signature verification | Dominik Schürmann | 2014-04-09 | 6 | -101/+108 | |
|/ | ||||||
* | Cleanup in SelectKeyCursorAdapter | Dominik Schürmann | 2014-04-09 | 2 | -9/+3 | |
| | ||||||
* | Hide keyboard after hiding custom key length field | Dominik Schürmann | 2014-04-09 | 1 | -1/+9 | |
| | ||||||
* | Merge pull request #539 from gogowitczak/custom-key-length-info | Dominik Schürmann | 2014-04-09 | 4 | -41/+111 | |
|\ | | | | | Modified Spinner values for CreateKeyDialog. Added info for user about custom key length restrictions. | |||||
| * | Modified Spinner values for CreateKeyDialog. Added info for user about ↵ | gogowitczak | 2014-04-08 | 4 | -41/+111 | |
| | | | | | | | | custom key length restrictions. | |||||
* | | KeychainIntentService instead of APG | Dominik Schürmann | 2014-04-09 | 1 | -1/+1 | |
| | | ||||||
* | | Fix DECRYPT and SEND intent | Dominik Schürmann | 2014-04-09 | 1 | -1/+1 | |
| | | ||||||
* | | Use NotFoundException in more places | Dominik Schürmann | 2014-04-08 | 12 | -85/+141 | |
| | | ||||||
* | | Fix decryption of messages/files encrypted for multiple public keys | Dominik Schürmann | 2014-04-08 | 1 | -31/+56 | |
| | | ||||||
* | | Introduce ProviderHelper.NotFoundException, remove dead code | Dominik Schürmann | 2014-04-08 | 12 | -128/+152 | |
|/ | ||||||
* | Merge pull request #537 from thi/change-license-to-gpl | Dominik Schürmann | 2014-04-08 | 45 | -444/+480 | |
|\ | | | | | Change license to gpl | |||||
| * | Change license from ASLv2 to GPLv3 where possible | Thialfihar | 2014-04-08 | 43 | -403/+439 | |
| | | ||||||
| * | Update copyright timespan for Thialfihar | Thialfihar | 2014-04-08 | 41 | -49/+49 | |
|/ | ||||||
* | Merge pull request #536 from gogowitczak/custom-key-length | Dominik Schürmann | 2014-04-08 | 4 | -22/+152 | |
|\ | | | | | Added possibility to enter custom key length. | |||||
| * | Fixed coding style. | gogowitczak | 2014-04-08 | 1 | -3/+6 | |
| | | ||||||
| * | Added possibility to enter custom key length. Added key length limitations, ↵ | gogowitczak | 2014-04-07 | 4 | -22/+149 | |
| | | | | | | | | according to issue #102 and SpongyCastle specification. | |||||
* | | Merge pull request #531 from danielhass/toast_replacement | Dominik Schürmann | 2014-04-07 | 1 | -8/+9 | |
|\ \ | |/ |/| | Futher Toast replacements | |||||
| * | Futher Toast replacements in CertifyKeyActivity | Daniel Haß | 2014-04-07 | 1 | -8/+9 | |
|/ | ||||||
* | Merge pull request #529 from gogowitczak/gradlebug-branch | Dominik Schürmann | 2014-04-06 | 1 | -13/+13 | |
|\ | | | | | Fixed gradle localTest bug on Windows. | |||||
| * | Fixed gradle localTest bug on Windows. | gogowitczak | 2014-04-06 | 1 | -13/+13 | |
|/ | ||||||
* | Comment out localTest due to bug on windows | Dominik Schürmann | 2014-04-06 | 1 | -13/+13 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-04-06 | 3 | -13/+13 | |
|\ | ||||||
| * | Merge pull request #522 from Valodim/master | Dominik Schürmann | 2014-04-06 | 3 | -13/+13 | |
| |\ | | | | | | | show key expiry status similar to revocation | |||||
| | * | show key expiry status similar to revocation | Vincent Breitmoser | 2014-04-06 | 3 | -13/+13 | |
| |/ | ||||||
* / | License clarification in README | Dominik Schürmann | 2014-04-06 | 1 | -2/+3 | |
|/ | ||||||
* | Update README | Dominik Schürmann | 2014-04-06 | 1 | -1/+1 | |
| | ||||||
* | Update travis link | Dominik Schürmann | 2014-04-06 | 1 | -1/+1 | |
| | ||||||
* | Update transifex config | Dominik Schürmann | 2014-04-06 | 1 | -18/+18 | |
| | ||||||
* | Update README | Dominik Schürmann | 2014-04-06 | 1 | -10/+10 | |
| | ||||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 532 | -7/+7 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-04-06 | 38 | -106/+124 | |
| | ||||||
* | Optimize comments, remove dead code | Dominik Schürmann | 2014-04-06 | 6 | -47/+5 | |
| | ||||||
* | Use dark icon in warning dialogs in edit key | Dominik Schürmann | 2014-04-06 | 1 | -2/+2 | |
| | ||||||
* | code style | Dominik Schürmann | 2014-04-06 | 3 | -14/+12 | |
| |