aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Fixes #590
| * | Merge commit '0b7fb70'Vincent Breitmoser2014-04-225-15/+32
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml
| | * |
-04-205-15/+32 | | | | | | | | | | | | | | | | Closes #588 * | | | 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 | |/ |/| | | | | Fixes #589 * | 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 | * Update maven libs and use fixed versionDominik Schürmann2014-04-181-5/+5 | * Remove unused strings, fix some lint errors, fix some language confusionsDominik Schürmann2014-04-1822-193/+29 | * 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 | | | | | | | | Closes #575 | * 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 |/ * load data only once in ImportKeysListLoaderVincent Breitmoser2014-04-171-3/+7 | | | | Fixes #571 * add up navigation in ViewCertActivityVincent Breitmoser2014-04-174-1/+13 | | | | Fixes #567 * use project icons for certification statusVincent Breitmoser2014-04-1734-8/+8 | | | | Closes #573 * Update comments in AndroidManifestDominik Schürmann2014-04-171-4/+6 | * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-172-5/+14 |\ | * secret keys can only be deleted individually from multi selectionVincent Breitmoser2014-04-172-5/+14 | | * | Rename provider types following ↵Dominik Schürmann2014-04-171-12/+35 |/ | | | http://developer.android.com/guide/topics/providers/content-provider-creating.html * essential instead of integralDominik Schürmann2014-04-161-1/+1 | * Use git submodules for libs, fix compilation, remove library sourcecodeDominik Schürmann2014-04-163-28/+24 | * Merge pull request #576 from Valodim/stripped-secretkeysDominik Schürmann2014-04-1611-30/+110 |\ | | | | Support stripped secretkeys | * Fix even more whitespaceVincent2014-04-161-1/+1 | | | * Fix more whitespaceVincent2014-04-161-2/+2 | | | * Fix whitespaceVincent2014-04-161-1/+1 | |