aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updated CHANGELOGSFabio Berger2018-09-2652-2/+328
* Update yarn.lockFabio Berger2018-09-261-33/+29
* Properly render function generic types that don't extend another typeFabio Berger2018-09-263-10/+18
* Merge pull request #1087 from 0xProject/addTxHashToOrderStateFabio Berger2018-09-256-13/+69
|\
| * Add changelog entryFabio Berger2018-09-251-0/+5
| * Add transactionHash to OrderState and emit it from OrderWatcher subscriptionFabio Berger2018-09-255-13/+64
|/
* Merge pull request #1080 from 0xProject/upgradeBlockstreamFabio Berger2018-09-2510-75/+166
|\
| * merge developmentFabio Berger2018-09-25134-903/+2004
| |\ | |/ |/|
* | PublishLeonid Logvinov2018-09-2528-170/+170
* | Updated CHANGELOGSLeonid Logvinov2018-09-2548-3/+301
* | Merge pull request #1085 from 0xProject/feature/export-sra-typesLeonid Logvinov2018-09-2517-167/+190
|\ \
| * | Move SRA types from @0xproject/connect to @0xproject/sra-typesLeonid Logvinov2018-09-2517-167/+190
|/ /
* | Use the 0xorg DockerHub account instead of albrow (#1084)Alex Browne2018-09-251-2/+2
* | Feature/custom verdaccio dockerfile (#1083)Alex Browne2018-09-255-1/+94
* | Merge pull request #1037 from 0xProject/feature/forwarder-helper/sra-and-rpcFrancesco Agosti2018-09-2445-575/+1261
|\ \
| * | Upgrade all depsfragosti2018-09-242-11/+11
| * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-09-241-2/+3
| |\ \
| * | | Improve READMEfragosti2018-09-241-3/+1
| * | | Add expiry bufferfragosti2018-09-244-14/+51
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-09-2197-230/+6688
| |\ \ \
| * | | | Small typosfragosti2018-09-212-2/+2
| * | | | Add order provider response validationfragosti2018-09-213-0/+15
| * | | | Make asset buyer map privatefragosti2018-09-211-4/+4
| * | | | More renamingfragosti2018-09-218-67/+68
| * | | | Renamed orderFetcherResponseProcessor to orderProviderResponseProcessoerfragosti2018-09-212-7/+7
| * | | | Add labels to TODOsfragosti2018-09-212-4/+5
| * | | | Move some logic to order utilsfragosti2018-09-212-8/+16
| * | | | Add utility to get assetDatasfragosti2018-09-211-1/+8
| * | | | Rename OrderFetcher to OrderProvider and other small improvementsfragosti2018-09-209-49/+48
| * | | | Update descriptions for methods on AssetBuyerfragosti2018-09-201-3/+3
| * | | | Add better description to READMEfragosti2018-09-201-1/+3
| * | | | Implement StandardRelayerAPIAssetBuyerManagerfragosti2018-09-207-14/+166
| * | | | Move ObjectMap to shared typesfragosti2018-09-195-7/+17
| * | | | Rename forceOrderRefresh to shouldForceOrderRefreshfragosti2018-09-193-5/+5
| * | | | Calculate min and max rates in buy quotefragosti2018-09-193-33/+70
| * | | | Add isValidPercentage assertfragosti2018-09-192-13/+14
| * | | | Make ForwaderWrapper take in a number for feePercentage instead of BigNumberfragosti2018-09-193-6/+19
| * | | | make the slippage percentage customizable by integratorfragosti2018-09-183-7/+20
| * | | | Restrict orders field of AssetBuyerOrdersAndFillableAmounts to SignedOrder fo...fragosti2018-09-181-2/+2
| * | | | Fix order expired bugfragosti2018-09-181-1/+1
| * | | | Move all constants to own filefragosti2018-09-182-12/+11
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-09-1831-39/+241
| |\ \ \ \
| * | | | | Add factory method for specific assetData to buy and add commentsBrandon Millman2018-09-152-3/+54
| * | | | | Add factory method on AssetBuyer for specific token addressBrandon Millman2018-09-151-1/+20
| * | | | | Add factory method on AssetBuyer for provided ordersBrandon Millman2018-09-152-1/+39
| * | | | | Export the order fetchersBrandon Millman2018-09-151-0/+2
| * | | | | Fix lint errorsBrandon Millman2018-09-153-18/+5
| * | | | | Delete old testBrandon Millman2018-09-151-136/+0
| * | | | | Implement ProvidedOrderFetcherBrandon Millman2018-09-153-1/+48
| * | | | | Implement StandardRelayerAPIOrderFetcherBrandon Millman2018-09-153-262/+84
| * | | | | Flesh out the AssetBuyer classBrandon Millman2018-09-159-233/+544
| * | | | | Create initial AssetBuyer classBrandon Millman2018-09-1510-574/+635
| * | | | | Update readme, changelog, and package.json with renameBrandon Millman2018-09-154-51/+14
| * | | | | Move packages/forwarder-helper into packages/asset-buyerBrandon Millman2018-09-1518-0/+0
| * | | | | Various clean upBrandon Millman2018-09-152-4/+6
| * | | | | Catch standard relayer api errorsBrandon Millman2018-09-152-4/+10
| * | | | | Remove taker address as param and filter out non-open ordersBrandon Millman2018-09-153-8/+18
| * | | | | Add getForwarderHelperForMakerAssetDataAsync method to forwarderHelperFactoryBrandon Millman2018-09-155-4/+253
* | | | | | Merge pull request #1073 from 0xProject/fix/website/signing-order-validation-bugFrancesco Agosti2018-09-243-2/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-09-24100-239/+6724
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Add yarn.lockfragosti2018-09-181-3/+3
| * | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-09-1830-34/+181
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Fix order creation and fill flow in Portalfragosti2018-09-184-5/+6
| | | | | | * Fix lint issuesFabio Berger2018-09-252-19/+17
| | | | | | * Fix prettierFabio Berger2018-09-251-1/+2
| | | | | | * Fix prettierFabio Berger2018-09-252-4/+6
| | | | | | * Decode logs received from blockstreamFabio Berger2018-09-252-8/+10
| | | | | | * Add missing typeFabio Berger2018-09-251-1/+1
| | | | | | * Update changelogsFabio Berger2018-09-252-2/+12
| | | | | | * Refactor blockstream integration to use the proper callback method interfaceFabio Berger2018-09-252-22/+58
| | | | | | * Add entry about newly exposed methodFabio Berger2018-09-251-0/+4
| | | | | | * Expose method to send raw JSON RPC payloadsFabio Berger2018-09-251-34/+39
| | | | | | * Merge developmentFabio Berger2018-09-2491-266/+658
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #1082 from 0xProject/fixGetBlocksFabio Berger2018-09-248-31/+91
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add comments for clarityFabio Berger2018-09-242-0/+2
| * | | | | | Add to doc comment why a block might not be returned to the callerFabio Berger2018-09-241-0/+1
| * | | | | | Add PR nrFabio Berger2018-09-241-1/+2
| * | | | | | Add CHANGELOG entry for change to getBlockAsyncFabio Berger2018-09-241-0/+9
| * | | | | | Fix bug where if block wasn't found, getBlockAsync would throw. Now it return...Fabio Berger2018-09-247-31/+78
|/ / / / / /
* | | | / / Add order-utils to README listFabio Berger2018-09-221-2/+3
| |_|_|/ / |/| | | |
* | | | | PublishLeonid Logvinov2018-09-2131-213/+213
* | | | | Updated CHANGELOGSLeonid Logvinov2018-09-2152-1/+331
* | | | | Merge pull request #1081 from 0xProject/fix/node-types-unpinLeonid Logvinov2018-09-2118-18/+18
|\ \ \ \ \
| * | | | | Don't depend on a specific version of node typesLeonid Logvinov2018-09-2118-18/+18
|/ / / / /
* | | | | Merge pull request #1079 from 0xProject/fixAwaitTxMinedFabio Berger2018-09-212-1/+11
|\ \ \ \ \
| * | | | | Add PR numberFabio Berger2018-09-211-1/+2
| | | | | * Fix prettierFabio Berger2018-09-213-3/+7
| | | | | * Add changelog entriesFabio Berger2018-09-212-0/+16
| | | | | * Upgrade blockstream to version that supports fetching logs by blockHash, fixi...Fabio Berger2018-09-213-3/+11
| | | | | * Add blockHash to FilterObject now that EIP234 is supportedFabio Berger2018-09-211-0/+1
| | | | | * Add assertion that one cannot specify both blockHash & fromBlock/toBlock to g...Fabio Berger2018-09-211-0/+4
| | |_|_|/ | |/| | |
| * | | | Also make sure the transactionReceipt contains a blockNumber when checking if...Fabio Berger2018-09-212-1/+10
|/ / / /
* | | | Merge pull request #1077 from PhABC/patch-1Fabio Berger2018-09-211-1/+1
|\ \ \ \
| * | | | Set ContractEventArg type definition to `any`Philippe Castonguay2018-09-211-1/+1
| * | | | Add BigNumber[] support in ContractEventArgPhilippe Castonguay2018-09-201-1/+1
|/ / / /
* | | | PublishFabio Berger2018-09-1911-30/+30
* | | | Updated CHANGELOGSFabio Berger2018-09-1916-5/+69
* | | | Update changelog entriesFabio Berger2018-09-195-0/+40
* | | | Merge pull request #1074 from 0xProject/reduceBundleSizesFabio Berger2018-09-1918-4/+6044
|\ \ \ \ | |_|/ / |/| | |
| * | | Add back in evm.bytecode.object since it's needed to generate contract-wrappersFabio Berger2018-09-1914-318/+412
| * | | Make higher-order packages copy over trimmed down artifactsFabio Berger2018-09-194-4/+4
| * | | Create trimmed artifacts of v2 contractsFabio Berger2018-09-1914-0/+5946
|/ / /
* | | PublishFabio Berger2018-09-187-15/+15
* | | Updated CHANGELOGSFabio Berger2018-09-1810-3/+44
* | | Merge pull request #1072 from 0xProject/addMissingEtherTokenConfigFabio Berger2018-09-185-0/+34
|\ \ \
| * | | Add CHANGELOG entries about bug fixFabio Berger2018-09-183-0/+24
| * | | Add missing mainnet addresses to ZRXToken & WETH artifactsFabio Berger2018-09-182-0/+10
|/ / /
* | | Merge pull request #1063 from 0xProject/feature/0x.js/update-readme-importJacob Evans2018-09-1811-19/+91
|\ \ \ | |/ / |/| |
| * | Folder 1.0.0 -> 1.0.1Jacob Evans2018-09-185-5/+5
| * | Rename to v1->v0 v2->v1Jacob Evans2018-09-181-17/+17
| * | Remove note about RC versionsJacob Evans2018-09-133-13/+11
| * | 0xjs README/website docs updateJacob Evans2018-09-1313-30/+111
* | | Fix forwarder package.jsonFabio Berger2018-09-171-1/+1
* | | Add 0x.js 2.0.0 async and installation sectionsFabio Berger2018-09-172-0/+64
* | | Update decoration errorFabio Berger2018-09-171-1/+1
* | | Update 0x.js READMEFabio Berger2018-09-171-1/+8
* | | Remove doc commands from forwarder-helper package for nowFabio Berger2018-09-171-3/+0
| |/ |/|
* | Merge pull request #1061 from 0xProject/feature/ci-resource-classesAlex Browne2018-09-131-0/+2
|\ \
| * | Bump CircleCI resource class for build and test-publishAlex Browne2018-09-121-0/+2
|/ /
* | Change Davids descriptionfragosti2018-09-121-1/+1
* | Add images for David Sacks and Genefragosti2018-09-122-0/+0
* | Fix David Sacks linksfragosti2018-09-121-4/+4
* | Merge branch 'feature/website/add-gene' into developmentfragosti2018-09-121-0/+8
|\ \
| * | Add Gene info to websitefragosti2018-09-121-0/+8
* | | Add david sacksfragosti2018-09-121-2/+14
|/ /
* | Merge pull request #1064 from 0xProject/patch/website/new-token-addressesFrancesco Agosti2018-09-075-41/+52
|\ \ | |/ |/|
| * Clear localstoragefragosti2018-09-071-1/+1
| * Fix minting for new tokens on testnetsfragosti2018-09-075-40/+51
|/
* Link bug bounty section to wikiAmir Bandeali2018-09-061-40/+1
* Update README with directory structure and bug bountyAmir Bandeali2018-09-061-6/+66
* Merge pull request #1060 from 0xProject/feature/testnet-faucets/v2Jacob Evans2018-09-066-149/+150
|\
| * Check token exists for network for user paramsJacob Evans2018-09-062-16/+23
| * Remove unused name and symbolJacob Evans2018-09-051-12/+5
| * Floor expiration timeJacob Evans2018-09-052-1/+11
| * [testnet-faucets] update to v2Jacob Evans2018-09-056-142/+133
|/
* PublishFabio Berger2018-09-0532-257/+253
* Updated CHANGELOGSFabio Berger2018-09-0554-5/+320
* Update CHANGELOG's to publish non-RC versionsFabio Berger2018-09-054-4/+4
* Merge pull request #1058 from 0xProject/fix/connect/use-big-number-in-requestsFrancesco Agosti2018-09-054-10/+20
|\
| * Change orderConfig from POST to GET like in specfragosti2018-09-052-4/+4
| * Add to CHANGELOGfragosti2018-09-052-1/+10
| * Use BigNumber instead of string where appropriate in OrderConfigRequestfragosti2018-09-052-6/+7
* | Merge pull request #1057 from 0xProject/deployment/copy-testnet-artifactsAlex Browne2018-09-0547-447/+13510
|\ \ | |/ |/|
| * Update order-watcher/package.jsonAlex Browne2018-09-051-2/+2
| * add packages/sol-cov/test/fixtures/artifacts to .prettierignoreAlex Browne2018-09-051-0/+1
| * More small artifacts updates/changesAlex Browne2018-09-055-73/+98
| * Fix bug in contracts testsAlex Browne2018-09-051-1/+1
| * More small chnages/bug fixesAlex Browne2018-09-059-265/+10
| * Rename and update some artifact locationsAlex Browne2018-09-0530-287/+102
| * Rename 2.0.0-beta-testnet to 2.0.0-testnetAlex Browne2018-09-0514-0/+0
| * Add missing testnet addresses to 2.0.0-mainnet artifactsAlex Browne2018-09-056-6/+96
| * Copy artifacts from 2.0.0-beta-testnet that do not appear in 2.0.0-mainnetAlex Browne2018-09-058-0/+13387
|/
* Merge pull request #1055 from 0xProject/deployment/2.0.0-beta-testnet/ropstenAlex Browne2018-09-0540-100811/+3627
|\
| * Merge branch 'deployment/2.0.0-beta-testnet/ropsten' of github.com:0xProject/...Jacob Evans2018-09-0524-46/+6042
| |\
| | * merge developmentFabio Berger2018-09-0524-46/+6042
| | |\
| | * \ Merge branch 'deployment/2.0.0-beta-testnet/ropsten' of github.com:0xProject/...Fabio Berger2018-09-052-2/+4
| | |\ \
| | * \ \ merge back weth9Fabio Berger2018-09-051-0/+346
| | |\ \ \
| | * \ \ \ Merge branch 'deployment/2.0.0-beta-testnet/ropsten' of github.com:0xProject/...Fabio Berger2018-09-050-0/+0
| | |\ \ \ \
| | | * | | | Ropsten/Kovan Contract deploymentJacob Evans2018-09-0539-100811/+3625
| | * | | | | Ropsten/Kovan Contract deploymentJacob Evans2018-09-0540-101152/+3625
| | |/ / / /
| * | | | | Revert Forwarder address for GanacheJacob Evans2018-09-051-1/+1
| * | | | | Remove Rinkeby from Exchange.jsonJacob Evans2018-09-051-5/+0
| | |_|/ / | |/| | |
| * | | | Revert the exchange address changeJacob Evans2018-09-051-2/+2
| * | | | Tslint magic-numberJacob Evans2018-09-051-0/+2
| | |/ / | |/| |
| * | | Ropsten/Kovan Contract deploymentJacob Evans2018-09-0540-100812/+3631
| |/ /
* | | Merge pull request #1044 from 0xProject/feature/website/update-portal-v2Francesco Agosti2018-09-0527-1064/+454
|\ \ \ | |_|/ |/| |
| * | Add to changelogfragosti2018-09-051-0/+9
| * | Run linterfragosti2018-09-053-6/+4
| * | Merge branch 'feature/website/update-portal-v2' of https://github.com/0xProje...fragosti2018-09-053-9/+5
| |\ \
| | * | Remove unused imports and console.logFabio Berger2018-09-051-4/+1
| | * | Add back order validation logicFabio Berger2018-09-051-7/+5
| | * | Fix importsFabio Berger2018-09-051-2/+1
| | * | remove console logFabio Berger2018-09-051-1/+0
| | * | merge developmentFabio Berger2018-09-05103-766/+1440
| | |\ \
| * | | | Use order parser utils from order utilsfragosti2018-09-0517-107/+94
| * | | | Add order parsers to order-utilfragosti2018-09-052-1/+29
| * | | | Merge https://github.com/0xProject/0x-monorepo into feature/website/update-po...fragosti2018-09-05103-766/+1440
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| * | | Update exchange ABI for decoding logsBrandon Millman2018-08-312-615/+1
| * | | Remove LogError legacy stuffBrandon Millman2018-08-311-4/+0
| * | | Update comment for validationBrandon Millman2018-08-311-1/+2
| * | | Remove commented out blockBrandon Millman2018-08-311-20/+0
| * | | Remove cancel checkBrandon Millman2018-08-312-12/+0
| * | | Update yarn lockBrandon Millman2018-08-311-25/+4
| * | | Update generate and fill order flowsBrandon Millman2018-08-317-30/+41
| * | | Token registry from old 0x versionBrandon Millman2018-08-313-11/+73
| * | | Fix importBrandon Millman2018-08-311-1/+1
| * | | Fix contract not deployed on network bug in ContractWrapper classBrandon Millman2018-08-312-1/+8
| * | | Update typings versionBrandon Millman2018-08-311-1/+1
| * | | Initial changes for v2 portalBrandon Millman2018-08-3117-368/+329
* | | | Merge pull request #1038 from 0xProject/feature/contracts/mainnetMigrationsFabio Berger2018-09-0515-7/+5907
|\ \ \ \ | |_|/ / |/| | |
| * | | Update prettierignoreAmir Bandeali2018-09-051-0/+2
| * | | Update mainnet artifactsAmir Bandeali2018-09-056-0/+5711
| * | | Update mainnet configsAmir Bandeali2018-09-053-4/+19
| * | | Add mainnet migrationsAmir Bandeali2018-09-056-5/+177
|/ / /
* | | Merge pull request #1054 from 0xProject/addValidationMethodsFabio Berger2018-09-059-39/+135
|\ \ \ | |_|/ |/| |
| * | Export abstract fetchersFabio Berger2018-09-051-0/+2
| * | Export missing typeFabio Berger2018-09-042-0/+2
| * | Merge branch 'development' into addValidationMethodsFabio Berger2018-09-042-6/+0
| |\ \
| | * \ Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2018-09-042-6/+0
| | |\ \
| * | | | Add PR nrFabio Berger2018-09-041-2/+4
| |/ / /
| * | | Update yarn.lockFabio Berger2018-09-041-33/+29
| * | | Add `validateFillOrderThrowIfInvalidAsync` and `validateOrderFillableOrThrowA...Fabio Berger2018-09-043-2/+83
| * | | Import fetchers from contract-wrappersFabio Berger2018-09-041-2/+2
| * | | Export fetchers from contract-wrappersFabio Berger2018-09-041-0/+3
| * | | Move fetchers to contract-wrappersFabio Berger2018-09-043-2/+12
* | | | Merge pull request #1050 from 0xProject/refactor/contracts/multisigAmir Bandeali2018-09-0511-112/+360
|\ \ \ \
| * | | | Remove TODOs that will not be addressedAmir Bandeali2018-09-043-3/+2
| * | | | Fix geth testsAmir Bandeali2018-09-042-6/+12
| * | | | Add test for external_call visibilityAmir Bandeali2018-09-041-0/+15
| * | | | Add MultiSigWalletWithTimeLock revert reasons to testsAmir Bandeali2018-09-044-15/+38
| * | | | Update MultiSigWalletWithTimeLock to 0.4.24Amir Bandeali2018-09-042-24/+24
| * | | | Add more tests for MultiSigWalletWithTimeLockAmir Bandeali2018-09-042-1/+152
| * | | | Add test for executeRemoveAuthorizedAddressAtIndex when called by non-ownerAmir Bandeali2018-09-041-4/+40
| * | | | Update to most recent multisigAmir Bandeali2018-09-043-71/+89
| | |/ / | |/| |
* | | | Merge pull request #1052 from 0xProject/feature/remove-typesLeonid Logvinov2018-09-0417-165/+40
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the versionLeonid Logvinov2018-09-041-2/+1
| * | | Change doc gen configsLeonid Logvinov2018-09-041-4/+2
| * | | Move types used in public interfaces to dependenciesLeonid Logvinov2018-09-041-2/+2
| * | | Add temporarily missing web3-provider-engine types in websiteLeonid Logvinov2018-09-041-0/+1
| * | | Add CHANGELOG entryLeonid Logvinov2018-09-041-0/+9
| * | | Add temporarily missing web3-provider-engine types in subprovidersLeonid Logvinov2018-09-041-0/+18
| * | | Remove types for web3-provider-engine from typescript-typingsLeonid Logvinov2018-09-045-62/+4
| * | | Remove types for eth-lightwallet from typescript-typingsLeonid Logvinov2018-09-043-55/+2
| * | | Remove types for detect-node from typescript-typingsLeonid Logvinov2018-09-042-3/+1
| * | | Remove types for ganache-core from typescript-typingsLeonid Logvinov2018-09-044-17/+3
| * | | Remove types for newman from typescript-typingsLeonid Logvinov2018-09-042-24/+1
|/ / /
* | | Merge pull request #1053 from 0xProject/fix/linter_issuesLeonid Logvinov2018-09-042-6/+0
|\ \ \ | |/ / |/| |
| * | Remove unused importsLeonid Logvinov2018-09-042-6/+0
|/ /
* | Merge pull request #1051 from 0xProject/fix/contracts/styleAmir Bandeali2018-09-0444-76/+99
|\ \
| * | Apply styling fixesAmir Bandeali2018-09-0442-67/+64
| * | Revert in Forwarder constructor if ERC20 proxy isn't registeredAmir Bandeali2018-09-042-9/+35
|/ /
* | Merge pull request #1048 from 0xProject/feature/website/patch-v2-landingBrandon Millman2018-08-313-10/+14
|\ \
| * | Wording change for first benefitBrandon Millman2018-08-311-1/+1
| * | Tweaks to benefits and use casesBrandon Millman2018-08-311-2/+6
| * | Update yarn lockBrandon Millman2018-08-311-30/+34
| * | Final tweaks for landing pagefragosti2018-08-313-36/+32
* | | Merge pull request #1047 from 0xProject/feature/re-add-no-unused-variablesFrancesco Agosti2018-08-3116-22/+11
|\ \ \
| * | | run prettierfragosti2018-08-311-3/+1
| * | | Fix unused vars for react-shared and websitefragosti2018-08-3116-19/+10
* | | | Merge pull request #1046 from 0xProject/fix/contracts/roundingFeeTestsMatchOr...Greg Hysen2018-08-311-0/+94
|\ \ \ \ | |_|/ / |/| | |
| * | | Test cases for rounding fees in matchOrdersGreg Hysen2018-08-311-0/+94
* | | | Merge pull request #1040 from 0xProject/feature/website/v2-tweaksBrandon Millman2018-08-3112-349/+699
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert whats new textBrandon Millman2018-08-311-2/+1
| * | | Add new exchange everywhere graphicBrandon Millman2018-08-312-4/+8
| * | | Remove unused render methods in landing pageBrandon Millman2018-08-311-110/+0
| * | | Update yarn lockBrandon Millman2018-08-311-4/+4
| * | | Merge pull request #1042 from 0xProject/feature/website/v2-tweaks-fraFrancesco Agosti2018-08-318-26/+146
| |\ \ \
| | * | | Remove conflict stringsfragosti2018-08-311-3/+0
| | * | | Add careers page to top barfragosti2018-08-311-1/+11
| | * | | Final tweaksfragosti2018-08-313-11/+17