aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-047-153/+89
|\
| * Simplify PassphraseDialogFragment usageThialfihar2014-04-047-153/+89
* | db-overhaul: fix key export (and some export-related ui changes)Vincent Breitmoser2014-04-048-81/+77
* | db-overhaul: fix delete key from ViewKeyActivityVincent Breitmoser2014-04-043-15/+12
* | ViewKeyMainFragment cleanup (don't use inline queries!)Vincent Breitmoser2014-04-041-96/+77
* | db-overhaul: fix DecryptAndVerify with and without known keysVincent Breitmoser2014-04-041-51/+59
* | db-overhaul: workaround api level 11Vincent Breitmoser2014-04-045-32/+42
* | Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-0439-163/+402
|\|
| * title for ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-031-2/+2
| * Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ...Dominik Schürmann2014-04-0326-1407/+635
| |\
| * | Disable testsDominik Schürmann2014-04-031-1/+1
| * | version 2.5Dominik Schürmann2014-04-031-2/+2
| * | Update from transifexDominik Schürmann2014-04-0325-1/+221
| * | ChangelogDominik Schürmann2014-04-032-2/+2
| * | Key lookup for APIDominik Schürmann2014-04-032-6/+8
| * | Key lookup for APIDominik Schürmann2014-04-032-7/+16
| * | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-0310-147/+155
* | | db-overhaul: different hack for type info (api level problem inside)Vincent Breitmoser2014-04-041-18/+6
* | | calculate nfc packet on demand onlyVincent Breitmoser2014-04-041-20/+18
* | | db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivityVincent Breitmoser2014-04-047-10/+25
* | | db-overhaul: reintroduce by-mail and by-subkey queriesVincent Breitmoser2014-04-045-78/+109
* | | db-overhaul: minor stuff, mostly ProviderHelperVincent Breitmoser2014-04-048-78/+73
* | | db-overhaul: more work on new providerVincent Breitmoser2014-04-0310-263/+208
* | | more work on streamlining uris, and stripping ProviderHelperVincent Breitmoser2014-04-0310-223/+148
* | | ditch useless PgpKeyHelper.getMasterKey methodsVincent Breitmoser2014-04-037-100/+23
| |/ |/|
* | Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-03108-1000/+1293
|\|
| * Cleanup DrawerActivityDominik Schürmann2014-04-031-31/+4
| * Rename "canEdit" to "canBeEdited"Thialfihar2014-04-024-13/+13
| * Rename "armour" to "armor"Thialfihar2014-04-026-20/+20
| * Rename "pass phrase" to "passphrase"Thialfihar2014-04-0210-73/+73
| * Started changelog for 2.5Dominik Schürmann2014-04-021-0/+8
| * Fix buildDominik Schürmann2014-04-021-0/+2
| * Replace wildcard imports with explicit importsThialfihar2014-04-0213-21/+126
| * Spacing correctionsThialfihar2014-04-021-3/+2
| * Update from transifexDominik Schürmann2014-04-0232-270/+217
| * Add missing and curly brackets and fix othersThialfihar2014-04-027-60/+61
| * Rearrange too long linesThialfihar2014-04-0228-145/+228
| * Adjust variable/member naming to conform to style guideThialfihar2014-04-0211-79/+82
| * Trivial spacing changes to conform to style guideThialfihar2014-04-0229-85/+87
| * Adjust copyright headersThialfihar2014-04-026-12/+20
| * Adjust import orderThialfihar2014-04-0224-81/+46
| * always askAshley Hughes2014-04-021-1/+1
| * confirm that empty IDs are really wantedAshley Hughes2014-04-022-1/+47
| * new ID sigs already added, so do save themAshley Hughes2014-04-021-1/+1
| * allow blank IDs, allow adding new IDs and let them be masterAshley Hughes2014-04-022-5/+8
| * pass through info that keys are new without relying on new keys orginally bei...Ashley Hughes2014-04-015-2/+22
| * sort out saving empty string IDsAshley Hughes2014-04-011-9/+3
| * Menu cleanupDominik Schürmann2014-04-014-28/+47
| * Dont show encrypted data before decryption from clipboardDominik Schürmann2014-04-011-7/+14
| * Change path to OpenKeychainDominik Schürmann2014-04-011-3/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 15:14:10 +0000