Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into certs | Vincent Breitmoser | 2014-04-06 | 22 | -195/+130 |
|\ | |||||
| * | Use AppMsg in edit key | Dominik Schürmann | 2014-04-05 | 1 | -8/+6 |
| * | Remove import activity from drawer, make it reachable from key list only | Dominik Schürmann | 2014-04-05 | 8 | -35/+32 |
| * | Use PgpKeyHelper.splitUserId in EncryptAsymmetricFragment | Dominik Schürmann | 2014-04-05 | 1 | -12/+11 |
| * | Rework menu items | Dominik Schürmann | 2014-04-05 | 8 | -10/+14 |
| * | Fix nfc, make edit activity like a modal dialog, move all menu actions into v... | Dominik Schürmann | 2014-04-05 | 7 | -141/+66 |
* | | certs: ditch expiry, re-add data blob, improve ViewCertActivity | Vincent Breitmoser | 2014-04-06 | 6 | -41/+101 |
* | | certs: fix ViewCertActivity | Vincent Breitmoser | 2014-04-06 | 5 | -36/+58 |
* | | certs: fix CertifyKeyActivity and improve user id list | Vincent Breitmoser | 2014-04-06 | 5 | -37/+39 |
* | | certs: ditch selection spinner from certs view | Vincent Breitmoser | 2014-04-06 | 2 | -50/+1 |
* | | certs: display cert type in cert view | Vincent Breitmoser | 2014-04-06 | 2 | -11/+24 |
* | | certs: display uid status in uid list | Vincent Breitmoser | 2014-04-06 | 5 | -12/+28 |
* | | certs: properly handle primary flag and revocation of uids | Vincent Breitmoser | 2014-04-06 | 5 | -66/+109 |
* | | certs: various improvements | Vincent Breitmoser | 2014-04-05 | 6 | -30/+55 |
* | | certs: more fixes, almost working now | Vincent Breitmoser | 2014-04-05 | 5 | -38/+52 |
* | | Merge remote-tracking branch 'origin/master' into certs | Vincent Breitmoser | 2014-04-05 | 288 | -7191/+26952 |
|\| | |||||
| * | Change headers in encrypt activity to be more descriptive | Dominik Schürmann | 2014-04-04 | 1 | -2/+2 |
| * | Merge pull request #513 from Valodim/db-overhaul | Dominik Schürmann | 2014-04-04 | 25 | -896/+708 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-04 | 7 | -153/+89 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #512 from thi/simplify-passphrase-dialog-creation | Dominik Schürmann | 2014-04-04 | 7 | -153/+89 |
| |\ \ | |||||
| | * | | Simplify PassphraseDialogFragment usage | Thialfihar | 2014-04-04 | 7 | -153/+89 |
| |/ / | |||||
| | * | db-overhaul: fix key export (and some export-related ui changes) | Vincent Breitmoser | 2014-04-04 | 8 | -81/+77 |
| | * | db-overhaul: fix delete key from ViewKeyActivity | Vincent Breitmoser | 2014-04-04 | 3 | -15/+12 |
| | * | ViewKeyMainFragment cleanup (don't use inline queries!) | Vincent Breitmoser | 2014-04-04 | 1 | -96/+77 |
| | * | db-overhaul: fix DecryptAndVerify with and without known keys | Vincent Breitmoser | 2014-04-04 | 1 | -51/+59 |
| | * | db-overhaul: workaround api level 11 | Vincent Breitmoser | 2014-04-04 | 5 | -32/+42 |
| | * | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-04 | 42 | -170/+445 |
| | |\ | | |/ | |/| | |||||
| * | | title for ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 1 | -2/+2 |
| * | | Callback for OpenPgpServiceConnection | Dominik Schürmann | 2014-04-03 | 1 | -0/+33 |
| * | | simplify OpenPgpServiceConnection | Dominik Schürmann | 2014-04-03 | 1 | -5/+2 |
| * | | Keychain API Demo 3 | Dominik Schürmann | 2014-04-03 | 1 | -2/+2 |
| * | | Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ... | Dominik Schürmann | 2014-04-03 | 26 | -1407/+635 |
| |\ \ | |||||
| * | | | Disable tests | Dominik Schürmann | 2014-04-03 | 1 | -1/+1 |
| * | | | version 2.5 | Dominik Schürmann | 2014-04-03 | 1 | -2/+2 |
| * | | | Update from transifex | Dominik Schürmann | 2014-04-03 | 25 | -1/+221 |
| * | | | Changelog | Dominik Schürmann | 2014-04-03 | 3 | -2/+8 |
| * | | | Key lookup for API | Dominik Schürmann | 2014-04-03 | 2 | -6/+8 |
| * | | | Key lookup for API | Dominik Schürmann | 2014-04-03 | 2 | -7/+16 |
| * | | | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 10 | -147/+155 |
| | | * | db-overhaul: different hack for type info (api level problem inside) | Vincent Breitmoser | 2014-04-04 | 1 | -18/+6 |
| | | * | calculate nfc packet on demand only | Vincent Breitmoser | 2014-04-04 | 1 | -20/+18 |
| | | * | db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivity | Vincent Breitmoser | 2014-04-04 | 7 | -10/+25 |
| | | * | db-overhaul: reintroduce by-mail and by-subkey queries | Vincent Breitmoser | 2014-04-04 | 5 | -78/+109 |
| | | * | db-overhaul: minor stuff, mostly ProviderHelper | Vincent Breitmoser | 2014-04-04 | 8 | -78/+73 |
| | | * | db-overhaul: more work on new provider | Vincent Breitmoser | 2014-04-03 | 10 | -263/+208 |
| | | * | more work on streamlining uris, and stripping ProviderHelper | Vincent Breitmoser | 2014-04-03 | 10 | -223/+148 |
| | | * | ditch useless PgpKeyHelper.getMasterKey methods | Vincent Breitmoser | 2014-04-03 | 7 | -100/+23 |
| | |/ | |||||
| | * | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-03 | 113 | -1011/+1322 |
| | |\ | | |/ | |/| | |||||
| * | | Cleanup DrawerActivity | Dominik Schürmann | 2014-04-03 | 1 | -31/+4 |
| * | | clarify readme | Dominik Schürmann | 2014-04-03 | 1 | -1/+1 |