Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use selected number of users in safe slinger | Dominik Schürmann | 2014-10-25 | 1 | -0/+1 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 1 | -0/+2 |
|\ | | | | | | | development | ||||
| * | set padding for sublog entries | Vincent Breitmoser | 2014-10-25 | 1 | -0/+2 |
| | | |||||
* | | Safe slinger activity preps | Dominik Schürmann | 2014-10-25 | 3 | -141/+231 |
|/ | |||||
* | Merge pull request #973 from timbray/development | Dominik Schürmann | 2014-10-24 | 1 | -5/+6 |
|\ | | | | | Make the Certify screen a little more self-explanatory | ||||
| * | Make the Certify screen a little more self-explanatory | Tim Bray | 2014-10-21 | 1 | -5/+6 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-23 | 3 | -15/+22 |
|\ \ | | | | | | | | | | | | | | | | | | | 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 | 8 | -31/+54 |
| |\| | | | | | | | | | | development | ||||
| * | | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 3 | -13/+20 |
| | | | |||||
* | | | Start safe slinger activity | Dominik Schürmann | 2014-10-23 | 1 | -0/+43 |
| | | | |||||
* | | | Externalize QR Code scanning and import into its own activity for better ↵ | Dominik Schürmann | 2014-10-23 | 4 | -116/+230 |
| |/ |/| | | | | | code separation | ||||
* | | 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 | 1 | -3/+3 |
| | | |||||
* | | More consisitency | Dominik Schürmann | 2014-10-15 | 2 | -6/+6 |
| | | |||||
* | | More color/icon consistency | Dominik Schürmann | 2014-10-15 | 5 | -20/+21 |
|/ | |||||
* | color experiments | Dominik Schürmann | 2014-10-15 | 4 | -76/+82 |
| | |||||
* | 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 |
| | |||||
* | Added option for num keypad for YubiKey | Jerzy Kołosowski | 2014-10-13 | 3 | -2/+41 |
| | |||||
* | remove outdated AddKeysActivity | Vincent Breitmoser | 2014-10-13 | 1 | -463/+0 |
| | |||||
* | DeleteResult: add custom createNotify | Vincent Breitmoser | 2014-10-11 | 2 | -11/+21 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 22 | -53/+40 |
| | |||||
* | 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 | 8 | -13/+21 |
|\ | |||||
| * | Replace many PgpGeneralExceptions with PgpKeyNotFoundException | Dominik Schürmann | 2014-10-09 | 8 | -13/+21 |
| | | |||||
| * | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 8 | -11/+13 |
| | | | | | | | | 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 | 8 | -13/+11 |
| | | | |||||
* | | | 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 |
|/ | |||||
* | Big error screen if signature is invalid or key is revoked/expired, also ↵ | Dominik Schürmann | 2014-10-08 | 2 | -33/+71 |
| | | | | 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 | 2 | -11/+1 |
|\ | | | | | | | 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 |
| | | |||||
* | | 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 |
| | |||||
* | 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 |
| | | |||||
* | | add support for second line in log view | Vincent Breitmoser | 2014-10-05 | 1 | -6/+43 |
| | | |||||
* | | add support for hierarchical log entries | Vincent Breitmoser | 2014-10-05 | 1 | -4/+31 |
|/ | |||||
* | 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 |
| |