Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into schema-tests | Leonid | 2017-06-10 | 2 | -8/+12 |
|\ | |||||
| * | Merge pull request #56 from 0xProject/cancel-tests | Fabio Berger | 2017-06-10 | 1 | -3/+8 |
| |\ | |||||
| | * | Add test for zeroEx.exchange.getCanceledTakerAmountAsync | Leonid Logvinov | 2017-06-10 | 1 | -3/+8 |
| |/ | |||||
| * | Merge pull request #53 from 0xProject/async-bug | Leonid | 2017-06-10 | 1 | -5/+4 |
| |\ | |||||
| | * | Merge branch 'master' into async-bug | Leonid | 2017-06-09 | 7 | -21/+157 |
| | |\ | | |/ | |/| | |||||
| | * | Use for of | Leonid Logvinov | 2017-06-09 | 1 | -2/+2 |
| | * | Fix the bug of not awaiting an async function | Leonid Logvinov | 2017-06-09 | 1 | -4/+3 |
* | | | Merge branch 'master' into schema-tests | Leonid | 2017-06-09 | 5 | -5/+121 |
|\| | | |||||
| * | | Merge pull request #49 from 0xProject/fillOrderUpToAsync | Leonid | 2017-06-09 | 5 | -5/+121 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into fillOrderUpToAsync | Leonid | 2017-06-09 | 3 | -16/+36 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | Address feedback | Leonid Logvinov | 2017-06-09 | 3 | -7/+4 |
| | * | | Merge branch 'master' into fillOrderUpToAsync | Leonid | 2017-06-09 | 1 | -4/+0 |
| | |\| | |||||
| | * | | Add signedOrdersScxhema | Leonid Logvinov | 2017-06-09 | 2 | -0/+9 |
| | * | | Address feedback | Leonid Logvinov | 2017-06-09 | 2 | -2/+2 |
| | * | | Add assert.hashAtMostOneUniqueValue | Leonid Logvinov | 2017-06-09 | 3 | -7/+10 |
| | * | | Merge branch 'master' into fillOrderUpToAsync | Leonid | 2017-06-09 | 8 | -90/+205 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into fillOrderUpToAsync | Leonid | 2017-06-09 | 1 | -16/+18 |
| | |\ \ \ | |||||
| | * | | | | Add tests for fillOrdersUpTo | Leonid Logvinov | 2017-06-09 | 2 | -7/+41 |
| | * | | | | Implement fillOrderUpToAsync | Leonid Logvinov | 2017-06-08 | 2 | -0/+73 |
* | | | | | | Fix tests | Leonid Logvinov | 2017-06-09 | 1 | -1/+1 |
* | | | | | | Add tests for fillOrderRequests schema | Leonid Logvinov | 2017-06-09 | 1 | -0/+26 |
* | | | | | | Add tests for orderCancellationRequestsSchema | Leonid Logvinov | 2017-06-09 | 1 | -0/+26 |
* | | | | | | Merge branch 'master' into schema-tests | Leonid | 2017-06-09 | 3 | -16/+36 |
|\| | | | | | |||||
| * | | | | | Merge pull request #50 from 0xProject/schemas | Leonid | 2017-06-09 | 3 | -16/+36 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Fix the other schema bug | Leonid Logvinov | 2017-06-09 | 1 | -2/+2 |
| | * | | | | Merge branch 'master' into schemas | Leonid | 2017-06-09 | 1 | -4/+0 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Fix schema error | Leonid Logvinov | 2017-06-09 | 1 | -2/+2 |
| | * | | | | Add orderCancelrequestsSchema and orderFillRequestsSchema | Leonid Logvinov | 2017-06-09 | 3 | -16/+36 |
| | | |_|/ | | |/| | | |||||
* | | | | | Fix tests | Leonid Logvinov | 2017-06-09 | 1 | -2/+9 |
* | | | | | Fix tests and add fillOrKillRequests schema | Leonid Logvinov | 2017-06-09 | 1 | -11/+37 |
* | | | | | Refactor tests | Leonid Logvinov | 2017-06-09 | 1 | -53/+47 |
* | | | | | Add tests for signedOrderSchema | Leonid Logvinov | 2017-06-09 | 1 | -0/+35 |
* | | | | | Add tests for order schema | Leonid Logvinov | 2017-06-09 | 1 | -0/+36 |
* | | | | | Tolerate more than one validation error in tests | Leonid Logvinov | 2017-06-09 | 1 | -1/+5 |
* | | | | | Rename to validateAgainstSchema | Leonid Logvinov | 2017-06-09 | 1 | -11/+11 |
* | | | | | Add tests for TokenSchema | Leonid Logvinov | 2017-06-09 | 3 | -6/+44 |
* | | | | | Add ecSignatureSchema tests | Leonid Logvinov | 2017-06-09 | 2 | -37/+59 |
* | | | | | Add ecSignatureParameter test | Leonid Logvinov | 2017-06-09 | 1 | -0/+20 |
* | | | | | Add tests for address schema | Leonid Logvinov | 2017-06-09 | 1 | -7/+21 |
|/ / / / | |||||
* | | | | Merge pull request #51 from 0xProject/sender-account-assert | Leonid | 2017-06-09 | 1 | -4/+0 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Remove isSenderAddressAvailableAsync | Leonid Logvinov | 2017-06-09 | 1 | -4/+0 |
|/ / / | |||||
* | | | Merge pull request #44 from 0xProject/batchFillOrKill | Leonid | 2017-06-09 | 8 | -90/+205 |
|\ \ \ | |_|/ |/| | | |||||
| * | | fix indentation | Fabio Berger | 2017-06-09 | 1 | -13/+13 |
| * | | add comment explaining the use of any | Fabio Berger | 2017-06-09 | 1 | -0/+1 |
| * | | Improve comment | Fabio Berger | 2017-06-09 | 1 | -1/+1 |
| * | | Add orderFillOrKillRequestsSchema and validate using it instead of looping ov... | Fabio Berger | 2017-06-09 | 6 | -19/+34 |
| * | | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-09 | 9 | -354/+371 |
| |\ \ | |/ / |/| | | |||||
* | | | Fix isValidSignature tests | Fabio Berger | 2017-06-09 | 1 | -16/+18 |
| |/ |/| | |||||
* | | Merge pull request #48 from 0xProject/interfaceTweaks | Leonid | 2017-06-08 | 3 | -11/+11 |
|\ \ | |||||
| * \ | Merge branch 'master' into interfaceTweaks | Leonid | 2017-06-08 | 2 | -0/+28 |
| |\ \ | |||||
| * | | | Make web3Wrapper protected instead of public | Fabio Berger | 2017-06-08 | 2 | -3/+3 |
| * | | | Fix comments | Fabio Berger | 2017-06-08 | 1 | -2/+2 |
| * | | | rename decimals to numDecimals for clarity | Fabio Berger | 2017-06-08 | 1 | -6/+6 |
* | | | | Merge pull request #47 from 0xProject/is-valid-signature-contract | Leonid | 2017-06-08 | 5 | -129/+33 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into is-valid-signature-contract | Leonid | 2017-06-08 | 2 | -0/+28 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Remove unused import | Leonid Logvinov | 2017-06-08 | 1 | -1/+0 |
| * | | | | Fix linter error | Leonid Logvinov | 2017-06-08 | 1 | -3/+3 |
| * | | | | Rewrite isValidSignature tests | Leonid Logvinov | 2017-06-08 | 3 | -57/+31 |
| * | | | | Remove tests for isValidSignatureUsingContractCallAsync | Leonid Logvinov | 2017-06-08 | 1 | -78/+0 |
| * | | | | Move isValidSignature back from utils | Leonid Logvinov | 2017-06-08 | 2 | -16/+13 |
| * | | | | Refactor isValidSignature | Leonid Logvinov | 2017-06-08 | 4 | -28/+40 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #45 from 0xProject/batchFillAsync | Leonid | 2017-06-08 | 4 | -193/+304 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Don't pass expressions as parameters | Leonid Logvinov | 2017-06-08 | 1 | -2/+4 |
| * | | | Don't pass expressions as parameters | Leonid Logvinov | 2017-06-08 | 1 | -2/+4 |
| * | | | Merge branch 'master' into batchFillAsync | Leonid | 2017-06-08 | 2 | -0/+28 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-08 | 3 | -16/+29 |
| * | | | Fix names in types | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 |
| * | | | Use isSenderAddressAsync | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 |
| * | | | Address old feedback | Leonid Logvinov | 2017-06-08 | 2 | -8/+3 |
| * | | | Fix spacing | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 |
| * | | | Merge branch 'master' into batchFillAsync | Leonid Logvinov | 2017-06-08 | 5 | -37/+198 |
| |\| | | |||||
| * | | | Don't use batchFillOrderAsync for fillOrderAsync | Leonid Logvinov | 2017-06-08 | 1 | -3/+37 |
| * | | | Add no-op test | Leonid Logvinov | 2017-06-08 | 2 | -4/+6 |
| * | | | Add success test | Leonid Logvinov | 2017-06-08 | 2 | -5/+33 |
| * | | | Remove old comment | Leonid Logvinov | 2017-06-08 | 1 | -1/+0 |
| * | | | Refactor to use OrderFillRequest | Leonid Logvinov | 2017-06-07 | 1 | -22/+26 |
| * | | | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 2 | -27/+8 |
| |\ \ \ | |||||
| * | | | | Remove only | Leonid Logvinov | 2017-06-07 | 1 | -1/+1 |
| * | | | | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 3 | -29/+46 |
| |\ \ \ \ | |||||
| * | | | | | Move fillableAmount to initialization section | Leonid Logvinov | 2017-06-07 | 1 | -8/+17 |
| * | | | | | Move initialization up | Leonid Logvinov | 2017-06-07 | 1 | -15/+15 |
| * | | | | | Move fillOrderAsync to fill order describe block | Leonid Logvinov | 2017-06-07 | 1 | -179/+185 |
| * | | | | | Add assertion for empty batch | Leonid Logvinov | 2017-06-07 | 1 | -0/+1 |
| * | | | | | Fix linter errors | Leonid Logvinov | 2017-06-07 | 1 | -1/+2 |
| * | | | | | Add tests for batchCancelAsync | Leonid Logvinov | 2017-06-07 | 3 | -26/+68 |
| * | | | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 2 | -0/+51 |
| * | | | | | Add comments for dates | Leonid Logvinov | 2017-06-07 | 1 | -2/+2 |
| * | | | | | Remove assertions from utils methods | Leonid Logvinov | 2017-06-07 | 3 | -11/+5 |
| * | | | | | Use ContractInstance from globals | Leonid Logvinov | 2017-06-07 | 2 | -4/+3 |
| * | | | | | Update 0x.js.ts | Leonid | 2017-06-07 | 1 | -2/+1 |
| * | | | | | Add initial implementation of batchCancelAsync | Leonid Logvinov | 2017-06-07 | 3 | -21/+55 |
| | | | | * | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-08 | 2 | -0/+28 |
| | | | | |\ | |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #46 from 0xProject/order-hash-contract | Fabio Berger | 2017-06-08 | 2 | -0/+28 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Add getOrderHashHexUsingContractCallAsync | Leonid Logvinov | 2017-06-08 | 2 | -0/+28 |
|/ / / / / | |||||
| | | | * | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-08 | 3 | -25/+140 |
| | | | |\ | |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #43 from 0xProject/batchCancelAsync | Leonid | 2017-06-08 | 3 | -25/+140 |
|\ \ \ \ \ | |||||
| * | | | | | Address feedback | Leonid Logvinov | 2017-06-08 | 1 | -6/+9 |
| * | | | | | Format inputs | Leonid Logvinov | 2017-06-08 | 1 | -1/+2 |
| * | | | | | Address feedback | Leonid Logvinov | 2017-06-08 | 1 | -5/+6 |
| * | | | | | Don't use batch function for normal one | Leonid Logvinov | 2017-06-08 | 1 | -3/+27 |
| * | | | | | Merge branch 'master' into batchCancelAsync | Leonid | 2017-06-08 | 5 | -14/+169 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #42 from 0xProject/addExchangeMethods | Leonid | 2017-06-08 | 5 | -15/+171 |
|\ \ \ \ \ \ | |||||
| | * | | | | | Fix linter error | Leonid Logvinov | 2017-06-07 | 1 | -1/+1 |
| | * | | | | | Address feedback | Leonid Logvinov | 2017-06-07 | 3 | -16/+16 |
| | | |_|/ / | | |/| | | | |||||
| | * | | | | Use batchCancel for normal cancel | Leonid Logvinov | 2017-06-07 | 1 | -28/+5 |
| | | |/ / | | |/| | | |||||
| | * | | | Refactor to use OrderCancellationRequest | Leonid Logvinov | 2017-06-07 | 4 | -34/+45 |
| | * | | | Add tests for batchCancelAsync | Leonid Logvinov | 2017-06-07 | 3 | -26/+68 |
| | * | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 3 | -0/+57 |
| |/ / / |/| | | | |||||
| | | * | Implement batchFillOrKill and tests | Fabio Berger | 2017-06-08 | 3 | -58/+157 |
| | |/ | |/| | |||||
| * | | make txOpts optional | Fabio Berger | 2017-06-07 | 1 | -2/+2 |
| * | | Remove catch of invalid jump throws since there are many reasons the contract... | Fabio Berger | 2017-06-07 | 2 | -25/+14 |
| * | | add `hex` to function and variable name for clarity | Fabio Berger | 2017-06-07 | 3 | -7/+7 |
| * | | Spacing fix | Fabio Berger | 2017-06-07 | 1 | -2/+1 |
| * | | Fix tests with removed shouldCheckTransfer | Fabio Berger | 2017-06-07 | 1 | -6/+3 |
| * | | remove unused arg | Fabio Berger | 2017-06-07 | 1 | -2/+1 |
| * | | remove space | Fabio Berger | 2017-06-07 | 1 | -1/+0 |
| * | | merge master | Fabio Berger | 2017-06-07 | 6 | -49/+160 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #40 from 0xProject/cancelAsync | Leonid | 2017-06-07 | 7 | -60/+185 |
|\ \ \ | |||||
| * | | | Add comments for dates | Leonid Logvinov | 2017-06-07 | 1 | -2/+2 |
| * | | | Remove assertions from utils methods | Leonid Logvinov | 2017-06-07 | 3 | -11/+5 |
| * | | | Use ContractInstance from globals | Leonid Logvinov | 2017-06-07 | 2 | -4/+3 |
| * | | | Update 0x.js.ts | Leonid | 2017-06-07 | 1 | -2/+1 |
| | |/ | |/| | |||||
| * | | Use union type Order|SignedOrder | Leonid Logvinov | 2017-06-07 | 2 | -4/+4 |
| * | | Make txOpts optional | Leonid Logvinov | 2017-06-07 | 1 | -7/+7 |
| * | | Address feedback | Leonid Logvinov | 2017-06-07 | 5 | -47/+60 |
| * | | Fix tests | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| * | | Add missing semicolon | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| * | | Remove only | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| * | | Add test when the order was already cancelled or filled | Leonid Logvinov | 2017-06-06 | 3 | -31/+44 |
| * | | Add checks and tests for expired order and zero fill amount | Leonid Logvinov | 2017-06-06 | 3 | -2/+26 |
| * | | Merge branch 'master' into cancelAsync | Leonid Logvinov | 2017-06-06 | 3 | -5/+8 |
| |\ \ | |/ / |/| | | |||||
| * | | Fix tests | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| * | | Add initial implementation with success test | Leonid Logvinov | 2017-06-06 | 4 | -5/+88 |
| | * | Implement fillOrKill & tests | Fabio Berger | 2017-06-07 | 7 | -46/+233 |
| |/ |/| | |||||
* | | Merge pull request #41 from 0xProject/testFixes | Leonid | 2017-06-06 | 3 | -5/+8 |
|\ \ | |/ |/| | |||||
| * | Pass nonExistentSenderAddress so that we get the proper rejection | Fabio Berger | 2017-06-06 | 1 | -1/+2 |
| * | avoid newline issues by putting the assertion message on a single line | Fabio Berger | 2017-06-06 | 2 | -4/+6 |
|/ | |||||
* | Update schema_test.ts | Leonid | 2017-06-06 | 1 | -1/+1 |
* | Merge pull request #39 from 0xProject/senderAccount | Leonid | 2017-06-06 | 11 | -123/+104 |
|\ | |||||
| * | Address feedback | Leonid Logvinov | 2017-06-06 | 3 | -5/+5 |
| * | Add isAnyAddressAvailableAsync | Leonid Logvinov | 2017-06-06 | 4 | -6/+7 |
| * | Rename isSenderAddressHexAsync to isSenderAddressAsync | Leonid Logvinov | 2017-06-06 | 5 | -16/+16 |
| * | Rename senderAddress to signerAddress | Leonid Logvinov | 2017-06-06 | 1 | -4/+4 |
| * | Last round of renamings | Leonid Logvinov | 2017-06-06 | 2 | -13/+13 |
| * | Use variable name in assertin message | Leonid Logvinov | 2017-06-06 | 2 | -4/+5 |
| * | Remove unused variable | Leonid Logvinov | 2017-06-06 | 1 | -1/+0 |
| * | Rename accounts to addreses | Leonid Logvinov | 2017-06-06 | 6 | -13/+13 |
| * | Remove message param from before | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| * | Rename senderAccount to senderAddress | Leonid Logvinov | 2017-06-06 | 4 | -23/+23 |
| * | Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsync | Leonid Logvinov | 2017-06-06 | 5 | -9/+9 |
| * | Rename senderAccount to takerAddress | Leonid Logvinov | 2017-06-06 | 1 | -5/+5 |
| * | Remove redundant reassignment | Leonid Logvinov | 2017-06-06 | 1 | -3/+2 |
| * | Fix comments | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| * | Add tests for isSenderAccountHexAsync | Leonid Logvinov | 2017-06-06 | 1 | -0/+33 |
| * | Fix tests | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| * | Add variableName to isSenderAddcountHexAsync | Leonid Logvinov | 2017-06-06 | 3 | -7/+8 |
| * | Make methods accept senderAccount | Leonid Logvinov | 2017-06-05 | 10 | -125/+72 |
* | | Merge pull request #35 from 0xProject/chai-setup | Leonid | 2017-06-06 | 5 | -18/+22 |
|\ \ | |||||
| * | | Update chai_setup.ts | Leonid | 2017-06-06 | 1 | -1/+1 |
| * | | Merge branch 'master' into chai-setup | Leonid | 2017-06-06 | 2 | -4/+16 |
| |\ \ | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-06 | 5 | -12/+12 |
| * | | | Add chai_setup | Leonid Logvinov | 2017-06-05 | 5 | -17/+22 |
| | |/ | |/| | |||||
* | | | Merge pull request #37 from 0xProject/umd-ci | Leonid | 2017-06-06 | 2 | -1/+8 |
|\ \ \ | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| * | | | Add script to run UMD tests | Leonid Logvinov | 2017-06-05 | 2 | -1/+8 |
| |/ / | |||||
* | | | Merge pull request #34 from 0xProject/number-regex | Leonid | 2017-06-06 | 2 | -1/+47 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Address feedback | Leonid Logvinov | 2017-06-06 | 1 | -18/+23 |
| * | | Add tests to number regex and BigNumber serialization & fix bugs | Leonid Logvinov | 2017-06-05 | 2 | -1/+42 |
| |/ | |||||
* | | Merge pull request #38 from 0xProject/async-errors | Leonid | 2017-06-06 | 1 | -4/+6 |
|\ \ | |||||
| * | | Add chai-as-promised | Leonid Logvinov | 2017-06-05 | 1 | -0/+2 |
| * | | Add a couple of awaits and returns for async tests | Leonid Logvinov | 2017-06-05 | 1 | -4/+4 |
| |/ | |||||
* | | Merge pull request #36 from 0xProject/regression-test-transferFrom | Leonid | 2017-06-06 | 1 | -0/+11 |
|\ \ | |/ |/| | |||||
| * | Address feedback | Leonid Logvinov | 2017-06-06 | 1 | -1/+2 |
| * | Add regression test for transferFrom bug | Leonid Logvinov | 2017-06-05 | 1 | -0/+10 |
|/ | |||||
* | Upgrade truffle-contract to the version that includes 'at' fix | Leonid Logvinov | 2017-06-05 | 2 | -70/+183 |
* | Merge pull request #33 from 0xProject/greenkeeper/initial | Leonid | 2017-06-03 | 2 | -2/+4 |
|\ | |||||
| * | docs(readme): add Greenkeeper badge | greenkeeper[bot] | 2017-06-03 | 1 | -0/+2 |
| * | chore(package): update dependencies | greenkeeper[bot] | 2017-06-03 | 1 | -2/+2 |
* | | Merge pull request #32 from 0xProject/addEventSubscriptions | Fabio Berger | 2017-06-03 | 12 | -573/+218 |
|\ \ | |||||
| * | | Consolidate the ExchangeContract type and flesh out type definition for isVal... | Fabio Berger | 2017-06-03 | 1 | -20/+19 |
| * | | Run stopWatching in parallel | Fabio Berger | 2017-06-03 | 1 | -3/+4 |
| * | | Be more specific with blockParam valid values | Fabio Berger | 2017-06-03 | 1 | -2/+4 |
| * | | remove space | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| * | | Update artifacts | Fabio Berger | 2017-06-03 | 6 | -566/+35 |
| * | | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 4 | -10/+10 |
| |\| | |||||
| * | | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 4 | -0/+4 |
| |\ \ | |||||
| * | | | Revert unintentional artifact changes | Fabio Berger | 2017-06-03 | 6 | -35/+566 |
| * | | | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 8 | -150/+378 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 2 | -4/+39 |
| |\ \ \ \ | |||||
| * | | | | | Add tests for subscribeAsync, making sure events are caught and that subscrip... | Fabio Berger | 2017-06-02 | 1 | -1/+83 |
| * | | | | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ... | Fabio Berger | 2017-06-02 | 5 | -6/+94 |
| * | | | | | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 5 | -33/+90 |
| |\ \ \ \ \ | |||||
| * | | | | | | Update artifacts | Fabio Berger | 2017-06-02 | 6 | -561/+30 |
* | | | | | | | Merge pull request #29 from 0xProject/remainingTokenMethods | Leonid | 2017-06-03 | 6 | -48/+240 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 10 | -18/+171 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #31 from 0xProject/unavailableFilledCancelled | Leonid | 2017-06-03 | 8 | -17/+166 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-03 | 8 | -155/+375 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 5 | -36/+128 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Simplify tests | Fabio Berger | 2017-06-02 | 1 | -16/+11 |
| * | | | | | | improve comment | Fabio Berger | 2017-06-02 | 1 | -1/+4 |
| * | | | | | | Add comment about the isString assertion lest the next developer tries to use... | Fabio Berger | 2017-06-02 | 1 | -0/+2 |
| * | | | | | | Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and... | Fabio Berger | 2017-06-02 | 3 | -11/+106 |
| * | | | | | | Always wrap BigNumbers returned by web3 with our own version and add comment | Fabio Berger | 2017-06-02 | 2 | -5/+11 |
| * | | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 5 | -44/+82 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | fix tslint error | Fabio Berger | 2017-06-02 | 1 | -1/+2 |
| * | | | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 4 | -12/+39 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -10/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 18 | -285/+984 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-01 | 5 | -43/+274 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCa... | Fabio Berger | 2017-06-01 | 2 | -0/+42 |
| * | | | | | | | | | | | Move isValidOrderHash to utils and implement assert.isValidOrderHash | Fabio Berger | 2017-06-01 | 3 | -4/+12 |
* | | | | | | | | | | | | Use forked version of chai-bignumber while the PR is waiting for a review | Leonid Logvinov | 2017-06-03 | 2 | -1/+5 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| | | | | | | | | * | | Fix bug | Fabio Berger | 2017-06-03 | 2 | -8/+6 |
| | | | | | | | | * | | Fix comment | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| | | | | | | | | * | | Add missing async suffix | Fabio Berger | 2017-06-03 | 2 | -2/+2 |
| | | | | | | | | * | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 22 | -293/+1366 |
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Add includeStack config to chai setup so that we get stackTraces | Fabio Berger | 2017-06-03 | 4 | -0/+4 |
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #30 from 0xProject/fillOrderAsync | Leonid | 2017-06-03 | 20 | -291/+1360 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix undefined web3 issue | Fabio Berger | 2017-06-03 | 1 | -2/+2 |
| * | | | | | | | | | | Fix linter errors | Leonid Logvinov | 2017-06-03 | 1 | -4/+12 |
| * | | | | | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 2 | -3/+5 |
| * | | | | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-03 | 5 | -95/+100 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 1 | -8/+8 |
| | * | | | | | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 2 | -10/+10 |
| | * | | | | | | | | | | Fix test name | Leonid Logvinov | 2017-06-03 | 1 | -1/+1 |
| | * | | | | | | | | | | Add ZRX_TOKEN_NOT_IN_REGISTRY | Leonid Logvinov | 2017-06-03 | 2 | -6/+7 |
| | * | | | | | | | | | | Remove spaces | Leonid Logvinov | 2017-06-03 | 1 | -3/+1 |
| | * | | | | | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 3 | -28/+28 |
| | * | | | | | | | | | | Allign arguments | Leonid Logvinov | 2017-06-03 | 1 | -3/+3 |
| | * | | | | | | | | | | Rewrite comment | Leonid Logvinov | 2017-06-03 | 1 | -5/+11 |
| | * | | | | | | | | | | Move FillOrderValidatinErrs to ExchangeContractErrs | Leonid Logvinov | 2017-06-03 | 3 | -35/+28 |
| | * | | | | | | | | | | Assign wouldRoundingErrorOccur to a variable | Leonid Logvinov | 2017-06-02 | 1 | -2/+4 |
| | * | | | | | | | | | | Rename EXPIRED to FILL_ORDER_EXPIRED | Leonid Logvinov | 2017-06-02 | 3 | -3/+3 |
| | * | | | | | | | | | | Assign timestamp to a variable | Leonid Logvinov | 2017-06-02 | 1 | -1/+2 |
| | * | | | | | | | | | | Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER | Leonid Logvinov | 2017-06-02 | 3 | -3/+3 |
| | * | | | | | | | | | | Don't pass zrxTokenAsign | Leonid Logvinov | 2017-06-02 | 1 | -6/+7 |
| | * | | | | | | | | | | Rename validation functions | Leonid Logvinov | 2017-06-02 | 1 | -8/+8 |
| | * | | | | | | | | | | Add getZRXTokenAddressAsync | Leonid Logvinov | 2017-06-02 | 1 | -1/+4 |
| * | | | | | | | | | | | Fix ordering | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| * | | | | | | | | | | | Fix comment | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | rename fillTakerAmountInBaseUnits to fillTakerAmount | Fabio Berger | 2017-06-02 | 3 | -37/+37 |
| * | | | | | | | | | | Improve fillOrderAsync comment | Fabio Berger | 2017-06-02 | 1 | -3/+6 |
| * | | | | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-02 | 1 | -321/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Remove protocol token artifacts | Leonid Logvinov | 2017-06-02 | 1 | -321/+0 |
| * | | | | | | | | | | | Improve error names and remove duplicate import | Fabio Berger | 2017-06-02 | 2 | -8/+8 |
| * | | | | | | | | | | | Improve comment | Fabio Berger | 2017-06-02 | 1 | -2/+1 |
| * | | | | | | | | | | | remove ProtocolToken | Fabio Berger | 2017-06-02 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-02 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Rename coinBase to coinbase | Leonid Logvinov | 2017-06-02 | 2 | -12/+12 |
| * | | | | | | | | | | Refactor balance & allowance tests | Leonid Logvinov | 2017-06-02 | 1 | -47/+42 |