| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 2 | -9/+7 |
| |\ |
|
| | * | progress dialog design fix | Dominik Schürmann | 2014-08-20 | 2 | -9/+7 |
| * | | modifyKey: small logging changes | Vincent Breitmoser | 2014-08-20 | 1 | -1/+1 |
| |/ |
|
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 3 | -90/+113 |
| |\ |
|
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 6 | -18/+29 |
| | |\ |
|
| | * | | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 3 | -90/+113 |
| * | | | return some more results | Dominik Schürmann | 2014-08-20 | 6 | -35/+41 |
| | |/
|/| |
|
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 7 | -53/+73 |
| |\| |
|
| | * | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 4 | -48/+66 |
| | * | consolidate: use KeychainProvider for deletion operation | Vincent Breitmoser | 2014-08-20 | 4 | -5/+7 |
| * | | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 6 | -18/+29 |
| |/ |
|
| * | Fix mime types, #781 | mar-v-in | 2014-08-19 | 1 | -1/+1 |
| * | Fix strings | Dominik Schürmann | 2014-08-19 | 2 | -3/+3 |
| * | consolidate: a lot more log output, better recovery | Vincent Breitmoser | 2014-08-19 | 3 | -30/+85 |
| * | Start consolidate activity | Dominik Schürmann | 2014-08-19 | 1 | -1/+8 |
| * | ConsolidateDialogActivity | Dominik Schürmann | 2014-08-19 | 1 | -41/+26 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-19 | 9 | -27/+263 |
| |\ |
|
| | * | stub for consolidate recovery in KeychainApplication | Vincent Breitmoser | 2014-08-19 | 1 | -1/+8 |
| | * | add ProgressFixedScaler (forgot in a previous commit) | Vincent Breitmoser | 2014-08-19 | 1 | -0/+29 |
| | * | add OpenDialogActivity (stub) | Vincent Breitmoser | 2014-08-19 | 1 | -0/+117 |
| | * | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 6 | -26/+109 |
| * | | Scroll fixes for certify activity | Dominik Schürmann | 2014-08-19 | 2 | -1/+16 |
| |/ |
|
| * | Notes about criticality | Dominik Schürmann | 2014-08-19 | 1 | -2/+15 |
| * | Decrease iteration count, delayed for 2.9 | Dominik Schürmann | 2014-08-19 | 1 | -1/+1 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-19 | 1 | -1/+3 |
| |\ |
|
| | * | fix primary user id in master key flag modification | Vincent Breitmoser | 2014-08-19 | 1 | -1/+3 |
| * | | Change criticallity of subpackets after discussion | Dominik Schürmann | 2014-08-19 | 1 | -5/+5 |
| |/ |
|
| * | Use higher s2k count | Dominik Schürmann | 2014-08-19 | 1 | -10/+29 |
| * | Use SHA512 instead of SHA1 and AES256 instead of CAST5 where possible | Dominik Schürmann | 2014-08-19 | 1 | -20/+22 |
| * | Mark packets critical | Dominik Schürmann | 2014-08-19 | 1 | -11/+11 |
| * | add feature to key sig subpacket to indicate that we want MDC | Dominik Schürmann | 2014-08-19 | 1 | -0/+3 |
| * | New preferred hash and symmetric algos, removed SHA-1, 3DES, new ordering | Dominik Schürmann | 2014-08-19 | 1 | -7/+17 |
| * | Add license headers | Dominik Schürmann | 2014-08-19 | 3 | -0/+51 |
| * | Add subkey: at least one flag should be selected! | Dominik Schürmann | 2014-08-18 | 1 | -53/+74 |
| * | Fixes for expiry UI | Dominik Schürmann | 2014-08-18 | 5 | -69/+101 |
| * | Merge pull request #772 from mar-v-in/issue-729 | Vincent | 2014-08-17 | 3 | -97/+22 |
| |\ |
|
| | * | Work-around rendering bug when switching back to asymmetric with multiple rec... | mar-v-in | 2014-08-17 | 1 | -14/+2 |
| | * | Remove NoSwipeWrapContentViewPager | mar-v-in | 2014-08-17 | 2 | -83/+20 |
| * | | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 7 | -15/+281 |
| * | | parametrize FileImportCache for filename | Vincent Breitmoser | 2014-08-17 | 3 | -7/+9 |
| * | | modify*Key: improve handling of passphrase modification (add tests, too) | Vincent Breitmoser | 2014-08-16 | 2 | -2/+52 |
| * | | use correct algorithm for signatures (actually fix heterogeneous subkeys) | Vincent Breitmoser | 2014-08-16 | 1 | -4/+4 |
| * | | fix small log format string mistake for adding subkeys | Vincent Breitmoser | 2014-08-16 | 1 | -1/+2 |
| * | | Fixing date picker issues | Dominik Schürmann | 2014-08-16 | 2 | -22/+47 |
| * | | Fix flags UI in add subkey dialog | Dominik Schürmann | 2014-08-16 | 2 | -5/+44 |
| * | | Fix ElGamal key creation, SUBKEY_BINDING cert must use algo of master key | Dominik Schürmann | 2014-08-16 | 1 | -1/+1 |
| * | | Fix expiry when adding subkeys | Dominik Schürmann | 2014-08-16 | 3 | -6/+5 |
| * | | Always return a SaveKeyringResult from saving | Dominik Schürmann | 2014-08-16 | 2 | -4/+7 |
| * | | Fix and simplify in OperationResultParcel | Dominik Schürmann | 2014-08-16 | 1 | -11/+7 |
| * | | fix travis tests (more), minor comment edits | Vincent Breitmoser | 2014-08-16 | 1 | -4/+3 |
