aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #60 from 0xProject/error-decoratorFabio Berger2017-06-115-0/+50
|\
| * Merge branch 'master' into error-decoratorLeonid2017-06-106-25/+175
| |\
| * | Add initial error handling decorator implementationLeonid Logvinov2017-06-105-0/+50
* | | Merge pull request #61 from 0xProject/names-hexFabio Berger2017-06-112-36/+36
|\ \ \
| * | | Remove Hex suffix from public functions parameters namesLeonid Logvinov2017-06-102-36/+36
| | |/ | |/|
* / | Create README.mdLeonid2017-06-101-2/+1
|/ /
* | Merge pull request #58 from 0xProject/remove-console-trashLeonid2017-06-102-1/+36
|\ \
| * \ Merge branch 'master' into remove-console-trashLeonid2017-06-104-24/+139
| |\ \ | |/ / |/| |
* | | Merge pull request #59 from 0xProject/addParamReturnCommentsLeonid2017-06-104-24/+139
|\ \ \ | |_|/ |/| |
| * | Align all param comments so that they are more readableFabio Berger2017-06-104-87/+99
| * | Merge branch 'master' into addParamReturnCommentsFabio Berger2017-06-101-0/+16
| |\ \ | |/ / |/| |
| * | Add param & return comments to all public methods and add comments to some pu...Fabio Berger2017-06-104-24/+127
| | * Merge branch 'master' into remove-console-trashLeonid2017-06-101-0/+16
| | |\ | |_|/ |/| |
* | | Merge pull request #55 from 0xProject/subscribe-async-testsLeonid2017-06-101-0/+16
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into subscribe-async-testsLeonid2017-06-104-45/+24
| |\ \ | |/ / |/| |
| * | Merge branch 'master' into subscribe-async-testsLeonid2017-06-107-18/+276
| |\ \
| * \ \ Merge branch 'master' into subscribe-async-testsLeonid2017-06-102-4/+3
| |\ \ \
| * \ \ \ Merge branch 'master' into subscribe-async-testsLeonid2017-06-101-3/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into subscribe-async-testsLeonid2017-06-101-5/+4
| |\ \ \ \ \
| * | | | | | Fix testsLeonid Logvinov2017-06-101-4/+4
| * | | | | | Remove onlyLeonid Logvinov2017-06-091-1/+1
| * | | | | | Add LogCancel test to subscribeAsyncLeonid Logvinov2017-06-091-2/+18
| | | | | | * Remove unneccessary console output from block trackerLeonid Logvinov2017-06-102-1/+36
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #52 from 0xProject/json-schemaLeonid2017-06-104-45/+24
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'master' into json-schemaLeonid2017-06-107-18/+276
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #54 from 0xProject/schema-testsLeonid2017-06-107-18/+276
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'master' into schema-testsLeonid2017-06-102-4/+3
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Address feedbackLeonid Logvinov2017-06-101-10/+20
| * | | | | Fix bugs in schemasLeonid Logvinov2017-06-104-6/+6
| * | | | | Merge branch 'master' into schema-testsLeonid2017-06-102-8/+12
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into schema-testsLeonid2017-06-095-5/+121
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Fix testsLeonid Logvinov2017-06-091-1/+1
| * | | | | Add tests for fillOrderRequests schemaLeonid Logvinov2017-06-091-0/+26
| * | | | | Add tests for orderCancellationRequestsSchemaLeonid Logvinov2017-06-091-0/+26
| * | | | | Merge branch 'master' into schema-testsLeonid2017-06-093-16/+36
| |\ \ \ \ \
| * | | | | | Fix testsLeonid Logvinov2017-06-091-2/+9
| * | | | | | Fix tests and add fillOrKillRequests schemaLeonid Logvinov2017-06-091-11/+37
| * | | | | | Refactor testsLeonid Logvinov2017-06-091-53/+47
| * | | | | | Add tests for signedOrderSchemaLeonid Logvinov2017-06-091-0/+35
| * | | | | | Add tests for order schemaLeonid Logvinov2017-06-091-0/+36
| * | | | | | Tolerate more than one validation error in testsLeonid Logvinov2017-06-091-1/+5
| * | | | | | Rename to validateAgainstSchemaLeonid Logvinov2017-06-091-11/+11
| * | | | | | Add tests for TokenSchemaLeonid Logvinov2017-06-093-6/+44
| * | | | | | Add ecSignatureSchema testsLeonid Logvinov2017-06-092-37/+59
| * | | | | | Add ecSignatureParameter testLeonid Logvinov2017-06-091-0/+20
| * | | | | | Add tests for address schemaLeonid Logvinov2017-06-091-7/+21
| | | | | * | Merge branch 'master' into json-schemaLeonid2017-06-102-4/+3
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #57 from 0xProject/moveConstantLeonid2017-06-102-4/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'master' into moveConstantLeonid2017-06-101-3/+8
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Move MAX_DIGITS_IN_UNSIGNED_256_INT to constantsFabio Berger2017-06-102-4/+3
| | |_|_|_|/ | |/| | | |
| | | | | * Merge branch 'master' into json-schemaLeonid2017-06-101-3/+8
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #56 from 0xProject/cancel-testsFabio Berger2017-06-101-3/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add test for zeroEx.exchange.getCanceledTakerAmountAsyncLeonid Logvinov2017-06-101-3/+8
|/ / / / /
| | | | * Fix testsLeonid Logvinov2017-06-102-4/+2
| | | | * Address feedbackLeonid Logvinov2017-06-102-9/+6
| | | | * Fix testLeonid Logvinov2017-06-101-8/+5
| | | | * Merge branch 'master' into json-schemaLeonid2017-06-101-5/+4
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #53 from 0xProject/async-bugLeonid2017-06-101-5/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'master' into async-bugLeonid2017-06-097-21/+157
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Use for ofLeonid Logvinov2017-06-091-2/+2
| * | | | Fix the bug of not awaiting an async functionLeonid Logvinov2017-06-091-4/+3
| |/ / /
| | | * Merge branch 'master' into json-schemaLeonid2017-06-095-5/+121
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #49 from 0xProject/fillOrderUpToAsyncLeonid2017-06-095-5/+121
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-093-16/+36
| |\ \ \ | |/ / / |/| | |
| * | | Address feedbackLeonid Logvinov2017-06-093-7/+4
| * | | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-091-4/+0
| |\| |
| * | | Add signedOrdersScxhemaLeonid Logvinov2017-06-092-0/+9
| * | | Address feedbackLeonid Logvinov2017-06-092-2/+2
| * | | Add assert.hashAtMostOneUniqueValueLeonid Logvinov2017-06-093-7/+10
| * | | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-098-90/+205
| |\ \ \
| * \ \ \ Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-091-16/+18
| |\ \ \ \
| * | | | | Add tests for fillOrdersUpToLeonid Logvinov2017-06-092-7/+41
| * | | | | Implement fillOrderUpToAsyncLeonid Logvinov2017-06-082-0/+73
| | | | | * Fix tests one moreLeonid Logvinov2017-06-091-1/+1
| | | | | * Fix testsLeonid Logvinov2017-06-091-1/+1
| | | | | * Merge branch 'master' into json-schemaLeonid2017-06-093-12/+31
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #50 from 0xProject/schemasLeonid2017-06-093-16/+36
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix the other schema bugLeonid Logvinov2017-06-091-2/+2
| * | | | | Merge branch 'master' into schemasLeonid2017-06-091-4/+0
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix schema errorLeonid Logvinov2017-06-091-2/+2
| * | | | | Add orderCancelrequestsSchema and orderFillRequestsSchemaLeonid Logvinov2017-06-093-16/+36
| | |_|/ / | |/| | |
| | | | * Make static function publicLeonid Logvinov2017-06-092-2/+1
| | | | * Convert to JSON schema compatible object by defaultLeonid Logvinov2017-06-092-22/+11
| |_|_|/ |/| | |
* | | | Merge pull request #51 from 0xProject/sender-account-assertLeonid2017-06-091-4/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove isSenderAddressAvailableAsyncLeonid Logvinov2017-06-091-4/+0
|/ / /
* | | Merge pull request #44 from 0xProject/batchFillOrKillLeonid2017-06-098-90/+205
|\ \ \ | |_|/ |/| |
| * | fix indentationFabio Berger2017-06-091-13/+13
| * | add comment explaining the use of anyFabio Berger2017-06-091-0/+1
| * | Improve commentFabio Berger2017-06-091-1/+1
| * | Add orderFillOrKillRequestsSchema and validate using it instead of looping ov...Fabio Berger2017-06-096-19/+34
| * | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-099-354/+371
| |\ \ | |/ / |/| |
* | | Fix isValidSignature testsFabio Berger2017-06-091-16/+18
| |/ |/|
* | Merge pull request #48 from 0xProject/interfaceTweaksLeonid2017-06-083-11/+11
|\ \
| * \ Merge branch 'master' into interfaceTweaksLeonid2017-06-082-0/+28
| |\ \
| * | | Make web3Wrapper protected instead of publicFabio Berger2017-06-082-3/+3
| * | | Fix commentsFabio Berger2017-06-081-2/+2
| * | | rename decimals to numDecimals for clarityFabio Berger2017-06-081-6/+6
* | | | Merge pull request #47 from 0xProject/is-valid-signature-contractLeonid2017-06-085-129/+33
|\ \ \ \
| * \ \ \ Merge branch 'master' into is-valid-signature-contractLeonid2017-06-082-0/+28
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Remove unused importLeonid Logvinov2017-06-081-1/+0
| * | | | Fix linter errorLeonid Logvinov2017-06-081-3/+3
| * | | | Rewrite isValidSignature testsLeonid Logvinov2017-06-083-57/+31
| * | | | Remove tests for isValidSignatureUsingContractCallAsyncLeonid Logvinov2017-06-081-78/+0
| * | | | Move isValidSignature back from utilsLeonid Logvinov2017-06-082-16/+13
| * | | | Refactor isValidSignatureLeonid Logvinov2017-06-084-28/+40
| | |/ / | |/| |
* | | | Merge pull request #45 from 0xProject/batchFillAsyncLeonid2017-06-084-193/+304
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't pass expressions as parametersLeonid Logvinov2017-06-081-2/+4
| * | | Don't pass expressions as parametersLeonid Logvinov2017-06-081-2/+4
| * | | Merge branch 'master' into batchFillAsyncLeonid2017-06-082-0/+28
| |\ \ \ | |/ / / |/| | |
| * | | Address feedbackLeonid Logvinov2017-06-083-16/+29
| * | | Fix names in typesLeonid Logvinov2017-06-081-2/+2
| * | | Use isSenderAddressAsyncLeonid Logvinov2017-06-081-2/+2
| * | | Address old feedbackLeonid Logvinov2017-06-082-8/+3
| * | | Fix spacingLeonid Logvinov2017-06-081-2/+2
| * | | Merge branch 'master' into batchFillAsyncLeonid Logvinov2017-06-085-37/+198
| |\| |
| * | | Don't use batchFillOrderAsync for fillOrderAsyncLeonid Logvinov2017-06-081-3/+37
| * | | Add no-op testLeonid Logvinov2017-06-082-4/+6
| * | | Add success testLeonid Logvinov2017-06-082-5/+33
| * | | Remove old commentLeonid Logvinov2017-06-081-1/+0
| * | | Refactor to use OrderFillRequestLeonid Logvinov2017-06-071-22/+26
| * | | Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-072-27/+8
| |\ \ \
| * | | | Remove onlyLeonid Logvinov2017-06-071-1/+1
| * | | | Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-073-29/+46
| |\ \ \ \
| * | | | | Move fillableAmount to initialization sectionLeonid Logvinov2017-06-071-8/+17
| * | | | | Move initialization upLeonid Logvinov2017-06-071-15/+15
| * | | | | Move fillOrderAsync to fill order describe blockLeonid Logvinov2017-06-071-179/+185
| * | | | | Add assertion for empty batchLeonid Logvinov2017-06-071-0/+1
| * | | | | Fix linter errorsLeonid Logvinov2017-06-071-1/+2
| * | | | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-073-26/+68
| * | | | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-072-0/+51
| * | | | | Add comments for datesLeonid Logvinov2017-06-071-2/+2
| * | | | | Remove assertions from utils methodsLeonid Logvinov2017-06-073-11/+5
| * | | | | Use ContractInstance from globalsLeonid Logvinov2017-06-072-4/+3
| * | | | | Update 0x.js.tsLeonid2017-06-071-2/+1
| * | | | | Add initial implementation of batchCancelAsyncLeonid Logvinov2017-06-073-21/+55
| | | | | * Merge branch 'master' into batchFillOrKillFabio Berger2017-06-082-0/+28
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #46 from 0xProject/order-hash-contractFabio Berger2017-06-082-0/+28
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add getOrderHashHexUsingContractCallAsyncLeonid Logvinov2017-06-082-0/+28
|/ / / / /
| | | | * Merge branch 'master' into batchFillOrKillFabio Berger2017-06-083-25/+140
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #43 from 0xProject/batchCancelAsyncLeonid2017-06-083-25/+140
|\ \ \ \ \
| * | | | | Address feedbackLeonid Logvinov2017-06-081-6/+9
| * | | | | Format inputsLeonid Logvinov2017-06-081-1/+2
| * | | | | Address feedbackLeonid Logvinov2017-06-081-5/+6
| * | | | | Don't use batch function for normal oneLeonid Logvinov2017-06-081-3/+27
| * | | | | Merge branch 'master' into batchCancelAsyncLeonid2017-06-085-14/+169
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #42 from 0xProject/addExchangeMethodsLeonid2017-06-085-15/+171
|\ \ \ \ \ \
| | * | | | | Fix linter errorLeonid Logvinov2017-06-071-1/+1
| | * | | | | Address feedbackLeonid Logvinov2017-06-073-16/+16
| | | |_|/ / | | |/| | |
| | * | | | Use batchCancel for normal cancelLeonid Logvinov2017-06-071-28/+5
| | | |/ / | | |/| |
| | * | | Refactor to use OrderCancellationRequestLeonid Logvinov2017-06-074-34/+45
| | * | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-073-26/+68
| | * | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-073-0/+57
| |/ / / |/| | |
| | | * Implement batchFillOrKill and testsFabio Berger2017-06-083-58/+157
| | |/ | |/|
| * | make txOpts optionalFabio Berger2017-06-071-2/+2
| * | Remove catch of invalid jump throws since there are many reasons the contract...Fabio Berger2017-06-072-25/+14
| * | add `hex` to function and variable name for clarityFabio Berger2017-06-073-7/+7
| * | Spacing fixFabio Berger2017-06-071-2/+1
| * | Fix tests with removed shouldCheckTransferFabio Berger2017-06-071-6/+3
| * | remove unused argFabio Berger2017-06-071-2/+1
| * | remove spaceFabio Berger2017-06-071-1/+0
| * | merge masterFabio Berger2017-06-076-49/+160
| |\ \ | |/ / |/| |
* | | Merge pull request #40 from 0xProject/cancelAsyncLeonid2017-06-077-60/+185
|\ \ \
| * | | Add comments for datesLeonid Logvinov2017-06-071-2/+2
| * | | Remove assertions from utils methodsLeonid Logvinov2017-06-073-11/+5
| * | | Use ContractInstance from globalsLeonid Logvinov2017-06-072-4/+3
| * | | Update 0x.js.tsLeonid2017-06-071-2/+1
| | |/ | |/|
| * | Use union type Order|SignedOrderLeonid Logvinov2017-06-072-4/+4
| * | Make txOpts optionalLeonid Logvinov2017-06-071-7/+7
| * | Address feedbackLeonid Logvinov2017-06-075-47/+60
| * | Fix testsLeonid Logvinov2017-06-061-1/+1
| * | Add missing semicolonLeonid Logvinov2017-06-061-1/+1
| * | Remove onlyLeonid Logvinov2017-06-061-1/+1
| * | Add test when the order was already cancelled or filledLeonid Logvinov2017-06-063-31/+44
| * | Add checks and tests for expired order and zero fill amountLeonid Logvinov2017-06-063-2/+26
| * | Merge branch 'master' into cancelAsyncLeonid Logvinov2017-06-063-5/+8
| |\ \ | |/ / |/| |
| * | Fix testsLeonid Logvinov2017-06-061-1/+1
| * | Add initial implementation with success testLeonid Logvinov2017-06-064-5/+88
| | * Implement fillOrKill & testsFabio Berger2017-06-077-46/+233
| |/ |/|
* | Merge pull request #41 from 0xProject/testFixesLeonid2017-06-063-5/+8
|\ \ | |/ |/|
| * Pass nonExistentSenderAddress so that we get the proper rejectionFabio Berger2017-06-061-1/+2
| * avoid newline issues by putting the assertion message on a single lineFabio Berger2017-06-062-4/+6
|/
* Update schema_test.tsLeonid2017-06-061-1/+1
* Merge pull request #39 from 0xProject/senderAccountLeonid2017-06-0611-123/+104
|\
| * Address feedbackLeonid Logvinov2017-06-063-5/+5
| * Add isAnyAddressAvailableAsyncLeonid Logvinov2017-06-064-6/+7
| * Rename isSenderAddressHexAsync to isSenderAddressAsyncLeonid Logvinov2017-06-065-16/+16
| * Rename senderAddress to signerAddressLeonid Logvinov2017-06-061-4/+4
| * Last round of renamingsLeonid Logvinov2017-06-062-13/+13
| * Use variable name in assertin messageLeonid Logvinov2017-06-062-4/+5
| * Remove unused variableLeonid Logvinov2017-06-061-1/+0
| * Rename accounts to addresesLeonid Logvinov2017-06-066-13/+13
| * Remove message param from beforeLeonid Logvinov2017-06-061-1/+1
| * Rename senderAccount to senderAddressLeonid Logvinov2017-06-064-23/+23
| * Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsyncLeonid Logvinov2017-06-065-9/+9
| * Rename senderAccount to takerAddressLeonid Logvinov2017-06-061-5/+5
| * Remove redundant reassignmentLeonid Logvinov2017-06-061-3/+2
| * Fix commentsLeonid Logvinov2017-06-061-1/+1
| * Add tests for isSenderAccountHexAsyncLeonid Logvinov2017-06-061-0/+33
| * Fix testsLeonid Logvinov2017-06-061-1/+1
| * Add variableName to isSenderAddcountHexAsyncLeonid Logvinov2017-06-063-7/+8
| * Make methods accept senderAccountLeonid Logvinov2017-06-0510-125/+72
* | Merge pull request #35 from 0xProject/chai-setupLeonid2017-06-065-18/+22
|\ \
| * | Update chai_setup.tsLeonid2017-06-061-1/+1
| * | Merge branch 'master' into chai-setupLeonid2017-06-062-4/+16
| |\ \
| * | | Address feedbackLeonid Logvinov2017-06-065-12/+12
| * | | Add chai_setupLeonid Logvinov2017-06-055-17/+22
| | |/ | |/|
* | | Merge pull request #37 from 0xProject/umd-ciLeonid2017-06-062-1/+8
|\ \ \
| * | | Address feedbackLeonid Logvinov2017-06-061-1/+1
| * | | Add script to run UMD testsLeonid Logvinov2017-06-052-1/+8
| |/ /
* | | Merge pull request #34 from 0xProject/number-regexLeonid2017-06-062-1/+47
|\ \ \ | |_|/ |/| |
| * | Address feedbackLeonid Logvinov2017-06-061-18/+23
| * | Add tests to number regex and BigNumber serialization & fix bugsLeonid Logvinov2017-06-052-1/+42
| |/
* | Merge pull request #38 from 0xProject/async-errorsLeonid2017-06-061-4/+6
|\ \
| * | Add chai-as-promisedLeonid Logvinov2017-06-051-0/+2
| * | Add a couple of awaits and returns for async testsLeonid Logvinov2017-06-051-4/+4
| |/
* | Merge pull request #36 from 0xProject/regression-test-transferFromLeonid2017-06-061-0/+11
|\ \ | |/ |/|
| * Address feedbackLeonid Logvinov2017-06-061-1/+2
| * Add regression test for transferFrom bugLeonid Logvinov2017-06-051-0/+10
|/
* Upgrade truffle-contract to the version that includes 'at' fixLeonid Logvinov2017-06-052-70/+183
* Merge pull request #33 from 0xProject/greenkeeper/initialLeonid2017-06-032-2/+4
|\
| * docs(readme): add Greenkeeper badgegreenkeeper[bot]2017-06-031-0/+2
| * chore(package): update dependenciesgreenkeeper[bot]2017-06-031-2/+2
* | Merge pull request #32 from 0xProject/addEventSubscriptionsFabio Berger2017-06-0312-573/+218
|\ \
| * | Consolidate the ExchangeContract type and flesh out type definition for isVal...Fabio Berger2017-06-031-20/+19
| * | Run stopWatching in parallelFabio Berger2017-06-031-3/+4
| * | Be more specific with blockParam valid valuesFabio Berger2017-06-031-2/+4
| * | remove spaceFabio Berger2017-06-031-1/+1
| * | Update artifactsFabio Berger2017-06-036-566/+35
| * | Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-034-10/+10
| |\|
| * | Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-034-0/+4
| |\ \
| * | | Revert unintentional artifact changesFabio Berger2017-06-036-35/+566
| * | | Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-038-150/+378
| |\ \ \
| * \ \ \ Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-022-4/+39
| |\ \ \ \
| * | | | | Add tests for subscribeAsync, making sure events are caught and that subscrip...Fabio Berger2017-06-021-1/+83
| * | | | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ...Fabio Berger2017-06-025-6/+94
| * | | | | Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-025-33/+90
| |\ \ \ \ \
| * | | | | | Update artifactsFabio Berger2017-06-026-561/+30
* | | | | | | Merge pull request #29 from 0xProject/remainingTokenMethodsLeonid2017-06-036-48/+240
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-0310-18/+171
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #31 from 0xProject/unavailableFilledCancelledLeonid2017-06-038-17/+166
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-038-155/+375
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-025-36/+128
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| * | | | | | Simplify testsFabio Berger2017-06-021-16/+11
| * | | | | | improve commentFabio Berger2017-06-021-1/+4
| * | | | | | Add comment about the isString assertion lest the next developer tries to use...Fabio Berger2017-06-021-0/+2
| * | | | | | Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and...Fabio Berger2017-06-023-11/+106
| * | | | | | Always wrap BigNumbers returned by web3 with our own version and add commentFabio Berger2017-06-022-5/+11
| * | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-025-44/+82
| |\ \ \ \ \ \
| * | | | | | | fix tslint errorFabio Berger2017-06-021-1/+2
| * | | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-024-12/+39
| |\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 17:20:00 +0800