Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix prettier | Leonid Logvinov | 2018-05-24 | 3 | -3/+9 |
| | |||||
* | Fix prettier | Leonid Logvinov | 2018-05-24 | 2 | -6/+2 |
| | |||||
* | Remove 0x.js as a dependency from website | Leonid Logvinov | 2018-05-24 | 24 | -122/+137 |
| | |||||
* | Merge pull request #609 from 0xProject/refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-24 | 24 | -296/+275 |
|\ | | | | | Remove 0x.js dep from Contracts | ||||
| * | Enable 0x.js tests | Fabio Berger | 2018-05-23 | 1 | -3/+1 |
| | | |||||
| * | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 2 | -2/+2 |
| |\ | |/ |/| | | | | | | | | | * v2-prototype: Fix small bug in order-utils Fix Tslint error caused by "PromiseLike" value Update dogfood url | ||||
* | | Fix small bug in order-utils | Alex Browne | 2018-05-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵ | Fabio Berger | 2018-05-23 | 2 | -2/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | v2-prototype * 'v2-prototype' of github.com:0xProject/0x-monorepo: Update dogfood url | ||||
| * | | Update dogfood url | Brandon Millman | 2018-05-23 | 2 | -2/+2 |
| | | | |||||
* | | | Fix Tslint error caused by "PromiseLike" value | Fabio Berger | 2018-05-23 | 1 | -0/+6 |
|/ / | |||||
| * | Fix Tslint error caused by "PromiseLike" value | Fabio Berger | 2018-05-23 | 1 | -0/+6 |
| | | |||||
| * | fix contract-wrappers version | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | |||||
| * | merge v2-prototype | Fabio Berger | 2018-05-23 | 82 | -264/+560 |
| |\ | |/ |/| | |||||
* | | Fix TokenTransferProxy artifact name since it's now suffixed with _v1 | Fabio Berger | 2018-05-23 | 3 | -3/+3 |
| | | |||||
* | | Merge pull request #610 from 0xProject/feature/sra-report-without-0x | Leonid Logvinov | 2018-05-23 | 2 | -3/+5 |
|\ \ | | | | | | | Remove 0x.js dependency from sra-report | ||||
| * | | Remove 0x.js dependency from sra-report | Leonid Logvinov | 2018-05-23 | 2 | -3/+5 |
|/ / | |||||
* | | Merge branch 'development' into v2-prototype | Leonid Logvinov | 2018-05-23 | 81 | -262/+556 |
|\ \ | |||||
| * | | Publish | Leonid Logvinov | 2018-05-23 | 30 | -230/+230 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.38.0 - @0xproject/abi-gen@0.3.0 - @0xproject/assert@0.2.10 - @0xproject/base-contract@0.3.2 - @0xproject/connect@0.6.13 - @0xproject/contract-wrappers@0.0.2 - contracts@2.1.29 - @0xproject/dev-utils@0.4.2 - @0xproject/fill-scenarios@0.0.2 - @0xproject/json-schemas@0.7.24 - @0xproject/metacoin@0.0.7 - @0xproject/migrations@0.0.6 - @0xproject/monorepo-scripts@0.1.20 - @0xproject/order-utils@0.0.5 - @0xproject/order-watcher@0.0.2 - @0xproject/react-docs-example@0.0.12 - @0xproject/react-docs@0.0.12 - @0xproject/react-shared@0.1.7 - @0xproject/sol-compiler@0.5.0 - @0xproject/sol-cov@0.0.11 - @0xproject/sol-resolver@0.0.5 - @0xproject/sra-report@0.1.0 - @0xproject/subproviders@0.10.2 - @0xproject/testnet-faucets@1.0.30 - @0xproject/tslint-config@0.4.18 - @0xproject/types@0.7.0 - @0xproject/typescript-typings@0.3.2 - @0xproject/utils@0.6.2 - @0xproject/web3-wrapper@0.6.4 - @0xproject/website@0.0.33 | ||||
| * | | Updated CHANGELOGS | Leonid Logvinov | 2018-05-23 | 1 | -1/+1 |
| | | | |||||
| * | | Updated CHANGELOGS | Leonid Logvinov | 2018-05-23 | 50 | -30/+324 |
| | | | |||||
| * | | Change publish command name | Leonid Logvinov | 2018-05-23 | 1 | -2/+2 |
| | | | |||||
| | * | Update yarn.lock | Fabio Berger | 2018-05-23 | 1 | -117/+0 |
| | | | |||||
| | * | Fix signature verification test | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | | |||||
| | * | Fix TokenTransferProxy artifact name since it's now suffixed with _v1 | Fabio Berger | 2018-05-23 | 3 | -3/+3 |
| | | | |||||
| | * | Fix dep version | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | | |||||
| | * | Fix import | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | | |||||
| | * | Fix await calls | Fabio Berger | 2018-05-23 | 1 | -12/+3 |
| | | | |||||
| | * | Refactor etherToken test to use contract-wrappers | Fabio Berger | 2018-05-23 | 1 | -22/+36 |
| | | | |||||
| | * | Fix ExchangeWrapper | Fabio Berger | 2018-05-23 | 6 | -14/+10 |
| | | | |||||
| | * | Fix imports | Fabio Berger | 2018-05-23 | 2 | -2/+1 |
| | | | |||||
| | * | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 31 | -221/+526 |
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵ | Fabio Berger | 2018-05-23 | 16 | -175/+419 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2-prototype * 'v2-prototype' of github.com:0xProject/0x-monorepo: Rename some variables in multi_sig_with_time_lock.ts Remove extra awaitTransactionMinedAsync calls 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 | ||||
| * \ \ | Merge pull request #601 from 0xProject/contracts-test-fixes | Alex Browne | 2018-05-23 | 16 | -175/+419 |
| |\ \ \ | | | | | | | | | | | Contracts test fixes | ||||
| | * | | | Rename some variables in multi_sig_with_time_lock.ts | Alex Browne | 2018-05-23 | 1 | -10/+10 |
| | | | | | |||||
| | * | | | Remove extra awaitTransactionMinedAsync calls | Alex Browne | 2018-05-23 | 1 | -4/+2 |
| | | | | | |||||
| | * | | | Apply changes to test/exchange/match_orders.ts | Alex Browne | 2018-05-22 | 1 | -6/+18 |
| | | | | | |||||
| | * | | | Fix some unhandled promise rejections | Alex Browne | 2018-05-22 | 2 | -4/+8 |
| | | | | | |||||
| | * | | | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 10 | -155/+294 |
| | | | | | |||||
| | * | | | Add missing blockchainLifecycle calls to contracts tests | Alex Browne | 2018-05-22 | 14 | -0/+91 |
| | | | | | |||||
* | | | | | Fix tslint issues | Fabio Berger | 2018-05-23 | 2 | -10/+13 |
| | | | | | |||||
* | | | | | Add `are` to boolean naming conventions | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵ | Fabio Berger | 2018-05-23 | 13 | -41/+87 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2-prototype * 'v2-prototype' of github.com:0xProject/0x-monorepo: 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 | ||||
| * \ \ \ | Merge pull request #605 from 0xProject/fix/multiple/build-errors | Fabio Berger | 2018-05-23 | 13 | -41/+87 |
| |\ \ \ \ | | | | | | | | | | | | | Fix build/lint errors and warnings | ||||
| | * | | | | Update artifacts | Remco Bloemen | 2018-05-22 | 1 | -14/+14 |
| | | | | | | |||||
| | * | | | | Update yarn.lock | Remco Bloemen | 2018-05-22 | 1 | -3/+29 |
| | | | | | | |||||
| | * | | | | Fix warnings in Metacoin | Remco Bloemen | 2018-05-22 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Upgrade UglifyJS to include ES6 support | Remco Bloemen | 2018-05-22 | 2 | -3/+10 |
| | | | | | | |||||
| | * | | | | Add CancelOrder and MatchOrder types | Remco Bloemen | 2018-05-22 | 2 | -3/+15 |
| | | | | | | |||||
| | * | | | | Add missing return types | Remco Bloemen | 2018-05-22 | 5 | -15/+15 |
| | | | | | | |||||
| | * | | | | Ignore classnames linter rule | Remco Bloemen | 2018-05-22 | 1 | -0/+1 |
| | |/ / / | |||||
* | / / / | Fix tslint | Fabio Berger | 2018-05-23 | 2 | -4/+4 |
|/ / / / | |||||
* | | | | Fix the tsutils version, fixing ts typings issue | Fabio Berger | 2018-05-23 | 2 | -1/+7 |
| | | | | |||||
| | | * | Update artifact | Fabio Berger | 2018-05-23 | 1 | -14/+14 |
| | | | | |||||
| | | * | Fix tsutils version | Fabio Berger | 2018-05-23 | 1 | -0/+6 |
| | | | | |||||
| | | * | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 25 | -267/+353 |
| |_|/ |/| | | |||||
* | | | merge development | Fabio Berger | 2018-05-23 | 59 | -124/+418 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | 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 | 59 | -127/+421 |
| |\ | | | | | | | Add more tslint rules | ||||
| | * | Make lint run in parallel | Fabio Berger | 2018-05-22 | 1 | -1/+1 |
| | | | |||||
| | * | Improve naming | Fabio Berger | 2018-05-17 | 2 | -5/+6 |
| | | | |||||
| | * | Disable magic number rule in more places where it isn't helping code readability | Fabio Berger | 2018-05-17 | 2 | -14/+14 |
| | | | |||||
| | * | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-17 | 10 | -54/+18 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Remove "Order utils" from menu for now Fix top tokens key Improve about page descriptions Do not remove artifacts when running `clean` | ||||
| | * \ | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-16 | 35 | -16/+114 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: fix style errors Fix circular dependency Add my profile image to images Add myself to about page Add dogfood configs to website Change minimum Node version to 6.12 Document Node.js version requirement and add it to package.json | ||||
| | * | | | Fix comments | Fabio Berger | 2018-05-16 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Improve name | Fabio Berger | 2018-05-16 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Fix TSLint rules | Fabio Berger | 2018-05-16 | 55 | -133/+278 |
| | | | | | |||||
| | * | | | Enforce new rules, including no-switch-case-fall-through | Fabio Berger | 2018-05-16 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Implement boolean variable naming custom TSLint rule | Fabio Berger | 2018-05-16 | 1 | -0/+69 |
| | | | | | |||||
| | * | | | Implement custom no-magic-numbers rule that doesn't include magic numbers ↵ | Fabio Berger | 2018-05-16 | 2 | -1/+78 |
| | | | | | | | | | | | | | | | | | | | | passed into BigNumber instantiations (e.g const amount = new BigNumber(5); ) | ||||
| | * | | | Run linter sequentially | Fabio Berger | 2018-05-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatching | Greg Hysen | 2018-05-22 | 80 | -538/+3162 |
|\ \ \ \ \ | | | | | | | | | | | | | Atomic Order Matching | ||||
| * | | | | | Removed debug line from chai_setup. Its failing linter and does not appear ↵ | Greg Hysen | 2018-05-22 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | to be used (it was from an old PR I merged in). | ||||
| * | | | | | Ran prettier | Greg Hysen | 2018-05-22 | 16 | -7692/+7892 |
| | | | | | | |||||
| * | | | | | Added getNullFillResults | Greg Hysen | 2018-05-19 | 4 | -15/+30 |
| | | | | | | |||||
| * | | | | | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 9 | -61/+61 |
| | | | | | | |||||
| * | | | | | Style improvements to order matching | Greg Hysen | 2018-05-19 | 5 | -38/+27 |
| | | | | | | |||||
| * | | | | | Upgraded to Solidity 0.4.24 | Greg Hysen | 2018-05-19 | 65 | -206/+221 |
| | | | | | | |||||
| * | | | | | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 22 | -7557/+7708 |
| | | | | | | |||||
| * | | | | | Changed calculateFillResults to public visibility so that it can be used by ↵ | Greg Hysen | 2018-05-19 | 3 | -131/+131 |
| | | | | | | | | | | | | | | | | | | | | | | | | the Forwarding Contract. | ||||
| * | | | | | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ↵ | Greg Hysen | 2018-05-19 | 2 | -138/+126 |
| | | | | | | | | | | | | | | | | | | | | | | | | we dont need to pass it in on each call. | ||||
| * | | | | | Wording of calculateMatchedFillResults | Greg Hysen | 2018-05-19 | 1 | -9/+11 |
| | | | | | | |||||
| * | | | | | Cleaned up interface for decoding proxy data. Added a general decoder, which ↵ | Greg Hysen | 2018-05-19 | 3 | -17/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | should be useful for the forwarding contract code. | ||||
| * | | | | | Style improvements to the match orders typescript test class | Greg Hysen | 2018-05-19 | 1 | -18/+14 |
| | | | | | | |||||
| * | | | | | Removed redundant log decode call | Greg Hysen | 2018-05-19 | 1 | -2/+0 |
| | | | | | | |||||
| * | | | | | The OrderInfo struct is now returned by the getOrderInfo function | Greg Hysen | 2018-05-19 | 8 | -141/+98 |
| | | | | | | |||||
| * | | | | | Updated order of settleMatchedOrders to align with settleOrder | Greg Hysen | 2018-05-19 | 3 | -8/+8 |
| | | | | | | |||||
| * | | | | | IExchange inherits from all other interfaces (in the same order as Exchange ↵ | Greg Hysen | 2018-05-19 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | inherits Mixins) | ||||
| * | | | | | Renamed takerAssetFilledAmount to orderFilledAmount to more easily ↵ | Greg Hysen | 2018-05-19 | 3 | -37/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | distinguish between fill results and order state | ||||
| * | | | | | Comments for readability in exchange core and mixin match orders | Greg Hysen | 2018-05-19 | 5 | -4/+11 |
| | | | | | | |||||
| * | | | | | Renamed "validate" functions to "assert" in mixin match. | Greg Hysen | 2018-05-19 | 5 | -21/+21 |
| | | | | | | |||||
| * | | | | | Throw if the left or right orders do not compute the correct fill results. I ↵ | Greg Hysen | 2018-05-19 | 5 | -37/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | like this better than just logging an error and failing silently. | ||||
| * | | | | | Removed redundant status checks in matchOrders. Saves gas, plus follows ↵ | Greg Hysen | 2018-05-19 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | pattern of fillOrder more closely. | ||||
| * | | | | | Token -> Asset in fillOrder spec | Greg Hysen | 2018-05-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Reordered functions in mixin exchange core -- getOrderInfo is at the bottom | Greg Hysen | 2018-05-19 | 2 | -77/+77 |
| | | | | | | |||||
| * | | | | | Changes based on style guidelines put out by Amir | Greg Hysen | 2018-05-19 | 9 | -172/+210 |
| | | | | | | |||||
| * | | | | | Reordered fund transfers for matched orders, plus added an extra sanity ↵ | Greg Hysen | 2018-05-19 | 3 | -35/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | check to order matching calculations | ||||
| * | | | | | Style changes to atomic order matching | Greg Hysen | 2018-05-19 | 11 | -306/+288 |
| | | | | | | |||||
| * | | | | | Added require reasons to MixinMatchOrders and cleaned up some comments. | Greg Hysen | 2018-05-19 | 6 | -40/+75 |
| | | | | | | |||||
| * | | | | | Updated remaining contracts to v0.4.23 | Greg Hysen | 2018-05-19 | 4 | -4/+4 |
| | | | | | | |||||
| * | | | | | Removed isRoundingError from mixin header | Greg Hysen | 2018-05-19 | 1 | -10/+1 |
| | | | | | | |||||
| * | | | | | Atomic Order Matching - Tests | Greg Hysen | 2018-05-19 | 10 | -33/+1412 |
| | | | | | | |||||
| * | | | | | Atomic Order Matching - Smart Contracts. | Greg Hysen | 2018-05-19 | 13 | -114/+957 |
| | | | | | | |||||
* | | | | | | merge development | Fabio Berger | 2018-05-22 | 87 | -45/+125 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | Merge pull request #597 from 0xProject/make-promises-safe | Alex Browne | 2018-05-18 | 87 | -37/+126 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Use make-promises-safe to catch unhandled rejections in tests | ||||
| | * | | | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 87 | -37/+126 |
| | | | | | |||||
| * | | | | Remove "Order utils" from menu for now | Fabio Berger | 2018-05-17 | 1 | -6/+0 |
| | | | | | |||||
| * | | | | Fix top tokens key | Brandon Millman | 2018-05-17 | 1 | -2/+8 |
| |/ / / | |||||
| * | | | Improve about page descriptions | fragosti | 2018-05-17 | 7 | -45/+9 |
| | | | | |||||
* | | | | Merge pull request #598 from 0xProject/feature/website/mobile-optimize | Brandon Millman | 2018-05-19 | 19 | -94/+297 |
|\ \ \ \ | | | | | | | | | | | Mobile optimize the portal layout | ||||
| * | | | | Prettier | Brandon Millman | 2018-05-19 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Change number of columns in relayer index for small screens | Brandon Millman | 2018-05-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Wallet instead of balances for small screens | Brandon Millman | 2018-05-19 | 1 | -23/+21 |
| | | | | | |||||
| * | | | | Close drawer when new path is chosen | Brandon Millman | 2018-05-19 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Fix styling of portal menu | Brandon Millman | 2018-05-19 | 4 | -20/+37 |
| | | | | | |||||
| * | | | | Refactor portal specific colors out of react-shared | Brandon Millman | 2018-05-19 | 12 | -25/+46 |
| | | | | | |||||
| * | | | | Add custom styling for drawer | Brandon Millman | 2018-05-19 | 3 | -16/+106 |
| | | | | | |||||
| * | | | | Fix key issue for portal routes | Brandon Millman | 2018-05-19 | 1 | -1/+7 |
| | | | | | |||||
| * | | | | Fix responsiveness broken in rebase | Brandon Millman | 2018-05-19 | 1 | -13/+33 |
| | | | | | |||||
| * | | | | Set up scaffolding for new drawer | Brandon Millman | 2018-05-19 | 3 | -9/+28 |
| | | | | | |||||
| * | | | | Hide wallet component for small screens | Brandon Millman | 2018-05-19 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Fix token link key | Brandon Millman | 2018-05-19 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | Modulate number of columns based on screenwidth | Brandon Millman | 2018-05-19 | 2 | -4/+19 |
|/ / / / | |||||
* | | | | Fix prettier | Brandon Millman | 2018-05-19 | 19 | -7366/+7564 |
| | | | | |||||
* | | | | Merge pull request #583 from 0xProject/bug/contracts/erc721-encoded-pad | Jacob Evans | 2018-05-18 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | ERC721Proxy Pad to 32 if asset ids are small | ||||
| * | | | | Pad to 32 if asset ids are small | Jacob Evans | 2018-05-10 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Change my title to clarify | fragosti | 2018-05-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #596 from ↵ | Francesco Agosti | 2018-05-18 | 6 | -43/+104 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/website/weth-eth-conversion-errors Show error messages in the wrapped ether item | ||||
| * | | | | | Center all the things | fragosti | 2018-05-18 | 4 | -11/+46 |
| | | | | | | |||||
| * | | | | | Refactor code in response to CR feedback | fragosti | 2018-05-18 | 5 | -15/+12 |
| | | | | | | |||||
| * | | | | | Remove duplicate function call to validate | fragosti | 2018-05-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Show error messages in the wrapped ether item | fragosti | 2018-05-18 | 6 | -23/+52 |
| | | | | | | |||||
| * | | | | | Improve about page descriptions | fragosti | 2018-05-18 | 1 | -3/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #586 from 0xProject/feature/website/manage-wallet-2 | Brandon Millman | 2018-05-18 | 11 | -114/+502 |
|\ \ \ \ \ | | | | | | | | | | | | | Manage your wallet section of portal | ||||
| * | | | | | Fix tslint false positive | Brandon Millman | 2018-05-18 | 1 | -2/+9 |
| | | | | | | |||||
| * | | | | | Fix spread | Brandon Millman | 2018-05-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Refactor account management itmes | Brandon Millman | 2018-05-18 | 1 | -74/+70 |
| | | | | | | |||||
| * | | | | | Add loading component | Brandon Millman | 2018-05-18 | 3 | -50/+77 |
| | | | | | | |||||
| * | | | | | Refactor a bunch of layouts into their own files | Brandon Millman | 2018-05-18 | 6 | -139/+176 |
| | | | | | | |||||
| * | | | | | Add portal layout component | Brandon Millman | 2018-05-18 | 1 | -31/+36 |
| | | | | | | |||||
| * | | | | | Get rid of extra curly brackets | Brandon Millman | 2018-05-18 | 1 | -9/+9 |
| | | | | | | |||||
| * | | | | | Fix lint error | Brandon Millman | 2018-05-18 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Fix comments | Brandon Millman | 2018-05-18 | 3 | -4/+10 |
| | | | | | | |||||
| * | | | | | Wait for blockchain to display the account management routes | Brandon Millman | 2018-05-18 | 4 | -47/+78 |
| | | | | | | |||||
| * | | | | | Fix linter errors and relayer index reloading | Brandon Millman | 2018-05-18 | 3 | -14/+17 |
| | | | | | | |||||
| * | | | | | Trade direct route | Brandon Millman | 2018-05-18 | 2 | -44/+37 |
| | | | | | | |||||
| * | | | | | Add manage you wallet footer | Brandon Millman | 2018-05-18 | 1 | -24/+41 |
| | | | | | | |||||
| * | | | | | Add props to back button | Brandon Millman | 2018-05-18 | 1 | -9/+13 |
| | | | | | | |||||
| * | | | | | Back button and title components | Brandon Millman | 2018-05-18 | 3 | -64/+112 |
| | | | | | | |||||
| * | | | | | Implement new menu styling | Brandon Millman | 2018-05-18 | 2 | -4/+95 |
| | | | | | | |||||
| * | | | | | Add menu | Brandon Millman | 2018-05-18 | 2 | -20/+41 |
| | | | | | | |||||
| * | | | | | Add routes | Brandon Millman | 2018-05-18 | 1 | -2/+105 |
|/ / / / / | |||||
* | | | | | Update yarn.lock | Fabio Berger | 2018-05-17 | 1 | -15/+3 |
| | | | | | |||||
* | | | | | Merge branch 'development' into v2-prototype | Fabio Berger | 2018-05-16 | 236 | -1184/+2191 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (29 commits) Do not remove artifacts when running `clean` fix style errors Fix circular dependency Add my profile image to images Add myself to about page Add dogfood configs to website Revert to lerna:run lint Do lint sequentially Exclude monorepo-scripts from tslint as test Fix prettier Add hover state to top tokens Change to weekly txn volume Change minimum Node version to 6.12 Document Node.js version requirement and add it to package.json Apply prettier to some files which were not formatted correctly Fix TSLint issues Fix TSLint issues Update ethereeumjs-testrpc to ganache-cli Fix infinite loop Add changelog entries for packages where executable binary exporting fixed ... # Conflicts: # packages/contracts/package.json # packages/contracts/util/formatters.ts # packages/contracts/util/signed_order_utils.ts # packages/migrations/package.json # yarn.lock | ||||
| * | | | | Do not remove artifacts when running `clean` | Fabio Berger | 2018-05-16 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #593 from 0xProject/bug/website/fix-cirular-dependency | Francesco Agosti | 2018-05-16 | 3 | -11/+13 |
| |\ \ \ | | | | | | | | | | | Fix circular dependency | ||||
| | * | | | fix style errors | fragosti | 2018-05-16 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | Fix circular dependency | fragosti | 2018-05-16 | 3 | -11/+13 |
| | | | | | |||||
| * | | | | Merge pull request #592 from 0xProject/feature/website/add-francesco-about | Francesco Agosti | 2018-05-16 | 2 | -3/+11 |
| |\ \ \ \ | | |/ / / | |/| | | | Add myself to about page | ||||
| | * | | | Add my profile image to images | fragosti | 2018-05-16 | 1 | -0/+0 |
| | | | | | |||||
| | * | | | Add myself to about page | fragosti | 2018-05-16 | 1 | -3/+11 |
| | | | | | |||||
| * | | | | Add dogfood configs to website | Brandon Millman | 2018-05-16 | 4 | -2/+10 |
| |/ / / | |||||
| * | | | Merge pull request #578 from 0xProject/document-node-version | Alex Browne | 2018-05-16 | 29 | -6/+86 |
| |\ \ \ | | |_|/ | |/| | | Document Node.js version requirement and add it to package.json | ||||
| | * | | Change minimum Node version to 6.12 | Alex Browne | 2018-05-15 | 30 | -38/+38 |
| | | | | |||||
| | * | | Document Node.js version requirement and add it to package.json | Alex Browne | 2018-05-15 | 30 | -15/+95 |
| | | | | |||||
| * | | | Merge pull request #588 from 0xProject/improvement/use-wsrun | Fabio Berger | 2018-05-15 | 73 | -469/+367 |
| |\ \ \ | | | | | | | | | | | Individual package building & watching!!! 💪 🌹 | ||||
| | * | | | Revert to lerna:run lint | Fabio Berger | 2018-05-15 | 2 | -1/+2 |
| | | | | | |||||
| | * | | | Do lint sequentially | Fabio Berger | 2018-05-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Exclude monorepo-scripts from tslint as test | Fabio Berger | 2018-05-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fix prettier | Fabio Berger | 2018-05-15 | 2 | -2/+14 |
| | | | | | |||||
| | * | | | Merge development | Fabio Berger | 2018-05-15 | 5 | -16/+54 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Add hover state to top tokens | Brandon Millman | 2018-05-15 | 1 | -10/+43 |
| | | | | | |||||
| * | | | | Change to weekly txn volume | Brandon Millman | 2018-05-15 | 2 | -4/+4 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #590 from 0xProject/fix-prettier | Alex Browne | 2018-05-15 | 2 | -2/+7 |
| |\ \ \ | | | | | | | | | | | Apply prettier to some files which were not formatted correctly | ||||
| | * | | | Apply prettier to some files which were not formatted correctly | Alex Browne | 2018-05-15 | 2 | -2/+7 |
| |/ / / | |||||
| * | | | Fix TSLint issues | Fabio Berger | 2018-05-15 | 9 | -19/+28 |
| | | | | |||||
| | * | | Merge branch 'development' into improvement/use-wsrun | Fabio Berger | 2018-05-15 | 2 | -54/+986 |
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | * development: Update ethereeumjs-testrpc to ganache-cli # Conflicts: # package.json | ||||
| * | | | Update ethereeumjs-testrpc to ganache-cli | Leonid Logvinov | 2018-05-15 | 2 | -63/+986 |
| | | | | |||||
| | * | | Fix TSLint issues | Fabio Berger | 2018-05-15 | 9 | -19/+28 |
| | | | | |||||
| | * | | Fix infinite loop | Fabio Berger | 2018-05-15 | 1 | -3/+3 |
| | | | | |||||
| | * | | Add changelog entries for packages where executable binary exporting fixed | Fabio Berger | 2018-05-15 | 3 | -0/+27 |
| | | | | |||||
| | * | | Rename bin to server in testnet-faucets since bin is no longer gitignored | Fabio Berger | 2018-05-15 | 4 | -6/+8 |
| | | | | |||||
| | * | | Fix sra-report binary | Fabio Berger | 2018-05-15 | 2 | -1/+3 |
| | | | | |||||
| | * | | rename build:watch to watch and remove build from docs:stage | Fabio Berger | 2018-05-15 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fix sol-compiler binary so it can be called directly from packages | Fabio Berger | 2018-05-15 | 5 | -4/+6 |
| | | | | |||||
| | * | | Fix abi-gen binary so it can be called directly from packages | Fabio Berger | 2018-05-15 | 10 | -11/+17 |
| | | | | |||||
| | * | | Remove build from docs:stage commands | Fabio Berger | 2018-05-15 | 7 | -7/+7 |
| | | | | |||||
| | * | | Move from using lerna multi-package commands to wsrun, update README's ↵ | Fabio Berger | 2018-05-15 | 63 | -449/+286 |
| |/ / | | | | | | | | | | accordingly | ||||
| * | | Merge branch 'development' of github.com:0xProject/0x-monorepo into development | Fabio Berger | 2018-05-14 | 153 | -600/+655 |
| |\ \ | | | | | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x-monorepo: Add missing type definitions | ||||
| | * \ | Merge pull request #585 from 0xProject/feature/typedef | Leonid Logvinov | 2018-05-14 | 153 | -600/+655 |
| | |\ \ | | | | | | | | | | | Add missing type definitions. Enable typedef linter rule | ||||
| | | * | | Add missing type definitions | Leonid Logvinov | 2018-05-14 | 153 | -600/+655 |
| | |/ / | |||||
| * / / | Remove tslint-config as dep to monorepo-scripts to avoid circular ↵ | Fabio Berger | 2018-05-14 | 2 | -2/+1 |
| |/ / | | | | | | | | | | dependency. Since monorepo-scripts is only expected to be used from within the monorepo, we reference tslint-config w/ a relative path | ||||
* | | | 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 | 418 | -9053/+26371 |
|\| | | |/ |/| | |||||
| * | Merge pull request #579 from 0xProject/breakUp0xjs | Fabio Berger | 2018-05-12 | 172 | -1420/+16417 |
| |\ | | | | | | | Split 0x.js into: contract-wrappers & order-watcher | ||||
| | * | Add missing .gitkeeps | Fabio Berger | 2018-05-12 | 2 | -0/+0 |
| | | | |||||
| | * | Revert "Remove gitkeeps" | Fabio Berger | 2018-05-12 | 13 | -0/+0 |
| | | | | | | | | | | | | This reverts commit 3f6876c4199353b597e1b0ebcf3907d6b8cce284. | ||||
| | * | improve wording | Fabio Berger | 2018-05-12 | 1 | -1/+1 |
| | | | |||||
| | * | Remove gitkeeps | Fabio Berger | 2018-05-11 | 13 | -0/+0 |
| | | | |||||
| | * | Create coverage dir if doesn't exist | Fabio Berger | 2018-05-11 | 2 | -0/+8 |
| | | | |||||
| | * | 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 |
| | | | |||||
| | * | Revert throw conditions since it messes with the expected test timing | Fabio Berger | 2018-05-11 | 1 | -15/+3 |
| | | | |||||
| | * | Revert back to hack, we need the configured web3Wrapper | Fabio Berger | 2018-05-11 | 1 | -6/+7 |
| | | | |||||
| | * | Add comment to TransactionReceiptWithDecodedLogs explaining that it doesn't ↵ | Fabio Berger | 2018-05-11 | 1 | -0/+5 |
| | | | | | | | | | | | | always return "decodedLogs" | ||||
| | * | Get rid of hack | Fabio Berger | 2018-05-11 | 1 | -7/+6 |
| | | | |||||
| | * | Get networkId from web3Wrapper | Fabio Berger | 2018-05-11 | 2 | -3/+3 |
| | | | |||||
| | * | Throw if tx reverts | Fabio Berger | 2018-05-11 | 1 | -3/+15 |
| | | | |||||
| | * | Remove unused methods and imports | Fabio Berger | 2018-05-11 | 2 | -31/+1 |
| | | | |||||
| | * | Prettier ignore artifact files | Fabio Berger | 2018-05-11 | 1 | -0/+2 |
| | | | |||||
| | * | Add compiler dep | Fabio Berger | 2018-05-11 | 1 | -0/+1 |
| | | | |||||
| | * | Update yarn.lock | Fabio Berger | 2018-05-11 | 1 | -22/+0 |
| | | | |||||
| | * | Fix version | Fabio Berger | 2018-05-11 | 2 | -2/+2 |
| | | | |||||
| | * | remove unused modules | Fabio Berger | 2018-05-11 | 2 | -36/+0 |
| | | | |||||
| | * | Fix deps | Fabio Berger | 2018-05-11 | 2 | -2/+2 |
| | | | |||||
| | * | Fix prettier | Fabio Berger | 2018-05-11 | 4 | -10/+8 |
| | | | |||||
| | * | Update artifacts | Fabio Berger | 2018-05-11 | 24 | -7657/+5961 |
| | | | |||||
| | * | Update yarn.lock | Fabio Berger | 2018-05-11 | 1 | -0/+22 |
| | | | |||||
| | * | Update global_hooks | Fabio Berger | 2018-05-11 | 2 | -6/+28 |
| | | | |||||
| | * | Remove legacy test | Fabio Berger | 2018-05-11 | 1 | -75/+0 |
| | | | |||||
| | * | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-11 | 119 | -1108/+923 |
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Fix ganache subprovider config Fix a bug in compiler config precedence Fix linter errors Fix templates Remove unused deployer docs configs Add a legacy endpoint for the deployer Add a check for compiler output Add a comment Put ARTIFACTS_VERSION in a config Improve a comment Remove _applyDefaultsToDeployTxDataAsync Add a HACK comment Fix linter issues Rename deployer to sol-compiler Remove deployer Remove deployer from 0x.js and migrations Configure migrations with a compiler.json Remove deployer from metacoin and contract tests Update wallet footer and add remove token functionality # Conflicts: # .gitignore # packages/0x.js/package.json # packages/0x.js/src/0x.ts # packages/contracts/package.json # packages/contracts/test/multi_sig_with_time_lock.ts # packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts # packages/contracts/util/artifacts.ts # packages/deployer/test/deployer_test.ts # packages/migrations/package.json | ||||
| * | | Merge pull request #574 from 0xProject/feature/rm-rf-deployer | Leonid Logvinov | 2018-05-11 | 129 | -1206/+890 |
| |\ \ | | | | | | | | | Remove @0xproject/deployer.Deployer. Make contracts able to deploy themselves | ||||
| | * | | Fix ganache subprovider config | Leonid Logvinov | 2018-05-11 | 3 | -2/+5 |
| | | | | |||||
| | * | | Fix a bug in compiler config precedence | Leonid Logvinov | 2018-05-11 | 1 | -2/+4 |
| | | | | |||||
| | * | | Fix linter errors | Leonid Logvinov | 2018-05-11 | 12 | -12/+12 |
| | | | | |||||
| | * | | Fix templates | Leonid Logvinov | 2018-05-10 | 7 | -7/+8 |
| | | | | |||||
| | * | | Remove unused deployer docs configs | Leonid Logvinov | 2018-05-10 | 30 | -130/+120 |
| | | | | |||||
| | * | | Add a legacy endpoint for the deployer | Leonid Logvinov | 2018-05-10 | 2 | -0/+5 |
| | | | | |||||
| | * | | Add a check for compiler output | Leonid Logvinov | 2018-05-10 | 3 | -2/+4 |
| | | | | |||||
| | * | | Add a comment | Leonid Logvinov | 2018-05-10 | 1 | -0/+2 |
| | | | | |||||
| | * | | Put ARTIFACTS_VERSION in a config | Leonid Logvinov | 2018-05-10 | 2 | -1/+2 |
| | | | | |||||
| | * | | Improve a comment | Leonid Logvinov | 2018-05-10 | 1 | -21/+21 |
| | | | | |||||
| | * | | Remove _applyDefaultsToDeployTxDataAsync | Leonid Logvinov | 2018-05-10 | 4 | -25/+13 |
| | | | | |||||
| | * | | Add a HACK comment | Leonid Logvinov | 2018-05-10 | 1 | -0/+2 |
| | | | | |||||
| | * | | Fix linter issues | Leonid Logvinov | 2018-05-10 | 49 | -183/+119 |
| | | | | |||||
| | * | | Rename deployer to sol-compiler | Leonid Logvinov | 2018-05-10 | 66 | -179/+142 |
| | | | | |||||
| | * | | Remove deployer | Leonid Logvinov | 2018-05-10 | 10 | -549/+16 |
| | | | | |||||
| | * | | Remove deployer from 0x.js and migrations | Leonid Logvinov | 2018-05-10 | 11 | -58/+161 |
| | | | | |||||
| | * | | Configure migrations with a compiler.json | Leonid Logvinov | 2018-05-10 | 3 | -6/+23 |
| | | | | |||||
| | * | | Remove deployer from metacoin and contract tests | Leonid Logvinov | 2018-05-10 | 28 | -204/+406 |
| | | | | |||||
| * | | | Merge pull request #580 from 0xProject/feature/website/remove-tokens | Brandon Millman | 2018-05-11 | 2 | -12/+69 |
| |\ \ \ | | |/ / | |/| | | Update wallet footer and add remove token functionality | ||||
| | * | | Update wallet footer and add remove token functionality | Brandon Millman | 2018-05-10 | 2 | -12/+69 |
| | | | | |||||
| | | * | Add missing version directory to path | Fabio Berger | 2018-05-11 | 2 | -2/+2 |
| | | | | |||||
| | | * | Add artifacts to clean command | Fabio Berger | 2018-05-11 | 8 | -8/+8 |
| | | | | |||||
| | | * | Remove unnecessary compile command | Fabio Berger | 2018-05-11 | 1 | -1/+0 |
| | | | | |||||
| | | * | Standardize gitignores and remove `migrations/artifacts` | Fabio Berger | 2018-05-11 | 1 | -7/+6 |
| | | | | |||||
| | | * | Commit v1 artifacts to migrations package and remove compile step from prebuild | Fabio Berger | 2018-05-11 | 26 | -1/+7686 |
| | | | | |||||
| | | * | Replace mkdir with mkdirp so it also created any missing intermediate ↵ | Fabio Berger | 2018-05-11 | 4 | -3/+6 |
| | | | | | | | | | | | | | | | | directories | ||||
| | | * | Fix path to artifacts | Fabio Berger | 2018-05-11 | 2 | -2/+2 |
| | | | | |||||
| | | * | Fix tslint errors | Fabio Berger | 2018-05-10 | 2 | -2/+2 |
| | | | | |||||
| | | * | Add missing DummyToken | Fabio Berger | 2018-05-10 | 1 | -1/+1 |
| | | | |