Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add cancelable mechanism and support in key import | Vincent Breitmoser | 2014-08-31 | 1 | -0/+2 |
| | | | | Closes #323 | ||||
* | if there is only one private key, use it fo certification by default | Vincent Breitmoser | 2014-08-31 | 1 | -3/+7 |
| | |||||
* | use LoaderFragment for CertifyActivity | Vincent Breitmoser | 2014-08-31 | 3 | -179/+198 |
| | |||||
* | Merge remote-tracking branch 'dakid/master' | Vincent Breitmoser | 2014-08-30 | 1 | -1/+1 |
|\ | |||||
| * | Encrypted message is not being spellchecked anymore | Daniel Albert | 2014-08-30 | 1 | -1/+1 |
| | | |||||
* | | canonicalize: add check for algorithm type | Vincent Breitmoser | 2014-08-30 | 6 | -12/+14 |
|/ | | | | closes #797 | ||||
* | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 2 | -4/+42 |
|\ | | | | | ECC support | ||||
| * | add ecc support | Vincent Breitmoser | 2014-08-24 | 2 | -4/+40 |
| | | |||||
| * | Add ECDH and ECDSA values | Dominik Schürmann | 2014-08-21 | 1 | -0/+2 |
| | | |||||
* | | Fix RuntimeException in KeyListActivity on tablets | Dominik Schürmann | 2014-08-28 | 6 | -53/+47 |
| | | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-27 | 6 | -13/+15 |
|\ \ | |||||
| * | | small language fixes for previous commit | Vincent Breitmoser | 2014-08-27 | 6 | -13/+15 |
| | | | |||||
* | | | Strip out duplicate user ids | Dominik Schürmann | 2014-08-27 | 5 | -5/+6 |
|/ / | |||||
* | | Abort import of pubkeys where secret keys exist but new pubkey has more ↵ | Dominik Schürmann | 2014-08-27 | 1 | -0/+1 |
| | | | | | | | | subkeys, fix #696 | ||||
* | | Cleanup FoldableLinearLayout | Dominik Schürmann | 2014-08-27 | 4 | -12/+5 |
| | | |||||
* | | Pull from transifex | Dominik Schürmann | 2014-08-22 | 19 | -13/+100 |
|/ | |||||
* | Add sync properties | Dominik Schürmann | 2014-08-21 | 1 | -1/+3 |
| | |||||
* | Change account type | Dominik Schürmann | 2014-08-21 | 2 | -2/+2 |
| | |||||
* | XML cleanup | Dominik Schürmann | 2014-08-21 | 7 | -79/+11 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-08-21 | 6 | -42/+22 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 1 | -1/+3 |
|\ | |||||
| * | move key deletion into KeychainIntentHandler | Vincent Breitmoser | 2014-08-20 | 1 | -0/+1 |
| | | |||||
| * | consolidate: small ui things | Vincent Breitmoser | 2014-08-20 | 1 | -1/+2 |
| | | |||||
* | | Enable sync adapter, changelog | Dominik Schürmann | 2014-08-20 | 1 | -0/+1 |
| | | |||||
* | | improve certs_text | Dominik Schürmann | 2014-08-20 | 1 | -1/+1 |
|/ | |||||
* | modifyKey: small logging changes | Vincent Breitmoser | 2014-08-20 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 1 | -1/+1 |
| | | | |||||
* | | | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 1 | -1/+2 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 15 | -76/+135 |
|\| | |||||
| * | Pull from transifex | Dominik Schürmann | 2014-08-20 | 15 | -76/+135 |
| | | |||||
* | | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 1 | -1/+1 |
|/ | |||||
* | Pull from transifex | Dominik Schürmann | 2014-08-20 | 32 | -338/+1203 |
| | |||||
* | Fix strings | Dominik Schürmann | 2014-08-19 | 1 | -4/+4 |
| | |||||
* | consolidate: a lot more log output, better recovery | Vincent Breitmoser | 2014-08-19 | 1 | -5/+23 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-19 | 1 | -0/+3 |
|\ | |||||
| * | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 1 | -0/+3 |
| | | |||||
* | | Scroll fixes for certify activity | Dominik Schürmann | 2014-08-19 | 1 | -7/+5 |
|/ | |||||
* | certs header design | Dominik Schürmann | 2014-08-19 | 1 | -3/+11 |
| | |||||
* | Header for certs view | Dominik Schürmann | 2014-08-19 | 3 | -23/+39 |
| | |||||
* | Add subkey: at least one flag should be selected! | Dominik Schürmann | 2014-08-18 | 1 | -0/+1 |
| | |||||
* | Fixes for expiry UI | Dominik Schürmann | 2014-08-18 | 1 | -0/+10 |
| | |||||
* | Merge pull request #772 from mar-v-in/issue-729 | Vincent | 2014-08-17 | 1 | -5/+3 |
|\ | | | | | Remove NoSwipeWrapContentViewPager | ||||
| * | Remove NoSwipeWrapContentViewPager | mar-v-in | 2014-08-17 | 1 | -5/+3 |
| | | |||||
* | | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 2 | -0/+21 |
| | | |||||
* | | modify*Key: improve handling of passphrase modification (add tests, too) | Vincent Breitmoser | 2014-08-16 | 1 | -1/+5 |
| | | |||||
* | | typed expected failures and a couple minor things | Vincent Breitmoser | 2014-08-16 | 12 | -17/+6 |
| | | |||||
* | | support for master key modifications, among other stuff | Vincent Breitmoser | 2014-08-16 | 6 | -6/+8 |
| | | |||||
* | | modifySecretKey: err out on "use previous" expiry date for (sub)key creation | Vincent Breitmoser | 2014-08-16 | 1 | -0/+2 |
| | |