Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-23 | 10 | -47/+81 |
|\ | | | | | | | development | ||||
| * | Fix crash on Android 5 | Dominik Schürmann | 2014-10-22 | 1 | -11/+16 |
| | | |||||
| * | consistency for import UI | Dominik Schürmann | 2014-10-16 | 1 | -5/+27 |
| | | |||||
| * | Silently fail on import on key import with ArrayIndexOutOfBoundsException | Dominik Schürmann | 2014-10-16 | 2 | -8/+14 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-15 | 6 | -8/+60 |
| |\ | | | | | | | | | | development | ||||
| * | | More consisitency | Dominik Schürmann | 2014-10-15 | 2 | -6/+6 |
| | | | |||||
| * | | More color/icon consistency | Dominik Schürmann | 2014-10-15 | 5 | -20/+21 |
| | | | |||||
* | | | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 9 | -126/+165 |
| |/ |/| | |||||
* | | some cleanup and documentation of *Operation classes | Vincent Breitmoser | 2014-10-15 | 6 | -8/+60 |
|/ | |||||
* | color experiments | Dominik Schürmann | 2014-10-15 | 4 | -76/+82 |
| | |||||
* | fix test for new PgpDecryptVerify | Vincent Breitmoser | 2014-10-14 | 1 | -1/+3 |
| | |||||
* | fix export performance problems | Vincent Breitmoser | 2014-10-14 | 1 | -0/+5 |
| | |||||
* | actually remove filter spinner code. that's what git is for~ | Vincent Breitmoser | 2014-10-13 | 1 | -46/+0 |
| | |||||
* | Remove key list filter for now | Dominik Schürmann | 2014-10-13 | 1 | -27/+27 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-13 | 5 | -2/+52 |
|\ | | | | | | | development | ||||
| * | Added option for num keypad for YubiKey | Jerzy Kołosowski | 2014-10-13 | 5 | -2/+52 |
| | | |||||
* | | make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperation | Vincent Breitmoser | 2014-10-13 | 4 | -120/+35 |
| | | |||||
* | | remove DELETE_FILE_SECURELY | Vincent Breitmoser | 2014-10-13 | 1 | -23/+0 |
|/ | | | | closes #961 | ||||
* | forgot committing ExportResult class | Vincent Breitmoser | 2014-10-13 | 1 | -0/+60 |
| | |||||
* | remove outdated AddKeysActivity | Vincent Breitmoser | 2014-10-13 | 1 | -463/+0 |
| | |||||
* | rewrite export with new operation style | Vincent Breitmoser | 2014-10-13 | 4 | -141/+212 |
| | |||||
* | CertifyOperation is not a Pgp- operation | Vincent Breitmoser | 2014-10-12 | 4 | -42/+66 |
| | |||||
* | fix logging in consolidate, part 2 | Vincent Breitmoser | 2014-10-11 | 1 | -11/+14 |
| | |||||
* | DeleteResult: add custom createNotify | Vincent Breitmoser | 2014-10-11 | 3 | -11/+117 |
| | |||||
* | fix logging in consolidate, part 1 | Vincent Breitmoser | 2014-10-11 | 1 | -43/+47 |
| | |||||
* | move delete into operation class | Vincent Breitmoser | 2014-10-11 | 4 | -33/+159 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 45 | -114/+99 |
| | |||||
* | move operations into ops package, introduce BaseOperation class | Vincent Breitmoser | 2014-10-10 | 5 | -64/+89 |
| | |||||
* | 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 |
| | | |