Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 2 | -9/+791 |
|\ | |||||
| * | Fix build | Amir Bandeali | 2018-05-25 | 2 | -9/+791 |
* | | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash | Fabio Berger | 2018-05-25 | 9 | -45/+208 |
|\ \ | |||||
| * | | Fix a typo | Leonid Logvinov | 2018-05-25 | 1 | -2/+2 |
| * | | Migrate migrations to v2 | Leonid Logvinov | 2018-05-25 | 9 | -45/+208 |
| |/ | |||||
* / | Use domain separator for exchange address | Jacob Evans | 2018-05-25 | 2 | -2292/+2273 |
|/ | |||||
* | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-24 | 1 | -1/+1 |
|\ | |||||
| * | Fix TokenTransferProxy artifact name since it's now suffixed with _v1 | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| * | Merge branch 'development' into v2-prototype | Leonid Logvinov | 2018-05-23 | 3 | -11/+24 |
| |\ | |||||
| | * | Publish | Leonid Logvinov | 2018-05-23 | 1 | -10/+10 |
| | * | Updated CHANGELOGS | Leonid Logvinov | 2018-05-23 | 2 | -1/+14 |
* | | | Publish | Leonid Logvinov | 2018-05-23 | 1 | -10/+10 |
* | | | Updated CHANGELOGS | Leonid Logvinov | 2018-05-23 | 2 | -1/+14 |
* | | | Remove web3Factory.create and remove dev-tools dependency on sol-cov | Leonid Logvinov | 2018-05-23 | 2 | -3/+2 |
|/ / | |||||
* | | Merge pull request #605 from 0xProject/fix/multiple/build-errors | Fabio Berger | 2018-05-23 | 1 | -14/+14 |
|\ \ | |||||
| * | | Update artifacts | Remco Bloemen | 2018-05-22 | 1 | -14/+14 |
* | | | merge development | Fabio Berger | 2018-05-23 | 2 | -3/+4 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | remove generated contract_wrappers during clean | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| * | Merge pull request #594 from 0xProject/improvement/addCustomTslintRules | Fabio Berger | 2018-05-23 | 1 | -2/+3 |
| |\ | |||||
| | * | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-17 | 7 | -43/+7 |
| | |\ | |||||
| | * \ | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-16 | 1 | -0/+3 |
| | |\ \ | |||||
| | * | | | Fix TSLint rules | Fabio Berger | 2018-05-16 | 1 | -2/+3 |
* | | | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatching | Greg Hysen | 2018-05-22 | 16 | -289/+637 |
|\ \ \ \ \ | |||||
| * | | | | | Ran prettier | Greg Hysen | 2018-05-22 | 16 | -7692/+7892 |
| * | | | | | Added getNullFillResults | Greg Hysen | 2018-05-19 | 2 | -14/+14 |
| * | | | | | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 2 | -20/+20 |
| * | | | | | Style improvements to order matching | Greg Hysen | 2018-05-19 | 1 | -10/+10 |
| * | | | | | Upgraded to Solidity 0.4.24 | Greg Hysen | 2018-05-19 | 10 | -149/+149 |
| * | | | | | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 16 | -7544/+7692 |
* | | | | | | merge development | Fabio Berger | 2018-05-22 | 1 | -5/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | / | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 1 | -5/+5 |
| | |_|/ | |/| | | |||||
| * | | | Improve about page descriptions | fragosti | 2018-05-17 | 6 | -42/+6 |
* | | | | Fix prettier | Brandon Millman | 2018-05-19 | 16 | -7343/+7544 |
* | | | | Merge branch 'development' into v2-prototype | Fabio Berger | 2018-05-16 | 2 | -19/+10 |
|\| | | | |||||
| * | | | Do not remove artifacts when running `clean` | Fabio Berger | 2018-05-16 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Merge pull request #578 from 0xProject/document-node-version | Alex Browne | 2018-05-16 | 1 | -0/+3 |
| |\ \ | | |/ | |/| | |||||
| | * | Change minimum Node version to 6.12 | Alex Browne | 2018-05-15 | 1 | -1/+1 |
| | * | Document Node.js version requirement and add it to package.json | Alex Browne | 2018-05-15 | 1 | -0/+3 |
| * | | Fix abi-gen binary so it can be called directly from packages | Fabio Berger | 2018-05-15 | 1 | -2/+3 |
| * | | Move from using lerna multi-package commands to wsrun, update README's accord... | Fabio Berger | 2018-05-15 | 2 | -16/+4 |
| |/ | |||||
* | | Do not remove artifacts when running `clean` | Fabio Berger | 2018-05-16 | 1 | -1/+1 |
* | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 35 | -48/+12001 |
|\| | |||||
| * | Add compilerSettings to compiler.json | Fabio Berger | 2018-05-11 | 1 | -1/+14 |
| * | Add deployedBytecode to artifacts since it is needed by sol-cov | Fabio Berger | 2018-05-11 | 14 | -56/+140 |
| * | Update artifacts | Fabio Berger | 2018-05-11 | 24 | -7657/+5961 |
| * | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-11 | 8 | -41/+167 |
| |\ | |||||
| | * | Fix templates | Leonid Logvinov | 2018-05-10 | 2 | -2/+3 |
| | * | Remove unused deployer docs configs | Leonid Logvinov | 2018-05-10 | 5 | -33/+41 |
| | * | Fix linter issues | Leonid Logvinov | 2018-05-10 | 3 | -12/+12 |
| | * | Rename deployer to sol-compiler | Leonid Logvinov | 2018-05-10 | 3 | -4/+6 |
| | * | Remove deployer | Leonid Logvinov | 2018-05-10 | 1 | -1/+0 |
| | * | Remove deployer from 0x.js and migrations | Leonid Logvinov | 2018-05-10 | 6 | -35/+134 |
| | * | Configure migrations with a compiler.json | Leonid Logvinov | 2018-05-10 | 3 | -6/+23 |
| * | | Add artifacts to clean command | Fabio Berger | 2018-05-11 | 1 | -1/+1 |
| * | | Commit v1 artifacts to migrations package and remove compile step from prebuild | Fabio Berger | 2018-05-11 | 25 | -0/+7685 |
| * | | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-10 | 1 | -0/+0 |
| |\| | |||||
| | * | Create an artifacts folder | Leonid Logvinov | 2018-05-07 | 1 | -0/+0 |
| * | | Add missing quote | Fabio Berger | 2018-05-10 | 1 | -1/+1 |
| * | | Remove uneeded tslint config | Fabio Berger | 2018-05-10 | 1 | -1/+1 |
| |/ | |||||
| * | Publish | Leonid Logvinov | 2018-05-05 | 1 | -5/+5 |
| * | Updated CHANGELOGS | Leonid Logvinov | 2018-05-05 | 2 | -0/+13 |
| * | Publish | Leonid Logvinov | 2018-05-04 | 1 | -6/+6 |
| * | Updated CHANGELOGS | Leonid Logvinov | 2018-05-04 | 2 | -0/+13 |
* | | Remove remenants of MaliciousToken contract | Fabio Berger | 2018-04-26 | 2 | -2/+1 |
|/ | |||||
* | Merge branch 'development' into fix/expiration-watcher | Fabio Berger | 2018-04-19 | 3 | -2/+25 |
|\ | |||||
| * | Publish | Leonid Logvinov | 2018-04-19 | 1 | -1/+1 |
| * | Updated CHANGELOGS | Leonid Logvinov | 2018-04-19 | 2 | -0/+21 |
| * | Make @0xproject/migrations public | Leonid Logvinov | 2018-04-19 | 1 | -1/+3 |
* | | Fix expiration watcher comparator | Leonid Logvinov | 2018-04-18 | 1 | -1/+1 |
|/ | |||||
* | Publish | Fabio Berger | 2018-04-18 | 1 | -6/+6 |
* | Fix web3-wrapper version | Fabio Berger | 2018-04-12 | 1 | -1/+1 |
* | Merge branch 'development' into removeMigrateStep | Fabio Berger | 2018-04-12 | 1 | -1/+1 |
* | Simply export | Fabio Berger | 2018-04-11 | 1 | -3/+1 |
* | Move NULL_BYTES to @0xproject/utils | Fabio Berger | 2018-04-11 | 3 | -22/+17 |
* | Move migrations into separate monorepo subpackage and hook it up to 0x.js and... | Fabio Berger | 2018-04-09 | 11 | -0/+321 |