aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:0xProject/0x.jsFabio Berger2017-06-1916-81/+394
|\
| * Merge pull request #68 from 0xProject/changelogLeonid2017-06-191-0/+12
| |\ | | | | | | Add CHANGELOG.md
| | * Remove coveralls integration from CHANGELOG.mdLeonid Logvinov2017-06-191-2/+1
| | |
| | * Add CHANGELOG.mdLeonid Logvinov2017-06-191-0/+13
| |/
| * Merge pull request #66 from 0xProject/event-typesLeonid2017-06-193-2/+36
| |\ | | | | | | Add actual type for contract event arguments
| | * Rename LogErrorArgs to LogErrorEventArgs and EventArgs to ContractEventArgsLeonid Logvinov2017-06-193-7/+7
| | |
| | * Merge branch 'master' into event-typesLeonid2017-06-1511-23/+29
| | |\ | | |/ | |/|
| * | Merge pull request #67 from 0xProject/web3-providerFabio Berger2017-06-1511-23/+29
| |\ \ | | | | | | | | Make ZeroEx constructor accept Web3Provider instead of Web3 instance
| | * | Fix bug in 0x.js tests when passing Web3 instead of Web3 ProviderLeonid Logvinov2017-06-151-1/+1
| | | |
| | * | Switch back to using Web3.Provider, not Web3Provider in internal classesLeonid Logvinov2017-06-151-4/+3
| | | |
| | * | Add explaining comment for the web3Provider typeLeonid Logvinov2017-06-151-1/+5
| | | |
| | * | Make ZeroEx constructor accept Web3Provider instead of Web3 instanceLeonid Logvinov2017-06-1511-24/+27
| |/ /
| | * Add actual type for contract event argumentsLeonid Logvinov2017-06-153-2/+36
| |/
| * Merge pull request #65 from 0xProject/coverallsLeonid2017-06-154-13/+125
| |\ | | | | | | Coveralls integration
| | * Add badge to READMELeonid Logvinov2017-06-151-0/+1
| | |
| | * Report test coverage on CILeonid Logvinov2017-06-151-0/+1
| | |
| | * Add node script to report coverageLeonid Logvinov2017-06-151-0/+1
| | |
| | * Add coveralls as a dependencyLeonid Logvinov2017-06-152-13/+122
| |/
| * Remove unused importLeonid Logvinov2017-06-151-1/+0
| |
| * 0.5.2Leonid Logvinov2017-06-151-1/+1
| |
| * Fix bug in postinstall scriptLeonid Logvinov2017-06-151-1/+1
| |
| * 0.5.1Leonid Logvinov2017-06-151-1/+1
| |
| * Add postrelease script to publish assets to githubLeonid Logvinov2017-06-152-8/+193
| |
| * Set NODE_ENV to production for production builds and don't rely on webpack ↵Leonid Logvinov2017-06-151-1/+1
| | | | | | | | minification (we use uglifyJS)
| * Fix lodash import bug in webpack configLeonid Logvinov2017-06-151-1/+1
| |
| * Update web3-provider-engine cause the console.log issue was fixed and the ↵Leonid Logvinov2017-06-152-43/+8
| | | | | | | | new version was released
* | Add and improve commentsFabio Berger2017-06-164-17/+43
|/
* 0.5.0v0.5.0Leonid Logvinov2017-06-141-1/+1
|
* Remove types that are not used in public interface from export and rename ↵Leonid Logvinov2017-06-145-19/+14
| | | | EventEmitter to ContractEventEmitter and IndexFilterValues to IndexedFilterValues
* Merge branch 'master' of github.com:0xProject/0x.jsLeonid Logvinov2017-06-141-1/+1
|\
| * Update doc:json command to exclude privates and externalsFabio Berger2017-06-141-1/+1
| |
* | 0.4.0Leonid Logvinov2017-06-141-1/+1
|/
* Merge pull request #64 from 0xProject/eventsLeonid2017-06-146-31/+74
|\ | | | | Refactor events API
| * Address feedbackLeonid Logvinov2017-06-141-2/+2
| |
| * Rename ZeroExEvent to EventEmitterLeonid Logvinov2017-06-133-14/+14
| |
| * Revert "0.4.0"Leonid Logvinov2017-06-131-1/+1
| | | | | | | | This reverts commit 870f9838d6743f5594fb809c6b91084be4d0cc45.
| * Add tests for stopWatchingAsyncLeonid Logvinov2017-06-131-0/+20
| |
| * 0.4.0Leonid Logvinov2017-06-131-1/+1
| |
| * Bind watch function on an eventLeonid Logvinov2017-06-131-1/+1
| |
| * Refactor subscription to return zeroExSignature objectLeonid Logvinov2017-06-135-28/+51
| |
| * 0.3.0v0.3.0Leonid Logvinov2017-06-131-1/+1
|/
* Add getContractAddressAsync and testsLeonid Logvinov2017-06-132-0/+16
|
* 0.2.3v0.2.3Leonid Logvinov2017-06-131-1/+1
|
* Merge pull request #63 from 0xProject/api-refactorLeonid2017-06-1311-18/+38
|\ | | | | Api refactor
| * Fix testLeonid Logvinov2017-06-131-1/+1
| |
| * Fix testLeonid Logvinov2017-06-131-1/+1
| |
| * Change UMD bundle nameLeonid Logvinov2017-06-131-2/+2
| |
| * Export DoneCallbackLeonid Logvinov2017-06-131-0/+1
| |
| * Introduce index.ts file which defines public interfaceLeonid Logvinov2017-06-1310-16/+35
|/
* 0.2.2v0.2.2Leonid Logvinov2017-06-121-1/+1
|
* Remove src from npmignoreLeonid Logvinov2017-06-121-1/+0
|
* 0.2.1v0.2.1Leonid Logvinov2017-06-121-1/+1
|
* Don't prefix main and types path in package.json with ./Leonid Logvinov2017-06-121-2/+2
|
* 0.2.0v0.2.0Leonid Logvinov2017-06-121-1/+1
|
* Change main file name from 0x.js.ts to 0x.tsLeonid Logvinov2017-06-1210-11/+11
|
* Duplicate truffle contracts typesLeonid Logvinov2017-06-112-1/+9
|
* Add type referencesLeonid Logvinov2017-06-111-0/+2
|
* Add main and types fields to package.jsonLeonid Logvinov2017-06-111-0/+2
|
* Revert "Make private"Leonid Logvinov2017-06-111-1/+0
| | | | This reverts commit 933be8815b8d1b93662abbb1538b13367f6b022a.
* 0.1.0Leonid Logvinov2017-06-111-1/+1
|
* Make privateLeonid Logvinov2017-06-111-0/+1
|
* Add 0xproject scopeLeonid Logvinov2017-06-111-1/+2
|
* Merge pull request #62 from 0xProject/privateLeonid2017-06-118-172/+173
|\ | | | | Prefix private vars with _
| * Merge branch 'master' into privateLeonid2017-06-116-36/+86
| |\ | |/ |/|
* | Merge pull request #60 from 0xProject/error-decoratorFabio Berger2017-06-115-0/+50
|\ \ | | | | | | Add initial error handling decorator implementation
| * \ 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 names
| * | | | Remove Hex suffix from public functions parameters namesLeonid Logvinov2017-06-102-36/+36
| | |/ / | |/| |
| | | * Fix last testsLeonid Logvinov2017-06-114-23/+23
| | | |
| | | * Fix some testsLeonid Logvinov2017-06-101-12/+12
| | | |
| | | * Prefix private vars with _Leonid Logvinov2017-06-107-137/+138
| |_|/ |/| |
* | | Create README.mdLeonid2017-06-101-2/+1
|/ /
* | Merge pull request #58 from 0xProject/remove-console-trashLeonid2017-06-102-1/+36
|\ \ | | | | | | Remove unneccessary console output from block tracker
| * \ Merge branch 'master' into remove-console-trashLeonid2017-06-104-24/+139
| |\ \ | |/ / |/| |
* | | Merge pull request #59 from 0xProject/addParamReturnCommentsLeonid2017-06-104-24/+139
|\ \ \ | |_|/ |/| | Add @param and @return comments to public methods
| * | 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 ↵Fabio Berger2017-06-104-24/+127
| | | | | | | | | | | | public methods that were missing them
| | * Merge branch 'master' into remove-console-trashLeonid2017-06-101-0/+16
| | |\ | |_|/ |/| |
* | | Merge pull request #55 from 0xProject/subscribe-async-testsLeonid2017-06-101-0/+16
|\ \ \ | |/ / |/| | Add LogCancel test to subscribeAsync
| * | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Convert to JSON schema compatible object by default
| * | | | | Merge branch 'master' into json-schemaLeonid2017-06-107-18/+276
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #54 from 0xProject/schema-testsLeonid2017-06-107-18/+276
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Schema tests
| * | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Move MAX_DIGITS_IN_UNSIGNED_256_INT to constants
| * | | | | | 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.getCanceledTakerAmountAsync
| * | | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix the bug of not awaiting an async function
| * | | | 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
|\ \ \ \ | |_|/ / |/| | | Implement fillOrderUpToAsync
| * | | 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Add orderCancelrequestsSchema and orderFillRequestsSchema
| * | | | | 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 isSenderAddressAvailableAsync
| * | | Remove isSenderAddressAvailableAsyncLeonid Logvinov2017-06-091-4/+0
|/ / /
* | | Merge pull request #44 from 0xProject/batchFillOrKillLeonid2017-06-098-90/+205
|\ \ \ | |_|/ |/| | Implement BatchFillOrKill and tests
| * | 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 ↵Fabio Berger2017-06-096-19/+34
| | | | | | | | | | | | over the requests and validating them individually
| * | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-099-354/+371
| |\ \ | |/ / |/| | | | | | | | # Conflicts: # test/exchange_wrapper_test.ts
* | | Fix isValidSignature testsFabio Berger2017-06-091-16/+18
| |/ |/|
* | Merge pull request #48 from 0xProject/interfaceTweaksLeonid2017-06-083-11/+11
|\ \ | | | | | | Interface tweaks
| * \ 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
|\ \ \ \ | | | | | | | | | | Refactor isValidSignature
| * \ \ \ 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
|\ \ \ \ | |_|/ / |/| | | Batch fill async
| * | | 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 getOrderHashHexUsingContractCallAsync
| * | | | | Add getOrderHashHexUsingContractCallAsyncLeonid Logvinov2017-06-082-0/+28
|/ / / / /
| | | | * Merge branch 'master' into batchFillOrKillFabio Berger2017-06-083-25/+140
| | | | |\ | |_|_|_|/ |/| | | | | | | | | | | | | | # Conflicts: # src/types.ts
* | | | | Merge pull request #43 from 0xProject/batchCancelAsyncLeonid2017-06-083-25/+140
|\ \ \ \ \ | | | | | | | | | | | | Batch cancel order async
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add FillOrKillAsync method & tests
| | * | | | | 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 ↵Fabio Berger2017-06-072-25/+14
| | | | | | | | | | | | contracts could throw this error
| * | 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 cancelOrderAsync
| * | | 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
|\ \ | |/ |/| Fix Test Failures
| * 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
|\ | | | | Make methods accept senderAccount