aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* wrapped-key-ring: small fix to make it work againVincent Breitmoser2014-05-032-14/+12
* wrapped-key-ring: forgot to add UncachedKeyRing classVincent Breitmoser2014-05-031-0/+29
* wrapped-key-ring: move more helper methods into keysVincent Breitmoser2014-05-035-15/+153
* wrapped-key-ring: move certification logic into secretkeyVincent Breitmoser2014-05-037-125/+118
* certification is always done with the master keyVincent Breitmoser2014-05-032-56/+1
* wrapped-key-ring: first steps, get rid of key imports in decryptverify and si...Vincent Breitmoser2014-05-0312-320/+744
* Update from transifexDominik Schürmann2014-05-0240-74/+1193
* Merge pull request #601 from thi/rename-builder-methodsDominik Schürmann2014-04-294-58/+58
|\
| * Rename setter methods for PgpDecryptVerify.BuilderThialfihar2014-04-293-13/+13
| * Rename setter methods for PgpSignEncrypt.BuilderThialfihar2014-04-293-45/+45
* | Merge pull request #600 from thi/rename-progressdialogupdaterDominik Schürmann2014-04-298-54/+57
|\|
| * Rename ProgressDialogUpdater to ProgressableThialfihar2014-04-298-54/+57
| * Move util.ProgressDialogUpdater to pgp.ProgressableThialfihar2014-04-291-0/+0
* | Formatting KeychainDatabaseDominik Schürmann2014-04-291-17/+17
* | Clarify sqlite datatypesDominik Schürmann2014-04-291-2/+12
|/
* API: Fix GET_KEY, closes #599Dominik Schürmann2014-04-281-10/+13
* Many API fixes for GET_KEY and GET_KEY_IDSDominik Schürmann2014-04-283-17/+25
* Version 2.6.1Dominik Schürmann2014-04-222-2/+7
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-226-16/+34
|\
| * Merge commit '9cdb2ec4e270a572520d5bcdbee55867e3c37003'Vincent Breitmoser2014-04-221-1/+2
| |\
| | * fix nullpointer on missing s2kVincent Breitmoser2014-04-201-1/+2
| * | Merge commit '0b7fb70'Vincent Breitmoser2014-04-225-15/+32
| |\ \
| | * | split up filterSign and filterCertify in SelectSecretKeyFragmentVincent Breitmoser2014-04-205-15/+32
* | | | add has_secret for all who are upgrading from a beta versionDominik Schürmann2014-04-221-3/+9
|/ / /
* | | Workaround for nullpointer bug in support lib, close #591Dominik Schürmann2014-04-2210-18/+52
* | | Fix a nullptr in KeychainProviderVincent Breitmoser2014-04-201-1/+1
| |/ |/|
* | More code cleanupDominik Schürmann2014-04-1920-105/+129
|/
* version 2.6Dominik Schürmann2014-04-191-2/+2
* Update from transifexDominik Schürmann2014-04-1926-106/+117
* better error string for too many responsesDominik Schürmann2014-04-191-1/+1
* Trying a fix for #585Dominik Schürmann2014-04-194-18/+22
* Fix some smaller annoyances, closes #583, #582Dominik Schürmann2014-04-192-11/+5
* Fix more stringsDominik Schürmann2014-04-1913-36/+36
* certify keysDominik Schürmann2014-04-191-2/+2
* Update from transifexDominik Schürmann2014-04-1915-512/+0
* fix unified query columns for select*fragmentVincent Breitmoser2014-04-182-6/+5
* Remove unused strings, fix some lint errors, fix some language confusionsDominik Schürmann2014-04-1821-193/+28
* Translations from transifexDominik Schürmann2014-04-1835-27/+54
* Do not show lookup button in decrypt activity for decryption-onlyDominik Schürmann2014-04-181-2/+4
* Small language corrections (thanks to yahoe.001)Dominik Schürmann2014-04-181-1/+1
* FIx nfc buttonDominik Schürmann2014-04-182-7/+14
* Fix upload of keys, closes #581Dominik Schürmann2014-04-182-3/+8
* OK 2.6 RC1Dominik Schürmann2014-04-171-2/+2
* changelog 2.6Dominik Schürmann2014-04-171-0/+1
* Remove kill hack in KeychainDatabaseDominik Schürmann2014-04-171-9/+0
* Remove dev hack in KeychainDatabaseDominik Schürmann2014-04-171-5/+0
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-179-154/+181
|\
| * get rid of PgpKeyHelper.getMasterKeyIdVincent Breitmoser2014-04-174-33/+21
| * NotFoundExceptions for all getGeneric-type methodsVincent Breitmoser2014-04-177-121/+160
* | Add faq entry for keyserver bug, closes #552Dominik Schürmann2014-04-171-0/+3
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 18:34:20 +0000