Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 2 | -47/+101 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Add `are` to boolean naming conventions Fix tslint Fix the tsutils version, fixing ts typings issue Rename some variables in multi_sig_with_time_lock.ts Remove extra awaitTransactionMinedAsync calls Update artifacts Update yarn.lock Fix warnings in Metacoin Upgrade UglifyJS to include ES6 support Add CancelOrder and MatchOrder types Add missing return types Ignore classnames linter rule Apply changes to test/exchange/match_orders.ts Fix some unhandled promise rejections Add awaitTransactionMinedAsync after every sent transaction Add missing blockchainLifecycle calls to contracts tests # Conflicts: # packages/contracts/src/utils/exchange_wrapper.ts # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/dispatcher.ts # packages/contracts/test/multi_sig_with_time_lock.ts | ||||
| * | Fix some unhandled promise rejections | Alex Browne | 2018-05-22 | 1 | -2/+2 |
| | | |||||
| * | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 2 | -45/+87 |
| | | |||||
| * | Add missing blockchainLifecycle calls to contracts tests | Alex Browne | 2018-05-22 | 2 | -0/+12 |
| | | |||||
* | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 1 | -9/+2 |
|/ | |||||
* | merge development | Fabio Berger | 2018-05-22 | 1 | -0/+1 |
| | |||||
* | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 2 | -12/+13 |
| | |||||
* | Move Authorizable to AssetProxy dir, rename to MixinAuthorizable | Amir Bandeali | 2018-05-08 | 1 | -3/+3 |
| | |||||
* | Add tests for batchTransferFrom | Amir Bandeali | 2018-05-02 | 1 | -151/+296 |
| | |||||
* | Add hard coded proxyId into each AssetProxy | Amir Bandeali | 2018-05-01 | 1 | -0/+10 |
| | |||||
* | merge v2-prototype | Fabio Berger | 2018-04-24 | 1 | -18/+18 |
| | |||||
* | Fix tests | Amir Bandeali | 2018-04-24 | 2 | -0/+344 |