aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update exchange/transactions tests for Geth error messagesAlex Browne2018-06-071-4/+4
* Fix ethers.js version override (the package is just called 'ethers')Alex Browne2018-06-072-17/+2
* Use our fork of ethers.jsAlex Browne2018-06-072-1/+17
* Update some tests after rebaseAlex Browne2018-06-073-20/+29
* Add more transactions to Geth on init. Skip tests that are failing.Alex Browne2018-06-0716-645/+771
* Increase gas limit to account for bigger ExchangeContractAlex Browne2018-06-072-2/+2
* Replace constant.REVERT test assertions with expectRevertOrAlwaysFailingTrans...Alex Browne2018-06-0712-170/+143
* Update code after rebaseAlex Browne2018-06-073-3/+8
* Use Geth for contract testsAlex Browne2018-06-0722-11/+337
* Merge pull request #669 from 0xProject/bug/website/fix-balance-renderingBrandon Millman2018-06-071-9/+14
|\
| * Update balance amount rendering logicBrandon Millman2018-06-061-9/+14
* | Merge pull request #653 from 0xProject/feature/ethereum-types-docsLeonid Logvinov2018-06-0715-2/+190
|\ \
| * | Add EthereumTypes to _renderDrawerLeonid Logvinov2018-06-071-0/+11
| * | Add a TODO comment on StructLog type in the docsLeonid Logvinov2018-06-051-1/+1
| * | Add a documentation page for ethereum typesLeonid Logvinov2018-06-0515-2/+179
* | | Merge pull request #657 from 0xProject/feature/build-speedLeonid Logvinov2018-06-0714-19/+29
|\ \ \
| * | | Don't build website if no changes were made to itLeonid Logvinov2018-06-071-1/+6
| * | | Remove lerna bootstrapLeonid Logvinov2018-06-071-1/+0
| * | | Fix linter issues in generated contract wrappersLeonid Logvinov2018-06-073-4/+4
| * | | Add generated contract artifacts to prettierignoreLeonid Logvinov2018-06-071-0/+9
| * | | Stop running prettier on generated filesLeonid Logvinov2018-06-078-13/+9
| * | | Enable skipLibCheck flag in tsLeonid Logvinov2018-06-071-0/+1
|/ / /
* | | Merge pull request #665 from 0xProject/fix/fix-build-watchFabio Berger2018-06-0632-54/+63
|\ \ \
| * | | Add missing `yarn`Fabio Berger2018-06-061-1/+1
| * | | Add missing build:all commandFabio Berger2018-06-061-0/+1
| * | | Merge v2-prototypeFabio Berger2018-06-0649-129/+502
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #664 from 0xProject/fixes/misc-small-fixesFabio Berger2018-06-0619-18/+21
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'v2-prototype' into fixes/misc-small-fixesFabio Berger2018-06-0632-111/+481
| |\ \ \ | |/ / / |/| | |
* | | | Remove TranslatedTextfragosti2018-06-061-15/+0
* | | | Fix prettierBrandon Millman2018-06-061-1/+1
* | | | Merge pull request #668 from 0xProject/feature/website/move-disclaimerBrandon Millman2018-06-061-16/+18
|\ \ \ \
| * | | | Move portal disclaimer to the account management sectionBrandon Millman2018-06-061-16/+18
* | | | | Add back UMD bundles for 0x.jsLeonid Logvinov2018-06-061-1/+3
* | | | | Merge pull request #666 from 0xProject/bug/website/fix-missing-pricesBrandon Millman2018-06-062-30/+32
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move prices into portalBrandon Millman2018-06-062-30/+32
|/ / / /
* | | | Merge pull request #652 from 0xProject/feature/website/landing-subscribe-butt...Francesco Agosti2018-06-0630-64/+443
|\ \ \ \
| * | | | Use stricter check for subscribe input textfragosti2018-06-061-1/+2
| * | | | Make buttons stack on mobilefragosti2018-06-052-5/+6
| * | | | Do not show subscribe form if language is not englishfragosti2018-06-051-1/+1
| * | | | Address PR feedbackfragosti2018-06-058-40/+46
| * | | | Lint and cleanupfragosti2018-06-025-8/+8
| * | | | Merge branch 'feature/website/landing-subscribe-button' into feature/website/...fragosti2018-06-0230-53/+424
| |\ \ \ \
| | * | | | Implement subscription formfragosti2018-06-027-68/+288
| | * | | | Add styled-components and polishedfragosti2018-06-0221-22/+82
| | * | | | Have basic newsletter subscribe form workingfragosti2018-06-026-2/+93
| | | * | | Mention the gasLimit until in the doc commentFabio Berger2018-06-051-1/+1
| | | * | | Merge branch 'v2-prototype' into fixes/misc-small-fixesFabio Berger2018-06-051-2/+2
| | | |\ \ \ | |_|_|/ / / |/| | | | |
| | | * | | Replace `-` with `_` in yarn script name so that we are consistent across yar...Fabio Berger2018-06-0515-15/+15
| | | * | | Add `switch-default` tslint rule and add missing default statementFabio Berger2018-06-052-0/+4
| | | * | | Remove outdated link in ABI-gen READMEFabio Berger2018-06-051-2/+1
| | | | * | - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ...Fabio Berger2018-06-0532-54/+62
| |_|_|/ / |/| | | |
* | | | | Merge pull request #661 from feuGeneA/patch-1Fabio Berger2018-06-051-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix broken link to `contract_templates`F. Eugene Aumson2018-06-051-2/+2
* | | | | Merge pull request #656 from 0xProject/refactor/fill-scenarios/for-v2Fabio Berger2018-06-0524-3766/+730
|\ \ \ \ \
| * | | | | Use _.omit for concisenessFabio Berger2018-06-051-15/+5
| * | | | | revert multisig changeFabio Berger2018-06-051-1/+1
| * | | | | reset multisignFabio Berger2018-06-051-1/+1
| * | | | | Add PR to changelogFabio Berger2018-06-051-1/+2
| * | | | | Update fill-scenarios for V2 and add CHANGELOG entryFabio Berger2018-06-052-64/+91
| * | | | | Remove unused compact artifacts from order-utilsFabio Berger2018-06-057-1845/+0
| * | | | | Add missing exports to order-utils and add CHANGELOG entryFabio Berger2018-06-052-1/+18
| * | | | | Add new 2.0 artifacts to migrationsFabio Berger2018-06-052-0/+601
| * | | | | Remove compact_artifacts and replace with updated artifactsFabio Berger2018-06-059-1852/+12
| * | | | | Update fill-scenarios to depend on v2 updated order-utils and types. Needed t...Fabio Berger2018-06-053-4/+17
* | | | | | Merge pull request #658 from 0xProject/dont-automatically-rebuild-for-testsAlex Browne2018-06-0515-19/+31
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove duplicate cleans in package.json when clean is called in prebuildAlex Browne2018-06-054-4/+4
| * | | | | Remove common-js/umd differentiation from 0x.js/package.jsonAlex Browne2018-06-051-6/+3
| * | | | | Don't automatically rebuild when running yarn testAlex Browne2018-06-0515-15/+30
* | | | | | Merge pull request #633 from 0xProject/feature/contracts/errorsJacob Evans2018-06-0530-737/+490
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | rename GT to GREATER_THANJacob Evans2018-06-053-3/+3
| * | | | | Rebase from v2-prototypeJacob Evans2018-06-052-38/+2
| * | | | | Update Exchange statuses, revert instead of emmitting event on fill/cancel fa...Amir Bandeali2018-06-0530-702/+491
|/ / / / /
* | | | | Merge pull request #655 from 0xProject/update-migrationsAlex Browne2018-06-058-51/+79
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update artifacts in migrationsAlex Browne2018-06-058-51/+79
|/ / / /
* | | | Merge pull request #644 from 0xProject/feature/website/refactor-token-state-f...Francesco Agosti2018-06-055-97/+127
|\ \ \ \ | |_|_|/ |/| | |
| * | | Address feedbackfragosti2018-06-054-14/+20
| * | | Implement WETH step logic for continuefragosti2018-06-053-7/+14
| * | | Move trackedTokenStateByAddress logic into portalfragosti2018-06-052-83/+100
|/ / /
* | | Merge pull request #636 from 0xProject/refactor/order-utils/for-v2Fabio Berger2018-06-0253-518/+828
|\ \ \ | |/ / |/| |
| * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-0216-177/+219
| |\ \ | |/ / |/| |
* | | Merge pull request #651 from 0xProject/serial-contract-wrappersAlex Browne2018-06-023-55/+52
|\ \ \
| * | | Set contract expiration time to a constant 10 minutesAlex Browne2018-06-021-1/+2
| * | | Remove unused promises arrayAlex Browne2018-06-022-6/+0
| * | | Make erc20_wrapper and erc721_wrapper serialAlex Browne2018-06-022-48/+50
|/ / /
* | | Merge pull request #650 from 0xProject/feature/publishingLeonid Logvinov2018-06-0213-122/+167
|\ \ \
| * | | Rename changelogs to changelogLeonid Logvinov2018-06-021-8/+8
| * | | Add CHANGELOG entryLeonid Logvinov2018-06-021-0/+9
| * | | Check that git branch is up to date before publishingLeonid Logvinov2018-06-021-1/+17
| * | | Move prepublish checks before building packages for publishingLeonid Logvinov2018-06-024-55/+60
| * | | Refactor changelog utils to a separate moduleLeonid Logvinov2018-06-029-63/+78
| | * | Improve comments and remove unused importsFabio Berger2018-06-024-4/+7
| | * | Fix tslint issuesFabio Berger2018-06-023-5/+3
| | * | Add comment to exported methodFabio Berger2018-06-021-0/+7
| | * | Add missing depFabio Berger2018-06-021-0/+1
| | * | Fix types versionFabio Berger2018-06-021-1/+1
| | * | Also manually symlink types package in contractsFabio Berger2018-06-021-1/+1
| | * | Remove usage of `prebuild` since it doesn't run on `watch`Fabio Berger2018-06-021-2/+3
| | * | remove artifactsDir and contracts from compiler.jsonFabio Berger2018-06-021-13/+0
| | * | Add postinstall hack to get around `yarn` not setting up symlinks properly. T...Fabio Berger2018-06-021-1/+3
| | * | Fix type importsFabio Berger2018-06-025-5/+8
| | * | Remove ISigner artifactFabio Berger2018-06-021-76/+0
| | * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-023-17/+18
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #649 from 0xProject/addArtifactsFabio Berger2018-06-0218-4497/+4732
|\ \ \ \
| * | | | Update v2 artifactsFabio Berger2018-06-0217-4493/+4727
| * | | | Add IWallet and IValidator to compiled contractsFabio Berger2018-06-021-2/+2
| * | | | Split migrations compile command into one for V1 and another for V2Fabio Berger2018-06-021-3/+4
|/ / / /
| | * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-02130-1126/+1223
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #648 from 0xProject/feature/website/fill-orderBrandon Millman2018-06-024-34/+75
|\ \ \ \
| * | | | Remove old parse codeBrandon Millman2018-06-021-26/+0
| * | | | Refactor order parser and add shared order support to new portalBrandon Millman2018-06-023-3/+43
| * | | | Add generate and fill order routesBrandon Millman2018-06-022-7/+34
* | | | | Only show ProviderDisplay in portalBrandon Millman2018-06-021-12/+14
| |/ / / |/| | |
* | | | Improve sol-cov docsLeonid Logvinov2018-06-022-6/+78
|/ / /
* | | Merge pull request #642 from 0xProject/feature/ethereum-typesLeonid Logvinov2018-06-0190-366/+538
|\ \ \
| * | | Address feedbackLeonid Logvinov2018-06-012-2/+3
| * | | Fix linter errorsLeonid Logvinov2018-06-0120-23/+20
| * | | Fix linter errorsLeonid Logvinov2018-06-015-3/+5
| * | | Add ethereum-types to extraFileIncludesLeonid Logvinov2018-06-018-8/+22
| * | | Introduce ethereum-types packageLeonid Logvinov2018-06-0181-361/+511
* | | | Merge pull request #643 from 0xProject/feature/website/wallet-loadingBrandon Millman2018-06-0116-94/+195
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix missing keyBrandon Millman2018-06-011-1/+2
| * | | Update placeholder param orderingBrandon Millman2018-06-011-10/+21
| * | | Change userEtherBalanceInWei to optional so we can know if its loadingBrandon Millman2018-06-0113-22/+26
| * | | Add loading state to ProviderDisplayBrandon Millman2018-06-012-22/+39
| * | | TweaksBrandon Millman2018-06-012-8/+29
| * | | Add Placeholder componentBrandon Millman2018-06-011-14/+48
| * | | Add StandardIconRowBrandon Millman2018-06-011-34/+41
| * | | Split render into loading and loaadedBrandon Millman2018-06-011-5/+11
| |/ /
* | | Merge pull request #647 from 0xProject/override-ethereumjs-tx-versionAlex Browne2018-06-012-11/+6
|\ \ \ | |/ / |/| |
| * | Override ethereumjs-tx versionAlex Browne2018-06-012-11/+6
|/ /
* | Merge pull request #624 from 0xProject/feature/fast-ci2Leonid Logvinov2018-06-013-168/+210
|\ \
| * | Remove merge conflicts from yarn.lockLeonid Logvinov2018-06-011-13/+0
| * | Don't wait con contract tests to submit coverageLeonid Logvinov2018-06-011-1/+0
| * | Keep node versions consistentLeonid Logvinov2018-06-011-5/+5
| * | Split tests into two bucketsLeonid Logvinov2018-06-011-25/+23
| * | Use a newer version of node/yarn to speed-up deps instaationLeonid Logvinov2018-06-013-77/+167
| * | Try to cache dependenciesLeonid Logvinov2018-06-011-15/+12
| * | Combine lint and pretttier tests togetherLeonid Logvinov2018-06-011-17/+3
| * | Rebalance testsLeonid Logvinov2018-06-011-25/+10
* | | Merge pull request #641 from 0xProject/feature/remove-typesLeonid Logvinov2018-06-0119-444/+76
|\ \ \
| * | | Add changelog entry for typescript-typingsLeonid Logvinov2018-06-011-8/+8
| * | | Remove some typesLeonid Logvinov2018-06-0115-421/+63
| * | | Remove published typesLeonid Logvinov2018-06-015-15/+5
| |/ /
* / / Fix buildAmir Bandeali2018-06-011-1/+1
|/ /
* | Merge pull request #640 from 0xProject/await-transaction-successAlex Browne2018-05-315-25/+64
|\ \
| * | Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapperAlex Browne2018-05-312-5/+7
| * | Add awaitTransactionSuccess where neededAlex Browne2018-05-314-22/+59
| | * Update json-schemas version to 1.0.0 to avoid possible conflictsFabio Berger2018-06-023-2/+11
| | * Add signature specific validation methods, and other refactorsFabio Berger2018-06-025-55/+98
| | * Fix TODOsFabio Berger2018-06-011-2/+1
| | * Update all artifactsFabio Berger2018-06-018-2233/+2148
| | * List V2 contracts in compile.json nowFabio Berger2018-06-011-6/+5
| | * Fix sol-cov issue by changing it's dep to current version of typesFabio Berger2018-06-011-1/+1
| | * Rename ISigner to IWallet and implement SignatureType.ValidatorFabio Berger2018-06-017-9/+196
| | * Bump types to a major version to avoid the caretFabio Berger2018-06-013-3/+3
| | * Fix metadata offsetsFabio Berger2018-06-011-5/+7
| | * fix method renameFabio Berger2018-06-011-1/+1
| | * Rename Ecrecover to EthSignFabio Berger2018-06-013-6/+3
| | * Update artifactsFabio Berger2018-06-0110-2286/+2457
| | * Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-0182-515/+1629
| | |\ | |_|/ |/| |
* | | Merge pull request #561 from 0xProject/feature/contracts/txoriginAmir Bandeali2018-05-3146-154/+955
|\ \ \
| * | | Check length before accessing indices, add awaitTransactionSuccess where need...Amir Bandeali2018-05-315-25/+43
| * | | Add back before/after snapshots for each testAmir Bandeali2018-05-3116-0/+97
| * | | Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMITAmir Bandeali2018-05-318-10/+10
| * | | Make preSigned and allowedValidators mappings publicAmir Bandeali2018-05-311-2/+2
| * | | Change names of signature typesAmir Bandeali2018-05-312-6/+6
| * | | Fix formatting and testsAmir Bandeali2018-05-3118-94/+16
| * | | Make AssetProxyId last byte of assetDataAmir Bandeali2018-05-3118-37/+74
| * | | Add signer to txHash, allow approveValidator to be used with executeTransactionAmir Bandeali2018-05-313-7/+10
| * | | Update WhitelistAmir Bandeali2018-05-317-24/+335
| * | | Fix Exchange interfaceAmir Bandeali2018-05-311-7/+5
| * | | Increase block gas limitAmir Bandeali2018-05-312-1/+2
| * | | Use last byte of signature as signature typeAmir Bandeali2018-05-318-106/+103
| * | | Remove TxOrigin signature type, modify whitelist to use Validator signature typeAmir Bandeali2018-05-317-35/+35
| * | | Update Whitelist contract with comments, also require maker to be whitelistedAmir Bandeali2018-05-315-16/+72
| * | | Fix buildAmir Bandeali2018-05-313-19/+24
| * | | Add example whitelist contract and minimum testsAmir Bandeali2018-05-313-11/+121
| * | | Add sample whitelist contractAmir Bandeali2018-05-313-1/+60
| * | | Add TxOrigin signature type and rearrange order of typesAmir Bandeali2018-05-313-63/+77
| * | | Add approveValidator functionAmir Bandeali2018-05-312-2/+17
| * | | Add Validator signature typeAmir Bandeali2018-05-314-3/+69
| * | | Add deepCopyBytes method to LibBytesAmir Bandeali2018-05-313-0/+92
|/ / /
* | | Merge pull request #639 from 0xProject/fix/contracts/multisigWrapperAmir Bandeali2018-05-313-50/+62
|\ \ \
| * | | Change logDecoder back into class, remove awaitTransactionMined from multiSig...Amir Bandeali2018-05-313-50/+62
| |/ /
* | | Merge pull request #635 from 0xProject/feature/website/custom-onboarding-tooltipFrancesco Agosti2018-05-3123-277/+530
|\ \ \ | |/ / |/| |
| * | Merge pull request #638 from 0xProject/feature/website/onboarding-eth-flowFrancesco Agosti2018-05-317-47/+121
| |\ \
| | * | Onboarding: implement add ETH step, and stub for add WETH stepfragosti2018-05-307-47/+121
| |/ /
| * | Address PR feedbackfragosti2018-05-307-40/+41
| * | Remove react-joyride from depsfragosti2018-05-302-80/+2
| * | Add entry to CHANGELOG.jsonfragosti2018-05-301-0/+8
| * | Remove blacklist conceptfragosti2018-05-304-66/+20
| * | Some cleanupfragosti2018-05-302-11/+13
| * | Improve tooltip lookfragosti2018-05-307-13/+69
| * | Add types for react-popper, remove types for react-joyridefragosti2018-05-304-105/+62
| * | Replace react-joyride with react-popperfragosti2018-05-306-56/+96
| * | Write custom tooltip componentfragosti2018-05-263-7/+57
| * | Run linterfragosti2018-05-262-2/+5
| * | Add localstorage helperfragosti2018-05-261-0/+16
| * | Add next buttonfragosti2018-05-263-2/+13
| * | Auto-show onboarding flow on first page viewfragosti2018-05-265-7/+53
| * | Add ability to blacklist onboarding stepsfragosti2018-05-263-34/+92
| * | Fix PortalOnboardingFlowPropsfragosti2018-05-261-1/+0
| * | Implement metamask installation flowfragosti2018-05-266-19/+75
* | | Fix unselected relayer drawer itemBrandon Millman2018-05-301-1/+1
* | | Merge pull request #621 from 0xProject/feature/compiler-assertionsLeonid Logvinov2018-05-306-7/+56
|\ \ \
| * | | Add a CHANGELOG entryLeonid Logvinov2018-05-301-0/+4
| * | | Make opts param optional in CompilerLeonid Logvinov2018-05-301-6/+7
| * | | Throw if trying to schema-validate an undefinedLeonid Logvinov2018-05-301-0/+3
| * | | Add CHANGELOG entryLeonid Logvinov2018-05-302-1/+10
| * | | Add schema assertions on public methods of @0xproject/sol-compilerLeonid Logvinov2018-05-304-1/+33
|/ / /
| | * Expose isValidPresignedSignatureAsync methodFabio Berger2018-05-311-3/+19
| | * Move isValidOrderHash to the order_hash_test fileFabio Berger2018-05-312-15/+15
| | * Decide to throw for Caller signature type for nowFabio Berger2018-05-311-2/+3
| | * Introduce OrderWithoutExchangeAddress type since this is what get's sent to t...Fabio Berger2018-05-315-32/+43
| | * Add ISigner artifactsFabio Berger2018-05-311-0/+76
| | * Fix order-utils testsFabio Berger2018-05-317-81/+123
| | * Revivie the ECSignatureSchemaFabio Berger2018-05-312-0/+22
| | * Initial refactor of order-utils. Move many utils from contracts into this pac...Fabio Berger2018-05-3038-401/+510
| | * Freeze order-utils at 0.0.5 for all packages except contractsFabio Berger2018-05-308-7/+23
| | * Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-05-267-118/+109
| | |\ | |_|/ |/| |
* | | Merge pull request #625 from 0xProject/feature/contracts-without-contract-wra...Fabio Berger2018-05-265-103/+86
|\ \ \
| * | | Remove registry overrideLeonid Logvinov2018-05-261-3/+0
| * | | Revert "Change the registry in yarn.lock"Leonid Logvinov2018-05-261-1995/+1995
| * | | Change the registry in yarn.lockLeonid Logvinov2018-05-261-1995/+1995
| * | | Remove contracts -> @0xproject/order-utils dependencyLeonid Logvinov2018-05-266-103/+89
| |/ /
* / / Hide wallet management option and expand component on small screensBrandon Millman2018-05-262-15/+23
|/ /
| * Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-05-2628-407/+1474
| |\ | |/ |/|
* | Merge pull request #620 from 0xProject/feature/website/relayer-emptyBrandon Millman2018-05-253-9/+31
|\ \
| * | Implement design for relayers with no volume or tokensBrandon Millman2018-05-253-9/+31
* | | Fix imports in order_utilsLeonid Logvinov2018-05-252-1/+22
* | | Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-2523-397/+1421
|\ \ \
| * | | Use web3-wrapper instead of 0x.js, update logDecoderAmir Bandeali2018-05-257-49/+48
| * | | Cleanup testsAmir Bandeali2018-05-254-6/+12
| * | | Add errMsg when throwing on unrecognized errorAmir Bandeali2018-05-251-1/+1
| * | | 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 mappi...Amir Bandeali2018-05-251-18/+48
| |/ /
| | * Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-05-2543-2459/+2655
| | |\ | |_|/ |/| |
* | | Merge pull request #575 from 0xProject/feature/contracts/eip712-order-hashFabio Berger2018-05-256-2331/+2368
|\ \ \
| * \ \ Merge branch 'v2-prototype' into feature/contracts/eip712-order-hashFabio Berger2018-05-2539-128/+287
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #618 from 0xProject/feature/v2-migrationsLeonid Logvinov2018-05-2538-126/+285
|\ \ \ \
| * | | | Pin connect in sra-reportLeonid Logvinov2018-05-251-1/+1
| * | | | Fix a typoLeonid Logvinov2018-05-251-2/+2
| * | | | Pin types in sra-reportLeonid Logvinov2018-05-251-1/+1
| * | | | Fix linter issuesLeonid Logvinov2018-05-253-3/+3
| * | | | Unpin types version in @0xproject/connectLeonid Logvinov2018-05-253-3/+3
| * | | | Pin types version in websiteLeonid Logvinov2018-05-251-0/+1