aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-0669-13881/+0
* Use dark icon in warning dialogs in edit keyDominik Schürmann2014-04-061-2/+2
* copyright header correction, style fixesDominik Schürmann2014-04-062-48/+49
* certs: remove unused menu itemVincent Breitmoser2014-04-061-3/+0
* certs: display green dot for certified keys in KeyListFragmentVincent Breitmoser2014-04-061-3/+16
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-069-133/+89
|\
| * Use AppMsg in edit keyDominik Schürmann2014-04-051-8/+6
| * Remove import activity from drawer, make it reachable from key list onlyDominik Schürmann2014-04-055-10/+14
| * Use PgpKeyHelper.splitUserId in EncryptAsymmetricFragmentDominik Schürmann2014-04-051-12/+11
| * Fix nfc, make edit activity like a modal dialog, move all menu actions into v...Dominik Schürmann2014-04-054-104/+59
* | certs: ditch expiry, re-add data blob, improve ViewCertActivityVincent Breitmoser2014-04-061-19/+64
* | certs: fix ViewCertActivityVincent Breitmoser2014-04-062-24/+33
* | certs: fix CertifyKeyActivity and improve user id listVincent Breitmoser2014-04-063-33/+31
* | certs: ditch selection spinner from certs viewVincent Breitmoser2014-04-061-38/+0
* | certs: display cert type in cert viewVincent Breitmoser2014-04-061-11/+19
* | certs: display uid status in uid listVincent Breitmoser2014-04-062-11/+22
* | certs: properly handle primary flag and revocation of uidsVincent Breitmoser2014-04-061-28/+27
* | certs: various improvementsVincent Breitmoser2014-04-052-5/+7
* | certs: more fixes, almost working nowVincent Breitmoser2014-04-053-26/+27
* | Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-0553-2818/+3945
|\|
| * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-046-151/+73
| |\
| | * Simplify PassphraseDialogFragment usageThialfihar2014-04-046-151/+73
| * | db-overhaul: fix key export (and some export-related ui changes)Vincent Breitmoser2014-04-045-28/+42
| * | db-overhaul: fix delete key from ViewKeyActivityVincent Breitmoser2014-04-042-11/+9
| * | ViewKeyMainFragment cleanup (don't use inline queries!)Vincent Breitmoser2014-04-041-96/+77
| * | db-overhaul: workaround api level 11Vincent Breitmoser2014-04-044-17/+19
| * | Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-047-120/+151
| |\|
| | * 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-0312-168/+132
| | |\
| | * | Key lookup for APIDominik Schürmann2014-04-031-2/+11
| | * | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-037-119/+141
| * | | calculate nfc packet on demand onlyVincent Breitmoser2014-04-041-20/+18
| * | | db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivityVincent Breitmoser2014-04-043-3/+13
| * | | db-overhaul: reintroduce by-mail and by-subkey queriesVincent Breitmoser2014-04-041-17/+5
| * | | db-overhaul: minor stuff, mostly ProviderHelperVincent Breitmoser2014-04-045-9/+10
| * | | db-overhaul: more work on new providerVincent Breitmoser2014-04-036-75/+58
| * | | more work on streamlining uris, and stripping ProviderHelperVincent Breitmoser2014-04-037-141/+85
| * | | ditch useless PgpKeyHelper.getMasterKey methodsVincent Breitmoser2014-04-032-7/+6
| | |/ | |/|
| * | Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-0335-435/+527
| |\|
| | * Cleanup DrawerActivityDominik Schürmann2014-04-031-31/+4
| | * Rename "canEdit" to "canBeEdited"Thialfihar2014-04-024-13/+13
| | * Rename "armour" to "armor"Thialfihar2014-04-022-11/+11
| | * Rename "pass phrase" to "passphrase"Thialfihar2014-04-024-31/+31
| | * Replace wildcard imports with explicit importsThialfihar2014-04-028-11/+64
| | * Spacing correctionsThialfihar2014-04-021-3/+2
| | * Add missing and curly brackets and fix othersThialfihar2014-04-025-50/+47
| | * Rearrange too long linesThialfihar2014-04-0216-48/+87
| | * Adjust variable/member naming to conform to style guideThialfihar2014-04-029-70/+73
| | * Trivial spacing changes to conform to style guideThialfihar2014-04-0218-57/+56
| | * Adjust copyright headersThialfihar2014-04-022-2/+2