Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add keys button goes to directly to qr scan | Vincent Breitmoser | 2014-10-10 | 2 | -8/+118 |
| | |||||
* | keylist: add safeslinger exchange button to secret keys | Vincent Breitmoser | 2014-10-10 | 2 | -13/+182 |
| | |||||
* | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2014-10-09 | 21 | -78/+140 |
|\ | |||||
| * | Better handling if no api key is selected | Dominik Schürmann | 2014-10-09 | 1 | -1/+1 |
| | | |||||
| * | Better handling if no api key is selected | Dominik Schürmann | 2014-10-09 | 2 | -8/+14 |
| | | |||||
| * | Replace many PgpGeneralExceptions with PgpKeyNotFoundException | Dominik Schürmann | 2014-10-09 | 20 | -70/+126 |
| | | |||||
| * | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 20 | -119/+150 |
| | | | | | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385. | ||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-09 | 1 | -1/+1 |
| |\ | | | | | | | | | | development | ||||
| * | | Replace PgpGeneralException with NotFoundException where appropriate | Dominik Schürmann | 2014-10-09 | 20 | -150/+119 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2014-10-09 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | fix plurals quantity string in ImportKeyResult | Vincent Breitmoser | 2014-10-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | yubikey: check with correct subkey id for sign operation | Vincent Breitmoser | 2014-10-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | reduce memory footprint in QrCodeActivity as well | Vincent Breitmoser | 2014-10-09 | 1 | -3/+16 |
| | | | | |||||
* | | | | reduce memory footprint of qr code in share tab | Vincent Breitmoser | 2014-10-09 | 2 | -18/+17 |
| |_|/ |/| | | |||||
* | | | rename certify_key_item to the more appropriate multi_certify_item | Vincent Breitmoser | 2014-10-08 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Remove unnecessary exception | Dominik Schürmann | 2014-10-08 | 2 | -9/+4 |
| | | |||||
* | | Big error screen if signature is invalid or key is revoked/expired, also ↵ | Dominik Schürmann | 2014-10-08 | 4 | -36/+90 |
| | | | | | | | | fixes signature status for expired and revoked keys | ||||
* | | Handle revoked and expired keys in decrypt activity | Dominik Schürmann | 2014-10-08 | 1 | -17/+39 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-08 | 4 | -25/+15 |
|\ \ | | | | | | | | | | development | ||||
| * | | remove ui hack, use padding instead of margin | Vincent Breitmoser | 2014-10-08 | 1 | -10/+0 |
| | | | |||||
| * | | use "Key ID" for beautify | Vincent Breitmoser | 2014-10-08 | 1 | -1/+1 |
| | | | |||||
| * | | automatically extend single compound entry logs | Vincent Breitmoser | 2014-10-08 | 2 | -14/+14 |
| | | | |||||
* | | | New decryption screen UI with modernPGP icons | Dominik Schürmann | 2014-10-08 | 3 | -104/+205 |
|/ / | |||||
* | | Filter key list by certified keys | Dominik Schürmann | 2014-10-08 | 1 | -0/+51 |
| | | |||||
* | | Move utf8 check for user id upwards | Dominik Schürmann | 2014-10-07 | 1 | -4/+5 |
| | | |||||
* | | Fix MSG_MF_UID_PRIMARY log | Dominik Schürmann | 2014-10-07 | 1 | -1/+1 |
| | | |||||
* | | Cleanup and fix decrypt activity | Dominik Schürmann | 2014-10-07 | 1 | -20/+32 |
| | | |||||
* | | Certify design | Dominik Schürmann | 2014-10-07 | 1 | -12/+0 |
| | | |||||
* | | get rid of some old code in LogDisplayFragment | Vincent Breitmoser | 2014-10-06 | 1 | -70/+4 |
| | | |||||
* | | certify: checkbox fake click area tidbit | Vincent Breitmoser | 2014-10-06 | 1 | -0/+10 |
| | | |||||
* | | Fix app name | Dominik Schürmann | 2014-10-05 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-05 | 6 | -45/+49 |
|\ \ | | | | | | | | | | into jacobshack-certify | ||||
| * | | UI stuff | Dominik Schürmann | 2014-10-05 | 6 | -45/+49 |
| | | | |||||
* | | | use sub results in import | Vincent Breitmoser | 2014-10-05 | 2 | -3/+14 |
| | | | |||||
* | | | add support for second line in log view | Vincent Breitmoser | 2014-10-05 | 3 | -6/+52 |
| | | | |||||
* | | | add support for hierarchical log entries | Vincent Breitmoser | 2014-10-05 | 2 | -7/+85 |
|/ / | |||||
* | | use status icons in public key selection | Dominik Schürmann | 2014-10-05 | 3 | -24/+34 |
| | | |||||
* | | Add cloud icon | Dominik Schürmann | 2014-10-05 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-05 | 4 | -56/+63 |
|\ \ | | | | | | | | | | into jacobshack-certify | ||||
| * | | Give result down to list | Dominik Schürmann | 2014-10-05 | 2 | -50/+58 |
| | | | |||||
| * | | Make bit size optional | Dominik Schürmann | 2014-10-05 | 3 | -6/+5 |
| | | | |||||
* | | | even more layout neatification | Vincent Breitmoser | 2014-10-05 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-05 | 5 | -10/+39 |
|\ \ | | | | | | | | | | | | | | | | | | | into jacobshack-certify Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java | ||||
| * | | preselect certify key | Dominik Schürmann | 2014-10-05 | 5 | -13/+34 |
| | | | |||||
| * | | Display result in multi certify | Dominik Schürmann | 2014-10-04 | 3 | -1/+9 |
| | | | |||||
* | | | more layout neatification | Vincent Breitmoser | 2014-10-05 | 1 | -1/+1 |
| | | | |||||
* | | | slight layout changes to keyspinner_item | Vincent Breitmoser | 2014-10-05 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-04 | 1 | -2/+2 |
|\ \ | | | | | | | | | | into jacobshack-certify | ||||
| * | | use new multi certify, layout fixes | Dominik Schürmann | 2014-10-04 | 1 | -2/+2 |
| | | | |||||
* | | | merge key ids in getSelectedCertifyActions | Vincent Breitmoser | 2014-10-04 | 2 | -24/+28 |
|/ / |