Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add senderAddress to order schema | Fabio Berger | 2018-05-25 | 2 | -0/+3 |
* | Merge pull request #617 from 0xProject/feature/no-coverage-ci-contracts | Leonid Logvinov | 2018-05-25 | 2 | -9/+1 |
|\ | |||||
| * | Disable contracts coverage on CI | Leonid Logvinov | 2018-05-25 | 2 | -9/+1 |
* | | Merge pull request #607 from 0xProject/feature/website/onboarding-setup | Francesco Agosti | 2018-05-25 | 17 | -41/+420 |
|\ \ | |||||
| * | | Improve OnboardingFlow API and typescript types | fragosti | 2018-05-25 | 4 | -14/+27 |
| * | | Address PR feedback | fragosti | 2018-05-25 | 8 | -38/+54 |
| * | | Undo change to react-highlight | fragosti | 2018-05-25 | 1 | -1/+0 |
| * | | Fix build errors | fragosti | 2018-05-25 | 3 | -13/+14 |
| * | | Fix issue where modal can be out of sync with app state | fragosti | 2018-05-25 | 7 | -18/+56 |
| * | | Basic onboarding flow infrastructure set up | fragosti | 2018-05-25 | 17 | -38/+350 |
|/ / | |||||
* | | Merge pull request #612 from 0xProject/feature/website/add-redux-devtools | Francesco Agosti | 2018-05-25 | 3 | -1/+7 |
|\ \ | |/ |/| | |||||
| * | Move to deps from devDeps and use in development only | fragosti | 2018-05-23 | 2 | -2/+2 |
| * | Add redux-devtools-extension to project | fragosti | 2018-05-23 | 3 | -2/+8 |
* | | Merge pull request #615 from 0xProject/refactor/json-schemas/for-v2 | Fabio Berger | 2018-05-25 | 16 | -112/+83 |
|\ \ | |||||
| * | | Change all `wsrun` commands so that they fast-exit (e.g any one failing stops... | Fabio Berger | 2018-05-24 | 1 | -6/+6 |
| * | | Have source-map-loader ignore node_modules packages | Fabio Berger | 2018-05-24 | 1 | -1/+6 |
| * | | Revert to an earlier version that works | Fabio Berger | 2018-05-24 | 8 | -11/+11 |
| * | | Force hex to have at least two hex values after the prefix, but it could be t... | Fabio Berger | 2018-05-24 | 2 | -2/+2 |
| * | | Fix Hex regex and tests | Fabio Berger | 2018-05-24 | 2 | -3/+4 |
| * | | Remove the caret so it actually installs this version | Fabio Berger | 2018-05-24 | 8 | -7/+16 |
| * | | Merge branch 'v2-prototype' into refactor/json-schemas/for-v2 | Fabio Berger | 2018-05-24 | 1 | -0/+1 |
| |\ \ | |||||
| * | | | Add CHANGELOG entry | Fabio Berger | 2018-05-24 | 1 | -0/+10 |
| * | | | Updated Order, SignedOrder schemas, removed ECSignature schema types and adde... | Fabio Berger | 2018-05-24 | 5 | -98/+44 |
| * | | | Bump all dependencies on json-schemas down a patch version so that they don't... | Fabio Berger | 2018-05-24 | 7 | -7/+7 |
* | | | | Merge pull request #613 from 0xProject/check-tx-receipt-status | Alex Browne | 2018-05-24 | 21 | -94/+144 |
|\ \ \ \ | |||||
| * | | | | Change error message for awaitTransactionSuccessAsync | Alex Browne | 2018-05-24 | 1 | -1/+1 |
| * | | | | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 21 | -94/+144 |
| |/ / / | |||||
* | | | | Merge pull request #603 from 0xProject/feature/website/wallet-flex-box | Brandon Millman | 2018-05-24 | 4 | -129/+161 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Use visibility property instead of placeholder div in wrap ether item | Brandon Millman | 2018-05-24 | 1 | -7/+4 |
| * | | | Merge branch 'v2-prototype' into feature/website/wallet-flex-box | Brandon Millman | 2018-05-24 | 233 | -1250/+2528 |
| |\| | | |||||
| * | | | Add missing key | Brandon Millman | 2018-05-22 | 1 | -3/+6 |
| * | | | Use flexbox for wrapped ether item | Brandon Millman | 2018-05-22 | 1 | -21/+29 |
| * | | | Re add wrapped ether item | Brandon Millman | 2018-05-22 | 1 | -7/+24 |
| * | | | Rewrite balance rows using flex box | Brandon Millman | 2018-05-22 | 3 | -122/+129 |
* | | | | Merge pull request #614 from 0xProject/bug/prettier/ignore-v2-artifacts | Fabio Berger | 2018-05-24 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Ignore v2 artifacts | Jacob Evans | 2018-05-24 | 1 | -0/+1 |
|/ / / | |||||
* | | | Add missing dep to website | Fabio Berger | 2018-05-24 | 1 | -0/+1 |
* | | | Merge pull request #589 from 0xProject/feature/truffle-sol-cov | Fabio Berger | 2018-05-24 | 55 | -229/+615 |
|\ \ \ | |||||
| * | | | Upgrade solidity parser | Leonid Logvinov | 2018-05-24 | 2 | -4/+4 |
| * | | | Fix trace test | Leonid Logvinov | 2018-05-24 | 1 | -1/+1 |
| * | | | Fix linter issues | Leonid Logvinov | 2018-05-24 | 2 | -4/+5 |
| * | | | Move contract utils | Leonid Logvinov | 2018-05-24 | 5 | -19/+19 |
| * | | | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-24 | 55 | -424/+428 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #611 from 0xProject/feature/remove-0x-from=-website | Leonid Logvinov | 2018-05-24 | 24 | -119/+136 |
|\ \ \ \ | |||||
| * | | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | 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 v2-proto... | Fabio Berger | 2018-05-23 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | Leonid Logvinov | 2018-05-23 | 2 | -3/+5 |
|/ / / / / | |||||
| * | | | | 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 |
| |\ \ \ \ | |||||
| * | | | | | 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 |
| | | * | | | Fix NameResolver | Leonid Logvinov | 2018-05-24 | 1 | -4/+6 |
| | | * | | | Address feedback | Leonid Logvinov | 2018-05-23 | 5 | -27/+39 |
| | | * | | | Parse compiler.json in SolCompilerArtifactsAdapter | Leonid Logvinov | 2018-05-23 | 2 | -6/+13 |
| | | * | | | Add a more verbose comment for self-destruct | Leonid Logvinov | 2018-05-23 | 1 | -1/+5 |
| | | * | | | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-23 | 0 | -0/+0 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge branch 'development' into v2-prototype | Leonid Logvinov | 2018-05-23 | 81 | -262/+556 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Publish | Leonid Logvinov | 2018-05-23 | 30 | -230/+230 |
| * | | | | | 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 |
| | | * | | | Fix depth tracking in a tracer | Leonid Logvinov | 2018-05-23 | 1 | -1/+16 |
| | | * | | | Fix sol-compiler version | Leonid Logvinov | 2018-05-23 | 1 | -1/+1 |
| | | * | | | Fix sol-cov tests | Leonid Logvinov | 2018-05-23 | 2 | -2/+4 |
| | | * | | | Fix a bug in CALL-like opcode handling | Leonid Logvinov | 2018-05-23 | 3 | -11/+22 |
| | | * | | | Remove trace.json | Leonid Logvinov | 2018-05-23 | 1 | -3227/+0 |
| | | * | | | Suppport subcalls in constructor | Leonid Logvinov | 2018-05-23 | 2 | -12/+28 |
| | | * | | | Use BlockParamLiteral.Latest | Leonid Logvinov | 2018-05-23 | 2 | -4/+8 |
| | | * | | | Address feedback | Leonid Logvinov | 2018-05-23 | 8 | -35/+23 |
| | | * | | | Use loglevel instead of verbose flag | Leonid Logvinov | 2018-05-23 | 3 | -15/+17 |
| | | * | | | Publish | Leonid Logvinov | 2018-05-23 | 30 | -230/+229 |
| | | * | | | Updated CHANGELOGS | Leonid Logvinov | 2018-05-23 | 1 | -0/+1 |
| | | * | | | Updated CHANGELOGS | Leonid Logvinov | 2018-05-23 | 50 | -30/+324 |
| | | * | | | Change publish command name | Leonid Logvinov | 2018-05-23 | 1 | -2/+2 |
| | | * | | | Fix import paths | Leonid Logvinov | 2018-05-23 | 3 | -3/+3 |
| | | * | | | Refactor ContractData lookup | Leonid Logvinov | 2018-05-23 | 2 | -34/+33 |
| | | * | | | Remove a comment | Leonid Logvinov | 2018-05-23 | 1 | -1/+0 |
| | | * | | | Use a hidden directory for temp artifacts | Leonid Logvinov | 2018-05-23 | 2 | -2/+1 |
| | | * | | | Match class names with file names | Leonid Logvinov | 2018-05-23 | 4 | -3/+3 |
| | | * | | | Improve a CHANGELOG comment | Leonid Logvinov | 2018-05-23 | 1 | -1/+1 |
| | | * | | | Improve a CHANGELOG comment | Leonid Logvinov | 2018-05-23 | 1 | -1/+1 |
| | | * | | | Rename ZeroExArtifactAdapter to SolCompilerArtifactAdapter | Leonid Logvinov | 2018-05-23 | 6 | -11/+11 |
| | | * | | | Assign then pass | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
| | | * | | | Assign then return | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
| | | * | | | Introduce CONFIG_FILE | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
| | | * | | | Remove web3Factory.create and remove dev-tools dependency on sol-cov | Leonid Logvinov | 2018-05-23 | 25 | -846/+3294 |
| | | * | | | Add CHANGELOG entries | Leonid Logvinov | 2018-05-23 | 8 | -0/+836 |
| | | * | | | Support all opcodes in a trace parser | Leonid Logvinov | 2018-05-23 | 4 | -55/+45 |
| | | * | | | Make sol-cov work with truffle and other artifact adapters | Leonid Logvinov | 2018-05-23 | 14 | -89/+354 |
| | | * | | | Only look at *.sol files in NameResolver | Leonid Logvinov | 2018-05-23 | 1 | -2/+5 |
| | | * | | | Fix a bug in FS resolver causing it to try reading directories | Leonid Logvinov | 2018-05-23 | 1 | -1/+1 |
| | | * | | | Add solcVersion to CompilerOpts | Leonid Logvinov | 2018-05-23 | 3 | -4/+11 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto... | Fabio Berger | 2018-05-23 | 16 | -175/+419 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #601 from 0xProject/contracts-test-fixes | Alex Browne | 2018-05-23 | 16 | -175/+419 |
| |\ \ \ \ \ | |||||
| | * | | | | | 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 v2-proto... | Fabio Berger | 2018-05-23 | 13 | -41/+87 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #605 from 0xProject/fix/multiple/build-errors | Fabio Berger | 2018-05-23 | 13 | -41/+87 |
| |\ \ \ \ \ | |||||
| | * | | | | | 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 |
| |_|/ / |/| | | | |||||
* | | | | 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 |
| |\ \ | |||||
| | * | | 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 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-16 | 35 | -16/+114 |
| | |\ \ \ | |||||
| | * | | | | 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 pas... | Fabio Berger | 2018-05-16 | 2 | -1/+78 |
| | * | | | | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Removed debug line from chai_setup. Its failing linter and does not appear to... | Greg Hysen | 2018-05-22 | 1 | -8/+0 |
| * | | | | | | 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 t... | Greg Hysen | 2018-05-19 | 3 | -131/+131 |
| * | | | | | | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ... | Greg Hysen | 2018-05-19 | 2 | -138/+126 |
| * | | | | | | 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 |
| * | | | | | | 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 i... | Greg Hysen | 2018-05-19 | 1 | -6/+10 |
| * | | | | | | Renamed takerAssetFilledAmount to orderFilledAmount to more easily distinguis... | Greg Hysen | 2018-05-19 | 3 | -37/+37 |
| * | | | | | | 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 |
| * | | | | | | Removed redundant status checks in matchOrders. Saves gas, plus follows patte... | Greg Hysen | 2018-05-19 | 1 | -8/+0 |
| * | | | | | | 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 check... | Greg Hysen | 2018-05-19 | 3 | -35/+49 |
| * | | | | | | 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 | 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 |
|\ \ \ \ | |||||
| * | | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 0xProject/feature/website/weth-eth-conversion-er... | Francesco Agosti | 2018-05-18 | 6 | -43/+104 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | 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 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 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 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | 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 |
| |\ \ \ | |||||
| | * | | | 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 |
| | |\ \ \ | | |/ / / | |/| | | |