aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/asset_proxy
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-232-47/+101
|\
| * Fix some unhandled promise rejectionsAlex Browne2018-05-221-2/+2
| * Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-222-45/+87
| * Add missing blockchainLifecycle calls to contracts testsAlex Browne2018-05-222-0/+12
* | Remove 0x.js dep from contractsFabio Berger2018-05-231-9/+2
|/
* merge developmentFabio Berger2018-05-221-0/+1
* Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-162-12/+13
* Move Authorizable to AssetProxy dir, rename to MixinAuthorizableAmir Bandeali2018-05-081-3/+3
* Add tests for batchTransferFromAmir Bandeali2018-05-021-151/+296
* Add hard coded proxyId into each AssetProxyAmir Bandeali2018-05-011-0/+10
* merge v2-prototypeFabio Berger2018-04-241-18/+18
* Fix testsAmir Bandeali2018-04-242-0/+344