Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Tests not working anymore on travis after using new annotation parameter | Dominik Schürmann | 2015-07-09 | 14 | -57/+84 |
| | | | | | | Revert "Get rid of robolectric workaround by using new annotation in robolectric 3.0" This reverts commit 85a47d22f9bb1e4aaf5770c67416a5532977658e. | ||||
* | Get rid of robolectric workaround by using new annotation in robolectric 3.0 | Dominik Schürmann | 2015-07-09 | 14 | -84/+57 |
| | |||||
* | better handling of divert-to-card keys for subkey modifications | Vincent Breitmoser | 2015-07-08 | 2 | -8/+31 |
| | |||||
* | tests: make sure encryption happens to all enc-capable subkeys | Vincent Breitmoser | 2015-07-07 | 2 | -11/+120 |
| | |||||
* | fix PromoteKeyOperationTest | Vincent Breitmoser | 2015-07-06 | 1 | -11/+10 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Adithya Abraham Philip | 2015-06-30 | 1 | -4/+3 |
|\ | |||||
| * | Create key wizard for blank YubiKey | Dominik Schürmann | 2015-06-29 | 1 | -4/+3 |
| | | |||||
* | | split import and export ops | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+1 |
|/ | |||||
* | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 1 | -0/+2 |
|\ | |||||
| * | Import R and BuildConfig explicitly | Thialfihar | 2015-06-26 | 1 | -0/+2 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-11 | 19 | -0/+5517 |
| |\ | |||||
* | \ | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-11 | 19 | -0/+5529 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Add missing WorkaroundBuildConfig | Dominik Schürmann | 2015-06-11 | 1 | -0/+14 |
| | | |||||
| * | Fix debug/release build separation | Dominik Schürmann | 2015-06-11 | 13 | -13/+26 |
| | | |||||
| * | Use new officially supported way for local unit tests, many dependencies ↵ | Dominik Schürmann | 2015-06-11 | 18 | -0/+5490 |
|/ | | | | upgraded for this, temporary disabled separate debug builds | ||||
* | update unit test support in build files | Vincent Breitmoser | 2014-05-27 | 2 | -69/+0 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 2 | -0/+69 |