Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #531 from danielhass/toast_replacement | Dominik Schürmann | 2014-04-07 | 1 | -8/+9 | |
|\ \ | |/ |/| | Futher Toast replacements | |||||
| * | Futher Toast replacements in CertifyKeyActivity | Daniel Haß | 2014-04-07 | 1 | -8/+9 | |
|/ | ||||||
* | Merge pull request #529 from gogowitczak/gradlebug-branch | Dominik Schürmann | 2014-04-06 | 1 | -13/+13 | |
|\ | | | | | Fixed gradle localTest bug on Windows. | |||||
| * | Fixed gradle localTest bug on Windows. | gogowitczak | 2014-04-06 | 1 | -13/+13 | |
|/ | ||||||
* | Comment out localTest due to bug on windows | Dominik Schürmann | 2014-04-06 | 1 | -13/+13 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-04-06 | 3 | -13/+13 | |
|\ | ||||||
| * | Merge pull request #522 from Valodim/master | Dominik Schürmann | 2014-04-06 | 3 | -13/+13 | |
| |\ | | | | | | | show key expiry status similar to revocation | |||||
| | * | show key expiry status similar to revocation | Vincent Breitmoser | 2014-04-06 | 3 | -13/+13 | |
| |/ | ||||||
* / | License clarification in README | Dominik Schürmann | 2014-04-06 | 1 | -2/+3 | |
|/ | ||||||
* | Update README | Dominik Schürmann | 2014-04-06 | 1 | -1/+1 | |
| | ||||||
* | Update travis link | Dominik Schürmann | 2014-04-06 | 1 | -1/+1 | |
| | ||||||
* | Update transifex config | Dominik Schürmann | 2014-04-06 | 1 | -18/+18 | |
| | ||||||
* | Update README | Dominik Schürmann | 2014-04-06 | 1 | -10/+10 | |
| | ||||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 532 | -7/+7 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-04-06 | 38 | -106/+124 | |
| | ||||||
* | Optimize comments, remove dead code | Dominik Schürmann | 2014-04-06 | 6 | -47/+5 | |
| | ||||||
* | Use dark icon in warning dialogs in edit key | Dominik Schürmann | 2014-04-06 | 1 | -2/+2 | |
| | ||||||
* | code style | Dominik Schürmann | 2014-04-06 | 3 | -14/+12 | |
| | ||||||
* | copyright header correction, style fixes | Dominik Schürmann | 2014-04-06 | 2 | -48/+49 | |
| | ||||||
* | Merge pull request #520 from Valodim/certs | Dominik Schürmann | 2014-04-06 | 23 | -146/+1331 | |
|\ | | | | | Certificate support | |||||
| * | certs: remove unused menu item | Vincent Breitmoser | 2014-04-06 | 2 | -7/+0 | |
| | | ||||||
| * | certs: change migration routine so certifications work | Vincent Breitmoser | 2014-04-06 | 1 | -3/+27 | |
| | | ||||||
| * | certs: display green dot for certified keys in KeyListFragment | Vincent Breitmoser | 2014-04-06 | 4 | -4/+35 | |
| | | ||||||
| * | certs: forgot to add ids file | Vincent Breitmoser | 2014-04-06 | 1 | -0/+6 | |
| | | ||||||
| * | Merge remote-tracking branch 'origin/master' into certs | Vincent Breitmoser | 2014-04-06 | 22 | -195/+130 | |
| |\ | |/ |/| | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |||||
* | | 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 ↵ | Dominik Schürmann | 2014-04-05 | 7 | -141/+66 | |
| | | | | | | | | view activity | |||||
| * | certs: ditch expiry, re-add data blob, improve ViewCertActivity | Vincent Breitmoser | 2014-04-06 | 6 | -41/+101 | |
| | | | | | | | | | | | | | | | | | | GnuPG doesn't support expiry of user id certifications. The number of rings with an expiration subpacket in a cert out there is likely negligible. ViewCertActivity now verifies the key and displays a status. For revocation certs, the revocation reason is also shown. | |||||
| * | 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 | |
| | | | | | | | | | | | | | | * recognize self-certifications * save signature type * save expiry time * drop encoded data blob from db | |||||
| * | 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 | |
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of things are completely broken, but it compiles and doesn't crash right away. Good enough for me. Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml | |||||
* | | 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 | |
|\ \ | | | | | | | Get everything working again after db overhaul | |||||
| * \ | 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 passphrase dialog creation | |||||
| * | | | Simplify PassphraseDialogFragment usage | Thialfihar | 2014-04-04 | 7 | -153/+89 | |
|/ / / | | | | | | | | | | | | | Move boiler plate code into a simple static show() method, which only requires a Handler and can be used ad hoc in any FragmentActivity. | |||||
| * | | 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 | |
| | | |