Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | wrapped-key-ring: encapsulate key flags | Vincent Breitmoser | 2014-05-22 | 2 | -18/+20 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-21 | 8 | -115/+88 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | Merge highlight keyserver pull request | Dominik Schürmann | 2014-05-18 | 5 | -89/+58 |
| |\ | |||||
| | * | Rename mCurQuery to mQuery for consistency | Thialfihar | 2014-05-16 | 1 | -5/+5 |
| | | | |||||
| | * | Use Highlighter instead of HighlightQueryCursorAdapter | Thialfihar | 2014-05-16 | 3 | -79/+28 |
| | | | |||||
| | * | Add highlighting to keyserver/keybase search | Thialfihar | 2014-05-16 | 1 | -3/+5 |
| | | | |||||
| | * | Support mutliple search words and highlight them | Thialfihar | 2014-05-16 | 3 | -6/+24 |
| | | | | | | | | | | | | | | | | | | | | | For the regex matching it would be smart to sort the words by length, so the longest matches come first. This only matters for queries with words containing parts of each other, which is an unlikely event and even then it doesn't break anything. | ||||
| * | | Rename KeyServer to Keyserver | Dominik Schürmann | 2014-05-18 | 4 | -22/+21 |
| |/ | |||||
| * | Rename fingerPrint to fingerprint | Thialfihar | 2014-05-14 | 2 | -3/+3 |
| | | |||||
| * | Don't guess keybase key algorithm and size | Thialfihar | 2014-05-14 | 1 | -1/+6 |
| | | | | | | | | | | Once keybase reports them, we can display them. Until then we simply don't know and shouldn't lie about it. | ||||
* | | wrapped-key-ring: use CachedKeyRing where possible | Vincent Breitmoser | 2014-05-21 | 3 | -10/+14 |
| | | |||||
* | | use long rather than String to build uris by key | Vincent Breitmoser | 2014-05-21 | 6 | -14/+13 |
| | | |||||
* | | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 4 | -21/+27 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 49 | -1068/+1406 |
|\| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | Fixed wrong AppMsg-Style | Daniel Haß | 2014-05-11 | 1 | -2/+2 |
| | | |||||
| * | ui: purplize dialog headers (huge hack inside) | Vincent Breitmoser | 2014-05-08 | 12 | -28/+63 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-08 | 1 | -3/+0 |
| |\ | |||||
| | * | use setEncryptToSigner for asymmetric encryption | Vincent Breitmoser | 2014-05-08 | 1 | -3/+0 |
| | | | | | | | | | | | | (tested and works, closes #569) | ||||
| * | | Use flat buttons where appropriate | Dominik Schürmann | 2014-05-08 | 3 | -14/+10 |
| |/ | |||||
| * | use LoaderFragment in ViewKey tabs | Vincent Breitmoser | 2014-05-08 | 4 | -44/+32 |
| | | | | | | | | Closes #616 | ||||
| * | extract generic LoaderFragment superclass from KeyList | Vincent Breitmoser | 2014-05-08 | 2 | -61/+88 |
| | | |||||
| * | Don't allow certification using keys where primary subkey is stripped | Vincent Breitmoser | 2014-05-07 | 1 | -4/+7 |
| | | | | | | | | Closes #596 | ||||
| * | Add applications section to help | Dominik Schürmann | 2014-05-07 | 3 | -3/+3 |
| | | |||||
| * | Remove code for sharing whole key via qr code | Dominik Schürmann | 2014-05-07 | 2 | -129/+16 |
| | | |||||
| * | GET_KEY: also return PendingIntent to key view | Dominik Schürmann | 2014-05-07 | 1 | -1/+1 |
| | | |||||
| * | Better handling of actionbars back | Dominik Schürmann | 2014-05-07 | 5 | -27/+50 |
| | | |||||
| * | Design fixes for certification activity | Dominik Schürmann | 2014-05-07 | 1 | -44/+43 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-07 | 4 | -52/+82 |
| |\ | |||||
| | * | ui: use SlidingTabLayout in help activity | Vincent Breitmoser | 2014-05-07 | 1 | -20/+30 |
| | | | |||||
| | * | small fix for 6aafb3, forgot to commit this line | Vincent Breitmoser | 2014-05-07 | 1 | -0/+1 |
| | | | |||||
| | * | ui: purplize searchtext in keylist | Vincent Breitmoser | 2014-05-07 | 1 | -0/+3 |
| | | | |||||
| | * | display AppMsg warning when no encryption subkey is available | Vincent Breitmoser | 2014-05-07 | 1 | -0/+12 |
| | | | |||||
| | * | ui: slight edit icon cosmetics in keylist | Vincent Breitmoser | 2014-05-07 | 1 | -0/+4 |
| | | | |||||
| | * | ui: move revocation/expiry notes above tab slider | Vincent Breitmoser | 2014-05-07 | 2 | -32/+32 |
| | | | |||||
| * | | Clarify language | Dominik Schürmann | 2014-05-07 | 2 | -2/+2 |
| |/ | |||||
| * | Clarify language | Dominik Schürmann | 2014-05-06 | 1 | -1/+1 |
| | | |||||
| * | edit button with image | Dominik Schürmann | 2014-05-06 | 1 | -2/+3 |
| | | |||||
| * | Always use section style instead of custom class | Dominik Schürmann | 2014-05-06 | 1 | -69/+0 |
| | | |||||
| * | Move logic classes for import into own sub-package | Dominik Schürmann | 2014-05-06 | 7 | -276/+11 |
| | | |||||
| * | ui: apply purple theme (twi is best color) | Vincent Breitmoser | 2014-05-06 | 1 | -1/+1 |
| | | |||||
| * | ui: use textview buttons in decrypt verify dialogue | Vincent Breitmoser | 2014-05-06 | 2 | -6/+6 |
| | | |||||
| * | ui: use textviews instead of bootstrap buttons in SignEncrypt | Vincent Breitmoser | 2014-05-06 | 2 | -10/+9 |
| | | |||||
| * | Touch view only once | Dominik Schürmann | 2014-05-06 | 1 | -9/+11 |
| | | |||||
| * | ui: use primary icon color for certification status | Vincent Breitmoser | 2014-05-06 | 1 | -11/+8 |
| | | |||||
| * | ui: show revocation and expiry status on info tab | Vincent Breitmoser | 2014-05-06 | 1 | -31/+40 |
| | | |||||
| * | ui: subkey view redesign | Vincent Breitmoser | 2014-05-05 | 1 | -31/+13 |
| | | |||||
| * | ui: remove primary subkey info | Vincent Breitmoser | 2014-05-05 | 1 | -113/+7 |
| | | |||||
| * | Merge pull request #609 from Vadiml1024/master | Dominik Schürmann | 2014-05-05 | 1 | -2/+2 |
| |\ | | | | | | | Avoid displaying double 0x before keyid in ViewCertActivity | ||||
| | * | Avoid displaying double 0x before keyid in ViewCertActivity | Vadim Lebedev | 2014-05-02 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #603 from timbray/master | Dominik Schürmann | 2014-05-05 | 10 | -14/+318 |
| |\ \ | | | | | | | | | Adds first level of keybase support |