Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #601 from thi/rename-builder-methods | Dominik Schürmann | 2014-04-29 | 4 | -58/+58 |
|\ | |||||
| * | Rename setter methods for PgpDecryptVerify.Builder | Thialfihar | 2014-04-29 | 3 | -13/+13 |
| * | Rename setter methods for PgpSignEncrypt.Builder | Thialfihar | 2014-04-29 | 3 | -45/+45 |
* | | Merge pull request #600 from thi/rename-progressdialogupdater | Dominik Schürmann | 2014-04-29 | 8 | -54/+57 |
|\| | |||||
| * | Rename ProgressDialogUpdater to Progressable | Thialfihar | 2014-04-29 | 8 | -54/+57 |
| * | Move util.ProgressDialogUpdater to pgp.Progressable | Thialfihar | 2014-04-29 | 1 | -0/+0 |
* | | Formatting KeychainDatabase | Dominik Schürmann | 2014-04-29 | 1 | -17/+17 |
* | | Clarify sqlite datatypes | Dominik Schürmann | 2014-04-29 | 1 | -2/+12 |
|/ | |||||
* | API: Fix GET_KEY, closes #599 | Dominik Schürmann | 2014-04-28 | 1 | -10/+13 |
* | Many API fixes for GET_KEY and GET_KEY_IDS | Dominik Schürmann | 2014-04-28 | 3 | -17/+25 |
* | Version 2.6.1 | Dominik Schürmann | 2014-04-22 | 2 | -2/+7 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-04-22 | 6 | -16/+34 |
|\ | |||||
| * | Merge commit '9cdb2ec4e270a572520d5bcdbee55867e3c37003' | Vincent Breitmoser | 2014-04-22 | 1 | -1/+2 |
| |\ | |||||
| | * | fix nullpointer on missing s2k | Vincent Breitmoser | 2014-04-20 | 1 | -1/+2 |
| * | | Merge commit '0b7fb70' | Vincent Breitmoser | 2014-04-22 | 5 | -15/+32 |
| |\ \ | |||||
| | * | | split up filterSign and filterCertify in SelectSecretKeyFragment | Vincent Breitmoser | 2014-04-20 | 5 | -15/+32 |
* | | | | add has_secret for all who are upgrading from a beta version | Dominik Schürmann | 2014-04-22 | 1 | -3/+9 |
|/ / / | |||||
* | | | Workaround for nullpointer bug in support lib, close #591 | Dominik Schürmann | 2014-04-22 | 10 | -18/+52 |
* | | | Fix a nullptr in KeychainProvider | Vincent Breitmoser | 2014-04-20 | 1 | -1/+1 |
| |/ |/| | |||||
* | | More code cleanup | Dominik Schürmann | 2014-04-19 | 20 | -105/+129 |
|/ | |||||
* | version 2.6 | Dominik Schürmann | 2014-04-19 | 1 | -2/+2 |
* | Update from transifex | Dominik Schürmann | 2014-04-19 | 26 | -106/+117 |
* | better error string for too many responses | Dominik Schürmann | 2014-04-19 | 1 | -1/+1 |
* | Trying a fix for #585 | Dominik Schürmann | 2014-04-19 | 4 | -18/+22 |
* | Fix some smaller annoyances, closes #583, #582 | Dominik Schürmann | 2014-04-19 | 2 | -11/+5 |
* | Fix more strings | Dominik Schürmann | 2014-04-19 | 13 | -36/+36 |
* | certify keys | Dominik Schürmann | 2014-04-19 | 1 | -2/+2 |
* | Update from transifex | Dominik Schürmann | 2014-04-19 | 15 | -512/+0 |
* | fix unified query columns for select*fragment | Vincent Breitmoser | 2014-04-18 | 2 | -6/+5 |
* | Update maven libs and use fixed version | Dominik Schürmann | 2014-04-18 | 1 | -5/+5 |
* | Remove unused strings, fix some lint errors, fix some language confusions | Dominik Schürmann | 2014-04-18 | 22 | -193/+29 |
* | Translations from transifex | Dominik Schürmann | 2014-04-18 | 35 | -27/+54 |
* | Do not show lookup button in decrypt activity for decryption-only | Dominik Schürmann | 2014-04-18 | 1 | -2/+4 |
* | Small language corrections (thanks to yahoe.001) | Dominik Schürmann | 2014-04-18 | 1 | -1/+1 |
* | FIx nfc button | Dominik Schürmann | 2014-04-18 | 2 | -7/+14 |
* | Fix upload of keys, closes #581 | Dominik Schürmann | 2014-04-18 | 2 | -3/+8 |
* | OK 2.6 RC1 | Dominik Schürmann | 2014-04-17 | 1 | -2/+2 |
* | changelog 2.6 | Dominik Schürmann | 2014-04-17 | 1 | -0/+1 |
* | Remove kill hack in KeychainDatabase | Dominik Schürmann | 2014-04-17 | 1 | -9/+0 |
* | Remove dev hack in KeychainDatabase | Dominik Schürmann | 2014-04-17 | 1 | -5/+0 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-04-17 | 9 | -154/+181 |
|\ | |||||
| * | get rid of PgpKeyHelper.getMasterKeyId | Vincent Breitmoser | 2014-04-17 | 4 | -33/+21 |
| * | NotFoundExceptions for all getGeneric-type methods | Vincent Breitmoser | 2014-04-17 | 7 | -121/+160 |
* | | Add faq entry for keyserver bug, closes #552 | Dominik Schürmann | 2014-04-17 | 1 | -0/+3 |
|/ | |||||
* | load data only once in ImportKeysListLoader | Vincent Breitmoser | 2014-04-17 | 1 | -3/+7 |
* | add up navigation in ViewCertActivity | Vincent Breitmoser | 2014-04-17 | 4 | -1/+13 |
* | use project icons for certification status | Vincent Breitmoser | 2014-04-17 | 34 | -8/+8 |
* | Update comments in AndroidManifest | Dominik Schürmann | 2014-04-17 | 1 | -4/+6 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-04-17 | 2 | -5/+14 |
|\ | |||||
| * | secret keys can only be deleted individually from multi selection | Vincent Breitmoser | 2014-04-17 | 2 | -5/+14 |