Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-23 | 9 | -128/+167 |
|\ | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | ||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-23 | 13 | -61/+93 |
| |\ | | | | | | | | | | development | ||||
| * | | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 9 | -126/+165 |
| | | | |||||
* | | | Start safe slinger activity | Dominik Schürmann | 2014-10-23 | 2 | -0/+69 |
| | | | |||||
* | | | Externalize QR Code scanning and import into its own activity for better ↵ | Dominik Schürmann | 2014-10-23 | 6 | -121/+251 |
| |/ |/| | | | | | code separation | ||||
* | | 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 | ||||
| * | some cleanup and documentation of *Operation classes | Vincent Breitmoser | 2014-10-15 | 6 | -8/+60 |
| | | |||||
* | | More consisitency | Dominik Schürmann | 2014-10-15 | 5 | -13/+11 |
| | | |||||
* | | More color/icon consistency | Dominik Schürmann | 2014-10-15 | 7 | -27/+28 |
|/ | |||||
* | color experiments | Dominik Schürmann | 2014-10-15 | 4 | -76/+82 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-14 | 3 | -30/+43 |
|\ | | | | | | | development | ||||
| * | Group passphrase cache settings | Dominik Schürmann | 2014-10-13 | 2 | -24/+25 |
| | | |||||
| * | Register application/pgp-message for encrypted pgp data, more comments in ↵ | Dominik Schürmann | 2014-10-13 | 1 | -6/+18 |
| | | | | | | | | Manifest | ||||
* | | 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 | 2 | -29/+29 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-13 | 12 | -7/+61 |
|\ | | | | | | | development | ||||
| * | wording | Dominik Schürmann | 2014-10-13 | 1 | -3/+3 |
| | | |||||
| * | Better qr code icon | Dominik Schürmann | 2014-10-13 | 4 | -0/+0 |
| | | |||||
| * | Added option for num keypad for YubiKey | Jerzy Kołosowski | 2014-10-13 | 8 | -4/+58 |
| | | |||||
* | | fix syntax typo in androidmanifest | Vincent Breitmoser | 2014-10-13 | 1 | -1/+1 |
| | | |||||
* | | make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperation | Vincent Breitmoser | 2014-10-13 | 4 | -120/+35 |
| | | |||||
* | | forgot to remove AddKeysActivity in androidmanifest | Vincent Breitmoser | 2014-10-13 | 1 | -11/+0 |
| | | |||||
* | | 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 | 5 | -141/+236 |
| | |||||
* | 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 | 4 | -11/+137 |
| | |||||
* | fix logging in consolidate, part 1 | Vincent Breitmoser | 2014-10-11 | 1 | -43/+47 |
| | |||||
* | move delete into operation class | Vincent Breitmoser | 2014-10-11 | 5 | -33/+177 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 45 | -114/+99 |
| | |||||
* | different wording in share tab | Vincent Breitmoser | 2014-10-10 | 1 | -1/+1 |
| | |||||
* | fix width of displayed qr code | Vincent Breitmoser | 2014-10-10 | 1 | -1/+1 |
| | |||||
* | 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 | 3 | -9/+119 |
| | |||||
* | keylist: add safeslinger exchange button to secret keys | Vincent Breitmoser | 2014-10-10 | 3 | -13/+208 |
| | |||||
* | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2014-10-09 | 22 | -98/+168 |
|\ | |||||
| * | 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 | 3 | -28/+42 |
| | | |||||
| * | 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 | 2 | -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 |
|\ \ \ |