aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move readFirst4 to LibBytesAmir Bandeali2018-05-255-39/+53
|
* Add old MultiSig to previous contracts, cleanup file structureAmir Bandeali2018-05-257-16/+16
|
* Fix buildAmir Bandeali2018-05-256-13/+882
|
* Address feedback, rename contract to AssetProxyOwnerAmir Bandeali2018-05-256-33/+37
|
* Update multisig tests and utilsAmir Bandeali2018-05-254-253/+355
|
* Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress to use a ↵Amir Bandeali2018-05-251-18/+48
| | | | mapping of registered proxies
* Merge pull request #617 from 0xProject/feature/no-coverage-ci-contractsLeonid Logvinov2018-05-252-9/+1
|\ | | | | Disable contracts coverage on CI
| * Disable contracts coverage on CILeonid Logvinov2018-05-252-9/+1
| |
* | Merge pull request #607 from 0xProject/feature/website/onboarding-setupFrancesco Agosti2018-05-2517-41/+420
|\ \ | | | | | | Set up structure for onboarding flow along with basic step 0
| * | Improve OnboardingFlow API and typescript typesfragosti2018-05-254-14/+27
| | |
| * | Address PR feedbackfragosti2018-05-258-38/+54
| | |
| * | Undo change to react-highlightfragosti2018-05-251-1/+0
| | |
| * | Fix build errorsfragosti2018-05-253-13/+14
| | |
| * | Fix issue where modal can be out of sync with app statefragosti2018-05-257-18/+56
| | |
| * | Basic onboarding flow infrastructure set upfragosti2018-05-2517-38/+350
|/ /
* | Merge pull request #612 from 0xProject/feature/website/add-redux-devtoolsFrancesco Agosti2018-05-253-1/+7
|\ \ | |/ |/| Add redux-devtools-extension to project
| * Move to deps from devDeps and use in development onlyfragosti2018-05-232-2/+2
| |
| * Add redux-devtools-extension to projectfragosti2018-05-233-2/+8
| |
* | Merge pull request #615 from 0xProject/refactor/json-schemas/for-v2Fabio Berger2018-05-2516-112/+83
|\ \ | | | | | | Refactor order schemas in json-schemas for v2
| * | Change all `wsrun` commands so that they fast-exit (e.g any one failing ↵Fabio Berger2018-05-241-6/+6
| | | | | | | | | | | | stops the entire process from executing)
| * | Have source-map-loader ignore node_modules packagesFabio Berger2018-05-241-1/+6
| | |
| * | Revert to an earlier version that worksFabio Berger2018-05-248-11/+11
| | |
| * | Force hex to have at least two hex values after the prefix, but it could be ↵Fabio Berger2018-05-242-2/+2
| | | | | | | | | | | | two zeros
| * | Fix Hex regex and testsFabio Berger2018-05-242-3/+4
| | |
| * | Remove the caret so it actually installs this versionFabio Berger2018-05-248-7/+16
| | |
| * | Merge branch 'v2-prototype' into refactor/json-schemas/for-v2Fabio Berger2018-05-241-0/+1
| |\ \ | | | | | | | | | | | | | | | | * v2-prototype: Ignore v2 artifacts
| * | | Add CHANGELOG entryFabio Berger2018-05-241-0/+10
| | | |
| * | | Updated Order, SignedOrder schemas, removed ECSignature schema types and ↵Fabio Berger2018-05-245-98/+44
| | | | | | | | | | | | | | | | added Hex basic type
| * | | Bump all dependencies on json-schemas down a patch version so that they ↵Fabio Berger2018-05-247-7/+7
| | | | | | | | | | | | | | | | don't auto-magically get upgraded to the next version during the next publish
* | | | Merge pull request #613 from 0xProject/check-tx-receipt-statusAlex Browne2018-05-2421-94/+144
|\ \ \ \ | | | | | | | | | | Check transaction receipt status
| * | | | Change error message for awaitTransactionSuccessAsyncAlex Browne2018-05-241-1/+1
| | | | |
| * | | | Check transaction receipt status codes where applicableAlex Browne2018-05-2421-94/+144
| |/ / /
* | | | Merge pull request #603 from 0xProject/feature/website/wallet-flex-boxBrandon Millman2018-05-244-129/+161
|\ \ \ \ | |_|/ / |/| | | Improve wallet layout using flexbox
| * | | Use visibility property instead of placeholder div in wrap ether itemBrandon Millman2018-05-241-7/+4
| | | |
| * | | Merge branch 'v2-prototype' into feature/website/wallet-flex-boxBrandon Millman2018-05-24233-1250/+2528
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (95 commits) Add missing dep to website Upgrade solidity parser Fix trace test Fix linter issues Move contract utils Fix prettier Fix NameResolver Fix prettier Remove 0x.js as a dependency from website Enable 0x.js tests Fix small bug in order-utils Address feedback Fix Tslint error caused by "PromiseLike" value Fix Tslint error caused by "PromiseLike" value Update dogfood url fix contract-wrappers version Parse compiler.json in SolCompilerArtifactsAdapter Fix TokenTransferProxy artifact name since it's now suffixed with _v1 Update yarn.lock Fix signature verification test ...
| * | | Add missing keyBrandon Millman2018-05-221-3/+6
| | | |
| * | | Use flexbox for wrapped ether itemBrandon Millman2018-05-221-21/+29
| | | |
| * | | Re add wrapped ether itemBrandon Millman2018-05-221-7/+24
| | | |
| * | | Rewrite balance rows using flex boxBrandon Millman2018-05-223-122/+129
| | | |
* | | | Merge pull request #614 from 0xProject/bug/prettier/ignore-v2-artifactsFabio Berger2018-05-241-0/+1
|\ \ \ \ | |_|/ / |/| | | Ignore v2 artifacts
| * | | Ignore v2 artifactsJacob Evans2018-05-241-0/+1
|/ / /
* | | Add missing dep to websiteFabio Berger2018-05-241-0/+1
| | |
* | | Merge pull request #589 from 0xProject/feature/truffle-sol-covFabio Berger2018-05-2455-229/+615
|\ \ \ | | | | | | | | Sol-cov artifact Adapters (truffle)
| * | | Upgrade solidity parserLeonid Logvinov2018-05-242-4/+4
| | | |
| * | | Fix trace testLeonid Logvinov2018-05-241-1/+1
| | | |
| * | | Fix linter issuesLeonid Logvinov2018-05-242-4/+5
| | | |
| * | | Move contract utilsLeonid Logvinov2018-05-245-19/+19
| | | |
| * | | Merge branch 'v2-prototype' into feature/truffle-sol-covLeonid Logvinov2018-05-2455-424/+428
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #611 from 0xProject/feature/remove-0x-from=-websiteLeonid Logvinov2018-05-2424-119/+136
|\ \ \ \ | | | | | | | | | | Remove 0x.js as a dependency from website
| * | | | Fix prettierLeonid Logvinov2018-05-243-3/+9
| | | | |
| * | | | Fix prettierLeonid Logvinov2018-05-242-6/+2
| | | | |
| * | | | Remove 0x.js as a dependency from websiteLeonid Logvinov2018-05-2424-122/+137
|/ / / /
* | | | Merge pull request #609 from 0xProject/refactor/contracts/remove0xjsDepFabio Berger2018-05-2424-296/+275
|\ \ \ \ | | | | | | | | | | Remove 0x.js dep from Contracts
| * | | | Enable 0x.js testsFabio Berger2018-05-231-3/+1
| | | | |
| * | | | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-232-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-utilsAlex Browne2018-05-231-1/+1
| | | | |
* | | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵Fabio Berger2018-05-232-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2-prototype * 'v2-prototype' of github.com:0xProject/0x-monorepo: Update dogfood url
| * | | | | Update dogfood urlBrandon Millman2018-05-232-2/+2
| | | | | |
* | | | | | Fix Tslint error caused by "PromiseLike" valueFabio Berger2018-05-231-0/+6
|/ / / / /
| * | | | Fix Tslint error caused by "PromiseLike" valueFabio Berger2018-05-231-0/+6
| | | | |
| * | | | fix contract-wrappers versionFabio Berger2018-05-231-1/+1
| | | | |
| * | | | merge v2-prototypeFabio Berger2018-05-2382-264/+560
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Fix TokenTransferProxy artifact name since it's now suffixed with _v1Fabio Berger2018-05-233-3/+3
| | | | |
* | | | | Merge pull request #610 from 0xProject/feature/sra-report-without-0xLeonid Logvinov2018-05-232-3/+5
|\ \ \ \ \ | | | | | | | | | | | | Remove 0x.js dependency from sra-report
| * | | | | Remove 0x.js dependency from sra-reportLeonid Logvinov2018-05-232-3/+5
|/ / / / /
| * | | | Update yarn.lockFabio Berger2018-05-231-117/+0
| | | | |
| * | | | Fix signature verification testFabio Berger2018-05-231-1/+1
| | | | |
| * | | | Fix TokenTransferProxy artifact name since it's now suffixed with _v1Fabio Berger2018-05-233-3/+3
| | | | |
| * | | | Fix dep versionFabio Berger2018-05-231-1/+1
| | | | |
| * | | | Fix importFabio Berger2018-05-231-1/+1
| | | | |
| * | | | Fix await callsFabio Berger2018-05-231-12/+3
| | | | |
| * | | | Refactor etherToken test to use contract-wrappersFabio Berger2018-05-231-22/+36
| | | | |
| * | | | Fix ExchangeWrapperFabio Berger2018-05-236-14/+10
| | | | |
| * | | | Fix importsFabio Berger2018-05-232-2/+1
| | | | |
| * | | | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-2331-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
| * | | | | Update artifactFabio Berger2018-05-231-14/+14
| | | | | |
| * | | | | Fix tsutils versionFabio Berger2018-05-231-0/+6
| | | | | |
| * | | | | Remove 0x.js dep from contractsFabio Berger2018-05-2325-267/+353
| | | | | |
| | | * | | Fix NameResolverLeonid Logvinov2018-05-241-4/+6
| | | | | |
| | | * | | Address feedbackLeonid Logvinov2018-05-235-27/+39
| | | | | |
| | | * | | Parse compiler.json in SolCompilerArtifactsAdapterLeonid Logvinov2018-05-232-6/+13
| | | | | |
| | | * | | Add a more verbose comment for self-destructLeonid Logvinov2018-05-231-1/+5
| | | | | |
| | | * | | Merge branch 'v2-prototype' into feature/truffle-sol-covLeonid Logvinov2018-05-230-0/+0
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'development' into v2-prototypeLeonid Logvinov2018-05-2381-262/+556
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | PublishLeonid Logvinov2018-05-2330-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 CHANGELOGSLeonid Logvinov2018-05-231-1/+1
| | | | | |
| * | | | | Updated CHANGELOGSLeonid Logvinov2018-05-2350-30/+324
| | | | | |
| * | | | | Change publish command nameLeonid Logvinov2018-05-231-2/+2
| | | | | |
| | | * | | Fix depth tracking in a tracerLeonid Logvinov2018-05-231-1/+16
| | | | | |
| | | * | | Fix sol-compiler versionLeonid Logvinov2018-05-231-1/+1
| | | | | |
| | | * | | Fix sol-cov testsLeonid Logvinov2018-05-232-2/+4
| | | | | |
| | | * | | Fix a bug in CALL-like opcode handlingLeonid Logvinov2018-05-233-11/+22
| | | | | |
| | | * | | Remove trace.jsonLeonid Logvinov2018-05-231-3227/+0
| | | | | |
| | | * | | Suppport subcalls in constructorLeonid Logvinov2018-05-232-12/+28
| | | | | |
| | | * | | Use BlockParamLiteral.LatestLeonid Logvinov2018-05-232-4/+8
| | | | | |
| | | * | | Address feedbackLeonid Logvinov2018-05-238-35/+23
| | | | | |
| | | * | | Use loglevel instead of verbose flagLeonid Logvinov2018-05-233-15/+17
| | | | | |
| | | * | | PublishLeonid Logvinov2018-05-2330-230/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 CHANGELOGSLeonid Logvinov2018-05-231-0/+1
| | | | | |
| | | * | | Updated CHANGELOGSLeonid Logvinov2018-05-2350-30/+324
| | | | | |
| | | * | | Change publish command nameLeonid Logvinov2018-05-231-2/+2
| | | | | |
| | | * | | Fix import pathsLeonid Logvinov2018-05-233-3/+3
| | | | | |
| | | * | | Refactor ContractData lookupLeonid Logvinov2018-05-232-34/+33
| | | | | |
| | | * | | Remove a commentLeonid Logvinov2018-05-231-1/+0
| | | | | |
| | | * | | Use a hidden directory for temp artifactsLeonid Logvinov2018-05-232-2/+1
| | | | | |
| | | * | | Match class names with file namesLeonid Logvinov2018-05-234-3/+3
| | | | | |
| | | * | | Improve a CHANGELOG commentLeonid Logvinov2018-05-231-1/+1
| | | | | |
| | | * | | Improve a CHANGELOG commentLeonid Logvinov2018-05-231-1/+1
| | | | | |
| | | * | | Rename ZeroExArtifactAdapter to SolCompilerArtifactAdapterLeonid Logvinov2018-05-236-11/+11
| | | | | |
| | | * | | Assign then passLeonid Logvinov2018-05-231-1/+2
| | | | | |
| | | * | | Assign then returnLeonid Logvinov2018-05-231-1/+2
| | | | | |
| | | * | | Introduce CONFIG_FILELeonid Logvinov2018-05-231-1/+2
| | | | | |
| | | * | | Remove web3Factory.create and remove dev-tools dependency on sol-covLeonid Logvinov2018-05-2325-846/+3294
| | | | | |
| | | * | | Add CHANGELOG entriesLeonid Logvinov2018-05-238-0/+836
| | | | | |
| | | * | | Support all opcodes in a trace parserLeonid Logvinov2018-05-234-55/+45
| | | | | |
| | | * | | Make sol-cov work with truffle and other artifact adaptersLeonid Logvinov2018-05-2314-89/+354
| | | | | |
| | | * | | Only look at *.sol files in NameResolverLeonid Logvinov2018-05-231-2/+5
| | | | | |
| | | * | | Fix a bug in FS resolver causing it to try reading directoriesLeonid Logvinov2018-05-231-1/+1
| | | | | |
| | | * | | Add solcVersion to CompilerOptsLeonid Logvinov2018-05-233-4/+11
| |_|/ / / |/| | | |
* | | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵Fabio Berger2018-05-2316-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-fixesAlex Browne2018-05-2316-175/+419
| |\ \ \ \ \ | | | | | | | | | | | | | | Contracts test fixes
| | * | | | | Rename some variables in multi_sig_with_time_lock.tsAlex Browne2018-05-231-10/+10
| | | | | | |
| | * | | | | Remove extra awaitTransactionMinedAsync callsAlex Browne2018-05-231-4/+2
| | | | | | |
| | * | | | | Apply changes to test/exchange/match_orders.tsAlex Browne2018-05-221-6/+18
| | | | | | |
| | * | | | | Fix some unhandled promise rejectionsAlex Browne2018-05-222-4/+8
| | | | | | |
| | * | | | | Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-2210-155/+294
| | | | | | |
| | * | | | | Add missing blockchainLifecycle calls to contracts testsAlex Browne2018-05-2214-0/+91
| | | |_|/ / | | |/| | |
* | | | | | Fix tslint issuesFabio Berger2018-05-232-10/+13
| | | | | |
* | | | | | Add `are` to boolean naming conventionsFabio Berger2018-05-231-1/+1
|/ / / / /
* | | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵Fabio Berger2018-05-2313-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-errorsFabio Berger2018-05-2313-41/+87
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix build/lint errors and warnings
| | * | | | | Update artifactsRemco Bloemen2018-05-221-14/+14
| | | | | | |
| | * | | | | Update yarn.lockRemco Bloemen2018-05-221-3/+29
| | | | | | |
| | * | | | | Fix warnings in MetacoinRemco Bloemen2018-05-221-3/+3
| | | | | | |
| | * | | | | Upgrade UglifyJS to include ES6 supportRemco Bloemen2018-05-222-3/+10
| | | | | | |
| | * | | | | Add CancelOrder and MatchOrder typesRemco Bloemen2018-05-222-3/+15
| | | | | | |
| | * | | | | Add missing return typesRemco Bloemen2018-05-225-15/+15
| | | | | | |
| | * | | | | Ignore classnames linter ruleRemco Bloemen2018-05-221-0/+1
| | |/ / / /
* | / / / / Fix tslintFabio Berger2018-05-232-4/+4
|/ / / / /
* | | / / Fix the tsutils version, fixing ts typings issueFabio Berger2018-05-232-1/+7
| |_|/ / |/| | |
* | | | merge developmentFabio Berger2018-05-2359-124/+418
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | remove generated contract_wrappers during cleanFabio Berger2018-05-231-1/+1
| | |
| * | Merge pull request #594 from 0xProject/improvement/addCustomTslintRulesFabio Berger2018-05-2359-127/+421
| |\ \ | | | | | | | | Add more tslint rules
| | * | Make lint run in parallelFabio Berger2018-05-221-1/+1
| | | |
| | * | Improve namingFabio Berger2018-05-172-5/+6
| | | |
| | * | Disable magic number rule in more places where it isn't helping code readabilityFabio Berger2018-05-172-14/+14
| | | |
| | * | Merge branch 'development' into improvement/addCustomTslintRulesFabio Berger2018-05-1710-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/addCustomTslintRulesFabio Berger2018-05-1635-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 commentsFabio Berger2018-05-161-2/+1
| | | | | |
| | * | | | Improve nameFabio Berger2018-05-161-2/+2
| | | | | |
| | * | | | Fix TSLint rulesFabio Berger2018-05-1655-133/+278
| | | | | |
| | * | | | Enforce new rules, including no-switch-case-fall-throughFabio Berger2018-05-161-0/+3
| | | | | |
| | * | | | Implement boolean variable naming custom TSLint ruleFabio Berger2018-05-161-0/+69
| | | | | |
| | * | | | Implement custom no-magic-numbers rule that doesn't include magic numbers ↵Fabio Berger2018-05-162-1/+78
| | | | | | | | | | | | | | | | | | | | | | | | passed into BigNumber instantiations (e.g const amount = new BigNumber(5); )
| | * | | | Run linter sequentiallyFabio Berger2018-05-161-1/+1
| | | | | |
* | | | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatchingGreg Hysen2018-05-2280-538/+3162
|\ \ \ \ \ \ | | | | | | | | | | | | | | Atomic Order Matching
| * | | | | | Removed debug line from chai_setup. Its failing linter and does not appear ↵Greg Hysen2018-05-221-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to be used (it was from an old PR I merged in).
| * | | | | | Ran prettierGreg Hysen2018-05-2216-7692/+7892
| | | | | | |
| * | | | | | Added getNullFillResultsGreg Hysen2018-05-194-15/+30
| | | | | | |
| * | | | | | orderFilledAmount -> orderTakerAssetFilledAmountGreg Hysen2018-05-199-61/+61
| | | | | | |
| * | | | | | Style improvements to order matchingGreg Hysen2018-05-195-38/+27
| | | | | | |
| * | | | | | Upgraded to Solidity 0.4.24Greg Hysen2018-05-1965-206/+221
| | | | | | |
| * | | | | | Rebased against v2-prototypeGreg Hysen2018-05-1922-7557/+7708
| | | | | | |
| * | | | | | Changed calculateFillResults to public visibility so that it can be used by ↵Greg Hysen2018-05-193-131/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the Forwarding Contract.
| * | | | | | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ↵Greg Hysen2018-05-192-138/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | we dont need to pass it in on each call.
| * | | | | | Wording of calculateMatchedFillResultsGreg Hysen2018-05-191-9/+11
| | | | | | |
| * | | | | | Cleaned up interface for decoding proxy data. Added a general decoder, which ↵Greg Hysen2018-05-193-17/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | should be useful for the forwarding contract code.
| * | | | | | Style improvements to the match orders typescript test classGreg Hysen2018-05-191-18/+14
| | | | | | |
| * | | | | | Removed redundant log decode callGreg Hysen2018-05-191-2/+0
| | | | | | |
| * | | | | | The OrderInfo struct is now returned by the getOrderInfo functionGreg Hysen2018-05-198-141/+98
| | | | | | |
| * | | | | | Updated order of settleMatchedOrders to align with settleOrderGreg Hysen2018-05-193-8/+8
| | | | | | |
| * | | | | | IExchange inherits from all other interfaces (in the same order as Exchange ↵Greg Hysen2018-05-191-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | inherits Mixins)
| * | | | | | Renamed takerAssetFilledAmount to orderFilledAmount to more easily ↵Greg Hysen2018-05-193-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | distinguish between fill results and order state
| * | | | | | Comments for readability in exchange core and mixin match ordersGreg Hysen2018-05-195-4/+11
| | | | | | |
| * | | | | | Renamed "validate" functions to "assert" in mixin match.Greg Hysen2018-05-195-21/+21
| | | | | | |
| * | | | | | Throw if the left or right orders do not compute the correct fill results. I ↵Greg Hysen2018-05-195-37/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | like this better than just logging an error and failing silently.
| * | | | | | Removed redundant status checks in matchOrders. Saves gas, plus follows ↵Greg Hysen2018-05-191-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | pattern of fillOrder more closely.
| * | | | | | Token -> Asset in fillOrder specGreg Hysen2018-05-191-1/+1
| | | | | | |
| * | | | | | Reordered functions in mixin exchange core -- getOrderInfo is at the bottomGreg Hysen2018-05-192-77/+77
| | | | | | |
| * | | | | | Changes based on style guidelines put out by AmirGreg Hysen2018-05-199-172/+210
| | | | | | |
| * | | | | | Reordered fund transfers for matched orders, plus added an extra sanity ↵Greg Hysen2018-05-193-35/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | check to order matching calculations
| * | | | | | Style changes to atomic order matchingGreg Hysen2018-05-1911-306/+288
| | | | | | |
| * | | | | | Added require reasons to MixinMatchOrders and cleaned up some comments.Greg Hysen2018-05-196-40/+75
| | | | | | |
| * | | | | | Updated remaining contracts to v0.4.23Greg Hysen2018-05-194-4/+4
| | | | | | |
| * | | | | | Removed isRoundingError from mixin headerGreg Hysen2018-05-191-10/+1
| | | | | | |
| * | | | | | Atomic Order Matching - TestsGreg Hysen2018-05-1910-33/+1412
| | | | | | |
| * | | | | | Atomic Order Matching - Smart Contracts.Greg Hysen2018-05-1913-114/+957
| | |_|_|_|/ | |/| | | |
* | | | | | merge developmentFabio Berger2018-05-2287-45/+125
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge pull request #597 from 0xProject/make-promises-safeAlex Browne2018-05-1887-37/+126
| |\ \ \ \ | | |_|_|/ | |/| | | Use make-promises-safe to catch unhandled rejections in tests
| | * | | Use make-promises-safe to catch unhandled rejections in testsAlex Browne2018-05-1787-37/+126
| | | | |
| * | | | Remove "Order utils" from menu for nowFabio Berger2018-05-171-6/+0
| | | | |
| * | | | Fix top tokens keyBrandon Millman2018-05-171-2/+8
| |/ / /
| * | | Improve about page descriptionsfragosti2018-05-177-45/+9
| | | |
* | | | Merge pull request #598 from 0xProject/feature/website/mobile-optimizeBrandon Millman2018-05-1919-94/+297
|\ \ \ \ | | | | | | | | | | Mobile optimize the portal layout
| * | | | PrettierBrandon Millman2018-05-191-1/+3
| | | | |
| * | | | Change number of columns in relayer index for small screensBrandon Millman2018-05-191-1/+1
| | | | |
| * | | | Wallet instead of balances for small screensBrandon Millman2018-05-191-23/+21
| | | | |
| * | | | Close drawer when new path is chosenBrandon Millman2018-05-191-0/+7
| | | | |
| * | | | Fix styling of portal menuBrandon Millman2018-05-194-20/+37
| | | | |
| * | | | Refactor portal specific colors out of react-sharedBrandon Millman2018-05-1912-25/+46
| | | | |
| * | | | Add custom styling for drawerBrandon Millman2018-05-193-16/+106
| | | | |
| * | | | Fix key issue for portal routesBrandon Millman2018-05-191-1/+7
| | | | |
| * | | | Fix responsiveness broken in rebaseBrandon Millman2018-05-191-13/+33
| | | | |
| * | | | Set up scaffolding for new drawerBrandon Millman2018-05-193-9/+28
| | | | |
| * | | | Hide wallet component for small screensBrandon Millman2018-05-191-0/+2
| | | | |
| * | | | Fix token link keyBrandon Millman2018-05-191-2/+8
| | | | |
| * | | | Modulate number of columns based on screenwidthBrandon Millman2018-05-192-4/+19
|/ / / /
* | | | Fix prettierBrandon Millman2018-05-1919-7366/+7564
| | | |
* | | | Merge pull request #583 from 0xProject/bug/contracts/erc721-encoded-padJacob Evans2018-05-181-1/+2
|\ \ \ \ | | | | | | | | | | ERC721Proxy Pad to 32 if asset ids are small
| * | | | Pad to 32 if asset ids are smallJacob Evans2018-05-101-1/+2
| | | | |
* | | | | Change my title to clarifyfragosti2018-05-181-1/+1
| | | | |
* | | | | Merge pull request #596 from ↵Francesco Agosti2018-05-186-43/+104
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/website/weth-eth-conversion-errors Show error messages in the wrapped ether item
| * | | | | Center all the thingsfragosti2018-05-184-11/+46
| | | | | |
| * | | | | Refactor code in response to CR feedbackfragosti2018-05-185-15/+12
| | | | | |
| * | | | | Remove duplicate function call to validatefragosti2018-05-181-1/+1
| | | | | |
| * | | | | Show error messages in the wrapped ether itemfragosti2018-05-186-23/+52
| | | | | |
| * | | | | Improve about page descriptionsfragosti2018-05-181-3/+3
|/ / / / /
* | | | | Merge pull request #586 from 0xProject/feature/website/manage-wallet-2Brandon Millman2018-05-1811-114/+502
|\ \ \ \ \ | | | | | | | | | | | | Manage your wallet section of portal
| * | | | | Fix tslint false positiveBrandon Millman2018-05-181-2/+9
| | | | | |
| * | | | | Fix spreadBrandon Millman2018-05-181-1/+1
| | | | | |
| * | | | | Refactor account management itmesBrandon Millman2018-05-181-74/+70
| | | | | |
| * | | | | Add loading componentBrandon Millman2018-05-183-50/+77
| | | | | |
| * | | | | Refactor a bunch of layouts into their own filesBrandon Millman2018-05-186-139/+176
| | | | | |
| * | | | | Add portal layout componentBrandon Millman2018-05-181-31/+36
| | | | | |
| * | | | | Get rid of extra curly bracketsBrandon Millman2018-05-181-9/+9
| | | | | |
| * | | | | Fix lint errorBrandon Millman2018-05-181-2/+1
| | | | | |
| * | | | | Fix commentsBrandon Millman2018-05-183-4/+10
| | | | | |
| * | | | | Wait for blockchain to display the account management routesBrandon Millman2018-05-184-47/+78
| | | | | |
| * | | | | Fix linter errors and relayer index reloadingBrandon Millman2018-05-183-14/+17
| | | | | |
| * | | | | Trade direct routeBrandon Millman2018-05-182-44/+37
| | | | | |
| * | | | | Add manage you wallet footerBrandon Millman2018-05-181-24/+41
| | | | | |
| * | | | | Add props to back buttonBrandon Millman2018-05-181-9/+13
| | | | | |
| * | | | | Back button and title componentsBrandon Millman2018-05-183-64/+112
| | | | | |
| * | | | | Implement new menu stylingBrandon Millman2018-05-182-4/+95
| | | | | |
| * | | | | Add menuBrandon Millman2018-05-182-20/+41
| | | | | |
| * | | | | Add routesBrandon Millman2018-05-181-2/+105
|/ / / / /
* | | | | Update yarn.lockFabio Berger2018-05-171-15/+3
| | | | |
* | | | | Merge branch 'development' into v2-prototypeFabio Berger2018-05-16236-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 Berger2018-05-161-1/+1
| | |_|/ | |/| |
| * | | Merge pull request #593 from 0xProject/bug/website/fix-cirular-dependencyFrancesco Agosti2018-05-163-11/+13
| |\ \ \ | | | | | | | | | | Fix circular dependency
| | * | | fix style errorsfragosti2018-05-162-2/+2
| | | | |
| | * | | Fix circular dependencyfragosti2018-05-163-11/+13
| | | | |
| * | | | Merge pull request #592 from 0xProject/feature/website/add-francesco-aboutFrancesco Agosti2018-05-162-3/+11
| |\ \ \ \ | | |/ / / | |/| | | Add myself to about page
| | * | | Add my profile image to imagesfragosti2018-05-161-0/+0
| | | | |
| | * | | Add myself to about pagefragosti2018-05-161-3/+11
| | | | |
| * | | | Add dogfood configs to websiteBrandon Millman2018-05-164-2/+10
| |/ / /
| * | | Merge pull request #578 from 0xProject/document-node-versionAlex Browne2018-05-1629-6/+86
| |\ \ \ | | |_|/ | |/| | Document Node.js version requirement and add it to package.json
| | * | Change minimum Node version to 6.12Alex Browne2018-05-1530-38/+38
| | | |
| | * | Document Node.js version requirement and add it to package.jsonAlex Browne2018-05-1530-15/+95
| | | |
| * | | Merge pull request #588 from 0xProject/improvement/use-wsrunFabio Berger2018-05-1573-469/+367
| |\ \ \ | | | | | | | | | | Individual package building & watching!!! 💪 🌹
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 05:13:06 +0800