Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 9 | -76/+296 | |
| |\ | |/ |/| | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | |||||
* | | Merge pull request #710 from mar-v-in/patch-1 | Vincent | 2014-07-09 | 1 | -8/+8 | |
|\ \ | | | | | | | Fix OperationResultParcel | |||||
| * | | Fix OperationResultParcel | mar-v-in | 2014-07-09 | 1 | -8/+8 | |
|/ / | | | | | Naming conventions save lives... or atleast make addAll() work | |||||
* | | Fix nullpointer in API, fix #693 | Dominik Schürmann | 2014-07-08 | 1 | -1/+7 | |
| | | ||||||
* | | cleanup | Dominik Schürmann | 2014-07-08 | 1 | -30/+0 | |
| | | ||||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-08 | 2 | -6/+27 | |
|\ \ | ||||||
* | | | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 8 | -66/+310 | |
| | | | ||||||
| | * | test: make testing optional in build | Vincent Breitmoser | 2014-07-11 | 2 | -3/+3 | |
| | | | ||||||
| | * | tests: set maxParallelForks = 1, maybe this fixes travis non-deterministic build | Vincent Breitmoser | 2014-07-11 | 1 | -0/+6 | |
| | | | ||||||
| | * | travis: try running tests separately with info output | Vincent Breitmoser | 2014-07-11 | 1 | -1/+3 | |
| | | | ||||||
| | * | travis: get rid of lint | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 | |
| | | | ||||||
| | * | tests: stronger subkey revocation test including re-certification | Vincent Breitmoser | 2014-07-11 | 1 | -16/+69 | |
| | | | ||||||
| | * | modifyKey: proper expiry check during SubkeyAdd | Vincent Breitmoser | 2014-07-11 | 1 | -2/+2 | |
| | | | ||||||
| | * | test: stronger SubkeyCreate tests | Vincent Breitmoser | 2014-07-11 | 1 | -3/+39 | |
| | | | ||||||
| | * | modifyKey: make SubkeyChange operations work | Vincent Breitmoser | 2014-07-11 | 4 | -27/+64 | |
| | | | ||||||
| | * | test: add SubkeyChange tests | Vincent Breitmoser | 2014-07-11 | 1 | -3/+94 | |
| | | | ||||||
| | * | test: onlyX vars are lists now, use them as such | Vincent Breitmoser | 2014-07-11 | 1 | -12/+8 | |
| | | | ||||||
| | * | (whoops) | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 | |
| | | | ||||||
| | * | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 9 | -86/+83 | |
| | | | ||||||
| | * | test: get rid of some SaveKeyringParcel boilerplate | Vincent Breitmoser | 2014-07-11 | 2 | -33/+21 | |
| | | | ||||||
| | * | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 4 | -11/+7 | |
| | | | ||||||
| | * | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 3 | -0/+12 | |
| | | | ||||||
| | * | test: add more user id tests | Vincent Breitmoser | 2014-07-11 | 1 | -2/+85 | |
| | | | ||||||
| | * | test: put more stuff in helper method for neater tests | Vincent Breitmoser | 2014-07-11 | 2 | -36/+36 | |
| | | | ||||||
| | * | fix bug in canonicalization regarding subkey revocation | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 | |
| | | | ||||||
| | * | test: test subkey revocation | Vincent Breitmoser | 2014-07-11 | 1 | -0/+35 | |
| | | | ||||||
| | * | modifyKey: couple more fixes from tests | Vincent Breitmoser | 2014-07-11 | 2 | -4/+34 | |
| | | | ||||||
| | * | some UncachedKeyRing fixes, primary user id mostly | Vincent Breitmoser | 2014-07-11 | 3 | -18/+67 | |
| | | | ||||||
| | * | modifyKey: preserve master key flags | Vincent Breitmoser | 2014-07-11 | 1 | -5/+22 | |
| | | | ||||||
| | * | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 3 | -3/+19 | |
| | | | ||||||
| | * | test: implement a ton of PgpKeyOperation tests | Vincent Breitmoser | 2014-07-11 | 1 | -27/+191 | |
| | | | ||||||
| | * | test: fix RawPacket comparator | Vincent Breitmoser | 2014-07-11 | 1 | -7/+14 | |
| | | | ||||||
| | * | test: finish testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 2 | -23/+43 | |
| | | | ||||||
| | * | Revert "test: add --info to travis thing, for testing" | Vincent Breitmoser | 2014-07-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | This reverts commit 7532baa6c7614d526d508f37c323e24edd788771. | |||||
| | * | test: add --info to travis thing, for testing | Vincent Breitmoser | 2014-07-10 | 1 | -1/+1 | |
| | | | ||||||
| | * | test: enable travis, disable dysfunctional tests to make it work | Vincent Breitmoser | 2014-07-10 | 2 | -4/+4 | |
| | | | ||||||
| | * | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 4 | -17/+69 | |
| | | | ||||||
| | * | test: move uncachedkeyring test setup into BeforeClass method | Vincent Breitmoser | 2014-07-09 | 1 | -20/+25 | |
| | | | ||||||
| | * | use openjdk7 in travis | Vincent Breitmoser | 2014-07-09 | 1 | -1/+1 | |
| | | | ||||||
| | * | tests: fix createkey test | Vincent Breitmoser | 2014-07-09 | 1 | -6/+5 | |
| | | | ||||||
| | * | Merge remote-tracking branch ↵ | Vincent Breitmoser | 2014-07-09 | 14 | -220/+426 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | 'artbristol/functional-testing-canonicalize-badsignature' into external-test Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell | |||||
| | | * | actually provide a tostring | Art O Cathain | 2014-07-07 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | prevent odd ambiguous method toString error | Art O Cathain | 2014-07-07 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | (c) headers, tidy imports | Art O Cathain | 2014-07-07 | 9 | -7/+151 | |
| | | | | ||||||
| | | * | use KeyringTestHelper.diffKeyrings method for unit test | Vincent Breitmoser | 2014-07-07 | 2 | -1/+19 | |
| | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/test/java/tests/UncachedKeyringTest.java | |||||
| | | * | add diffKeyrings method | Vincent Breitmoser | 2014-07-07 | 1 | -0/+133 | |
| | | | | ||||||
| | | * | Actually test canonicalize | Art O Cathain | 2014-07-06 | 3 | -87/+181 | |
| | | | | ||||||
| | | * | add the GPG version | Art O Cathain | 2014-07-06 | 2 | -1/+10 | |
| | | | | ||||||
| | | * | data fixes | Art O Cathain | 2014-07-06 | 2 | -13/+18 | |
| | | | | ||||||
| | | * | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 | |
| | | | |