| Commit message (Expand) | Author | Age | Files | Lines |
* | Pull from transifex | Dominik Schürmann | 2014-09-15 | 1 | -1/+1 |
* | Fix build | Dominik Schürmann | 2014-09-15 | 1 | -1/+0 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-15 | 45 | -587/+571 |
|\ |
|
| * | update for new plural origins on ImportKeyListEntry | Tim Bray | 2014-09-13 | 1 | -1/+1 |
| * | Keys found on multiple servers are now imported from all of them | Tim Bray | 2014-09-13 | 5 | -27/+40 |
| * | Change shuffle to rotate, and when merging ImportKeysList entries, if either ... | Tim Bray | 2014-09-13 | 3 | -5/+15 |
| * | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | Tim Bray | 2014-09-13 | 16 | -438/+407 |
| * | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 26 | -111/+101 |
| * | pending results are a type of non-success | Vincent Breitmoser | 2014-09-14 | 6 | -10/+12 |
* | | New decrypt activity design (WIP), saner UTF8 decoding (replacing non-decodab... | Dominik Schürmann | 2014-09-15 | 9 | -139/+366 |
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-14 | 7 | -213/+379 |
|\| |
|
| * | (forgot a file for previous commit) | Vincent Breitmoser | 2014-09-14 | 1 | -0/+103 |
| * | add SignEncryptResult parcel (probably break stuff) | Vincent Breitmoser | 2014-09-14 | 6 | -213/+276 |
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-14 | 3 | -30/+34 |
|\| |
|
| * | Temporary fix for #848, fixed pull2refresh bugs | Daniel Albert | 2014-09-13 | 3 | -30/+34 |
* | | First work on decrypt | Dominik Schürmann | 2014-09-14 | 2 | -2/+3 |
|/ |
|
* | Hack to disable overscroll effect of swipe to update | Dominik Schürmann | 2014-09-13 | 3 | -15/+486 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 2 | -3/+10 |
|\ |
|
| * | add key id to trailing asym data log msg | Vincent Breitmoser | 2014-09-13 | 1 | -3/+6 |
| * | just skip foreign uid certifications during import for now | Vincent Breitmoser | 2014-09-13 | 1 | -0/+4 |
* | | Custom actionbar to indicate swipe down effect | Dominik Schürmann | 2014-09-13 | 1 | -0/+51 |
|/ |
|
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-13 | 1 | -1/+7 |
|\ |
|
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 2 | -0/+5 |
| |\ |
|
| * | | Set literal data format tag to UTF8 when encrypting text | Dominik Schürmann | 2014-09-13 | 1 | -1/+7 |
* | | | move IS_REVOKED table prefix to the right places | Vincent Breitmoser | 2014-09-13 | 5 | -6/+9 |
| |/
|/| |
|
* | | very small fix, don't show name on encoding warning | Vincent Breitmoser | 2014-09-13 | 1 | -2/+1 |
* | | log warning on bad uid encoding | Vincent Breitmoser | 2014-09-13 | 2 | -0/+6 |
|/ |
|
* | Merge branch 'result-parcels' | Vincent Breitmoser | 2014-09-13 | 8 | -214/+344 |
|\ |
|
| * | some DecryptVerify log refinements | Vincent Breitmoser | 2014-09-13 | 1 | -5/+13 |
| * | add a ton of logging to DecryptVerify | Vincent Breitmoser | 2014-09-13 | 3 | -26/+128 |
| * | working version of DecryptVerifyResult | Vincent Breitmoser | 2014-09-13 | 6 | -64/+113 |
| * | introduce OperationResultParcel for PgpDecryptVerify operations (WIP) | Vincent Breitmoser | 2014-09-13 | 7 | -231/+202 |
* | | deactivate screenshots in new PassphraseDialogActivity | Dominik Schürmann | 2014-09-13 | 1 | -0/+10 |
* | | More smaller UI fixes | Dominik Schürmann | 2014-09-13 | 2 | -0/+6 |
* | | If expired/revoked, disable both encrypt buttons | Dominik Schürmann | 2014-09-13 | 1 | -0/+3 |
* | | Test for badly encoded user ids | Dominik Schürmann | 2014-09-13 | 1 | -0/+1 |
* | | Add new PassphraseDialogActivity, a transparent activity that only holds the ... | Dominik Schürmann | 2014-09-13 | 1 | -0/+357 |
* | | Fix share to encrypt text | Dominik Schürmann | 2014-09-13 | 2 | -25/+22 |
* | | Use spannable directly instead of html conversion in SubkeysAdapter | Dominik Schürmann | 2014-09-13 | 2 | -12/+20 |
* | | Remove unused method in KeyUpdateHelper | Dominik Schürmann | 2014-09-13 | 1 | -17/+0 |
* | | Merge pull request #843 from da-kid/master | Dominik Schürmann | 2014-09-13 | 4 | -5/+244 |
|\ \ |
|
| * | | Removed unnecessary querying of keyservers, reimplemented the ListAwareSwipeR... | Daniel Albert | 2014-09-13 | 3 | -38/+81 |
| * | | Implemented Pull2Refresh in the KeyListFragment | Daniel Albert | 2014-09-12 | 4 | -5/+201 |
* | | | Get certificates by raw user ids, be more liberal about accepted user id enco... | Dominik Schürmann | 2014-09-13 | 5 | -39/+72 |
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 23 | -402/+483 |
|\ \ \
| | |/
| |/| |
|
| * | | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 23 | -402/+483 |
| |/ |
|
* / | getSignaturesForID can return null, check this | Dominik Schürmann | 2014-09-13 | 2 | -119/+138 |
|/ |
|
* | fix key upload after certification (hopefully?) | Vincent Breitmoser | 2014-09-12 | 1 | -4/+1 |
* | add ui support for stripping subkeys | Vincent Breitmoser | 2014-09-11 | 3 | -16/+35 |
* | editKey: add support for sripping keys | Vincent Breitmoser | 2014-09-11 | 3 | -2/+32 |