aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update changelogsfragosti2018-08-173-1/+19
* Add fee recipients testfragosti2018-08-164-5/+39
* All previous tests passingfragosti2018-08-161-4/+4
* Get orders async tests passingfragosti2018-08-163-3/+8
* getAssetPairsAsync tests passingfragosti2018-08-167-22/+20
* Project now buildsfragosti2018-08-166-41/+19
* Update test fixturesfragosti2018-08-1620-209/+284
* Update parsing codefragosti2018-08-154-22/+43
* Update connect json-schemasfragosti2018-08-156-43/+44
* Update types and add missing param to SRA specfragosti2018-08-154-19/+31
* Update json-schemas, update HTTPClient typesfragosti2018-08-1511-85/+81
* Update types to reflect v2fragosti2018-08-1526-210/+186
* Change names of basic types in Client interfacefragosti2018-08-156-21/+28
* Merge pull request #966 from 0xProject/feature/typescript-3.0.1Alex Browne2018-08-1531-33/+33
|\
| * feat: Upgrade TypeScript to 3.0.1Alex Browne2018-08-1531-33/+33
* | Merge pull request #964 from 0xProject/feature/sra-api/add-defaultsFrancesco Agosti2018-08-143-6/+9
|\ \ | |/ |/|
| * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-1489-415/+667
| |\ | |/ |/|
* | PublishAlex Browne2018-08-1432-280/+269
* | Updated CHANGELOGSAlex Browne2018-08-1457-135/+398
| * Add defaults for networkId and paginationfragosti2018-08-144-7/+10
|/
* fix(0x.js, order-utils): Fix CHANGELOG.json versionsAlex Browne2018-08-142-16/+6
* Run publish/installation tests in CircleCI (#951)Alex Browne2018-08-144-46/+134
* Merge pull request #932 from 0xProject/fix-ganache-forkFabio Berger2018-08-145-12/+7
|\
| * Move to depFabio Berger2018-07-311-1/+1
| * Remove outdated parts of DockerfileFabio Berger2018-07-311-5/+0
| * Fix github dep to point to branchFabio Berger2018-07-313-6/+6
* | Merge pull request #914 from 0xProject/feature/0x.js/ec-signature-stringJacob Evans2018-08-1413-140/+225
|\ \
| * | Update version numbers.Jacob Evans2018-08-145-10/+12
| * | Rename from SignerProviderType.EthSign to SignerType.DefaultJacob Evans2018-08-119-115/+116
| * | Update Changelogs. Rebased from developmentJacob Evans2018-08-095-11/+35
| * | Update jsdocJacob Evans2018-08-092-5/+5
| * | Introduce SignerProviderTypeJacob Evans2018-08-0911-118/+176
* | | Merge pull request #958 from 0xProject/feature/sra-api/camel-case-everythingFrancesco Agosti2018-08-1411-38/+58
|\ \ \
| * | | Ignore api.json in prettierfragosti2018-08-142-1044/+2
| * | | apply prettierfragosti2018-08-142-4/+1047
| * | | Enforce camelCase for all parameters and change the way the site is deployed ...fragosti2018-08-1110-35/+54
* | | | fix(sol-compiler, sol-resolver): Bug where sol-resolver tried to read a direc...Alex Browne2018-08-144-1/+7
* | | | Merge pull request #955 from feuGeneA/patch-6Fabio Berger2018-08-141-5/+5
|\ \ \ \
| * | | | a to-do list should be in the imperative moodF. Eugene Aumson2018-08-101-5/+5
| |/ / /
* | | | Merge pull request #938 from 0xProject/sol-cov-fixesFabio Berger2018-08-1410-22/+162
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'sol-cov-fixes' of github.com:0xProject/0x-monorepo into sol-cov...Fabio Berger2018-08-1486-203/+1673
| |\ \ \
| | * | | Merge branch 'development' into sol-cov-fixesLeonid Logvinov2018-08-0984-201/+1663
| | |\| |
| | * | | Add @return commentsLeonid Logvinov2018-08-091-0/+9
| | * | | Import marshaller directlyLeonid Logvinov2018-08-091-2/+1
| * | | | Remove test for unknown prop now that we are allowing additional props fro tx...Fabio Berger2018-08-141-4/+0
| |/ / /
| * | | Add commentsLeonid Logvinov2018-08-031-0/+39
| * | | Add PR numbersLeonid Logvinov2018-08-034-10/+17
| * | | Add sol-cov CHANGELOGLeonid Logvinov2018-08-031-0/+20
| * | | Read truffle compiler config from truffle.js and assert that the passed solid...Leonid Logvinov2018-08-031-7/+51
| * | | Use CallDataRPC in subproviderLeonid Logvinov2018-08-031-7/+8
| * | | Add a TODO for failed transactionsLeonid Logvinov2018-08-031-0/+1
| * | | Export RPC data types from web3-wrapperLeonid Logvinov2018-08-032-1/+14
| * | | Alow additional properties in txData json-schemaLeonid Logvinov2018-08-032-1/+8
| * | | Export marshaller from web3-wrapperLeonid Logvinov2018-08-032-0/+9
* | | | Merge pull request #948 from 0xProject/feature/contracts/forwarderFoKAmir Bandeali2018-08-1010-163/+84
|\ \ \ \
| * | | | Change withdrawERC20 => withdrawAsset, reuse transfer logicAmir Bandeali2018-08-106-22/+40
| * | | | Make marketBuy functions revert if entire amount not filledAmir Bandeali2018-08-106-141/+44
* | | | | Merge pull request #916 from 0xProject/feature/sra/add-sra-packageFrancesco Agosti2018-08-1081-992/+2742
|\ \ \ \ \
| * | | | | Fix order-watcher json-schemasfragosti2018-08-101-1/+1
| * | | | | Fix linting issuesfragosti2018-08-102-2/+1
| * | | | | fix contract-wrappers json-schemasfragosti2018-08-1015-271/+186
| * | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-1060-136/+601
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #949 from 0xProject/fix/update-dependenciesAlex Browne2018-08-1030-45/+45
|\ \ \ \ \ \
| * | | | | | fix: Update dependenciesAlex Browne2018-08-1030-45/+45
| | |/ / / / | |/| | | |
* | | | | | Update Clays linkedinfragosti2018-08-101-1/+1
* | | | | | Merge https://github.com/0xProject/0x-monorepo into developmentfragosti2018-08-1027-45/+504
|\| | | | |
| * | | | | Merge pull request #941 from 0xProject/feature/contracts/returnValuesTestsAmir Bandeali2018-08-107-34/+120
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Revert incrementing memory ptr in dispatchTransferFromAmir Bandeali2018-08-093-9/+3
| | * | | | Test abiEncodeFillOrder as part of combinatorial follOrder testsAmir Bandeali2018-08-094-16/+46
| | * | | | Increment free memory pointer for internal Exchange functions that use asmAmir Bandeali2018-08-093-12/+34
| | * | | | Add return values to combinatorial fillOrder testsAmir Bandeali2018-08-092-11/+51
| * | | | | Merge pull request #915 from 0xProject/feature/encode-decode-checksAlex Browne2018-08-0920-11/+384
| |\ \ \ \ \
| | * | | | | Update comment about ethers checksummed address behaviorAlex Browne2018-08-091-3/+3
| | * | | | | Add packages/coverage/.gitkeep fileAlex Browne2018-08-091-0/+0
| | * | | | | Update CI config and package.json to run @0xproject/utils tests on CIAlex Browne2018-08-092-1/+6
| | * | | | | Update remaining CHANGELOG.json filesAlex Browne2018-08-094-0/+22
| | * | | | | Update CHANGELOG.json for contract-wrappersAlex Browne2018-08-091-0/+4
| | * | | | | Update ethers typings for TypeScript 2.9.2Alex Browne2018-08-091-2/+2
| | * | | | | Update CHANGELOG.json for base-contractAlex Browne2018-08-091-0/+9
| | * | | | | Move some ethers-related types to typescript-typings/ethersAlex Browne2018-08-093-13/+25
| | * | | | | Apply prettierAlex Browne2018-08-095-25/+36
| | * | | | | Add strictArgumentEncodingCheck to BaseContract and use it in contract templatesAlex Browne2018-08-0911-9/+319
* | | | | | | Add clay to websitefragosti2018-08-102-0/+11
|/ / / / / /
* | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into d...fragosti2018-08-091-4/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #946 from 0xProject/fix/contracts/signatureValidatorCommentsAmir Bandeali2018-08-091-4/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix comments and styling for MixinSignatureValidatorAmir Bandeali2018-08-091-4/+9
* | | | | | Change amir picturefragosti2018-08-093-1/+1
|/ / / / /
| | * | | Apply prettierfragosti2018-08-101-6/+14
| | * | | Change scripts folder to build_scriptsfragosti2018-08-102-1/+7
| | * | | Force case change in filefragosti2018-08-101-0/+0
| | * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-0937-72/+124
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge pull request #947 from 0xProject/feature/confirm-before-publishAlex Browne2018-08-092-9/+15
|\ \ \ \ \
| * | | | | fix(monorepo-scripts): Fix typo in git tag commandAlex Browne2018-08-091-1/+1
| * | | | | feat(monorepo-scripts): Add confirmation prompt before publishingAlex Browne2018-08-092-75/+14
* | | | | | Merge pull request #945 from 0xProject/fix/typescript-2.9.2Alex Browne2018-08-0932-101/+53
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update TypeScript to version 2.9.2Alex Browne2018-08-0932-101/+53
| |/ / / /
* | | | | Merge pull request #925 from 0xProject/refactor/contracts/hashingAmir Bandeali2018-08-093-29/+56
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use asm for hashEIP712Message, increment free memory pointer after asm hashin...Amir Bandeali2018-08-092-9/+28
| * | | | Fix comments, styling, and optimize hashOrderAmir Bandeali2018-08-083-25/+33
|/ / / /
| * | | Remove md hints because the static site cannot handle themfragosti2018-08-091-4/+4
| * | | Add section about json-schemas and sra reportfragosti2018-08-091-4/+30
| * | | Fix links in markdownfragosti2018-08-091-8/+8
| * | | Add to changelog and fix OrderBook typofragosti2018-08-095-9/+19
| * | | Correct orderbook typofragosti2018-08-093-7/+7
| * | | Enforce that error code are ints not numberfragosti2018-08-091-2/+2
| * | | Remove tests directory, use swagger api, make json api compliantfragosti2018-08-097-29/+201
| * | | Change remainingFillableAmount to metaDatafragosti2018-08-092-4/+6
| * | | Change some static side configsfragosti2018-08-082-13/+15
| * | | Add POST order endpointfragosti2018-08-085-12/+56
| * | | Add GET fee_recipientsfragosti2018-08-085-0/+39
| * | | Add GET order_configfragosti2018-08-085-0/+43
| * | | token_pairs -> asset_pairsfragosti2018-08-081-4/+4
| * | | Add GET OrderBook endpointfragosti2018-08-083-0/+92
| * | | Add GET order endpoint specfragosti2018-08-083-1/+47
| * | | Add orders endpointfragosti2018-08-084-1/+175
| * | | Minor refactoringfragosti2018-08-084-26/+7
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-0873-1574/+2436
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #937 from 0xProject/feature/contract-wrappers/forwarder-es...Brandon Millman2018-08-079-2/+462
|\ \ \ \
| * | | | Remove assertion commentsBrandon Millman2018-08-071-4/+0
| * | | | Remove 0x test case from hexSchema testBrandon Millman2018-08-061-1/+1
| * | | | Update CHANGELOGsBrandon Millman2018-08-062-0/+13
| * | | | Add some test cases that stress slippageBufferAmount paramBrandon Millman2018-08-061-6/+15
| * | | | Add tests for findFeeOrdersThatCoverFeesForTargetOrdersBrandon Millman2018-08-064-20/+165
| * | | | Change orderStates param name to remaingFillableMakerAssetAmountsBrandon Millman2018-08-063-91/+69
| * | | | Implement first round of tests for findOrdersThatCoverMakerAssetFillAmountBrandon Millman2018-08-065-12/+222
| * | | | Update hex schema to match 0xBrandon Millman2018-08-061-1/+1
| * | | | Move helper functions into order-utilsBrandon Millman2018-08-063-100/+111
| * | | | Add findFeeOrdersThatCoverFeesForTargetOrders to ForwarderWrapperBrandon Millman2018-08-061-5/+60
| * | | | Add findOrdersThatCoverMakerAssetFillAmount static method on ForwarderWrapperBrandon Millman2018-08-061-1/+44
|/ / / /
* | | | Merge pull request #936 from 0xProject/feature/contract-wrappers/forwader-opt...Brandon Millman2018-08-0613-44/+241
|\ \ \ \
| * | | | Move CreateOrderOpts into shared typesBrandon Millman2018-08-063-12/+22
| * | | | Update createFactory to accept one createOrderOpts param to encompass all opt...Brandon Millman2018-08-064-41/+59
| * | | | PrettierBrandon Millman2018-08-041-1/+0
| * | | | Fix CHANGELOGsBrandon Millman2018-08-043-3/+12
| * | | | Update orderFactory interfaceBrandon Millman2018-08-044-33/+28
| * | | | Rename to calldata utilsBrandon Millman2018-08-033-16/+16
| * | | | Add missing PR numbersBrandon Millman2018-08-032-2/+3
| * | | | CHANGELOGBrandon Millman2018-08-021-0/+4
| * | | | Add testsBrandon Millman2018-08-022-18/+85
| * | | | Add createOrder with no signing to orderFactoryBrandon Millman2018-08-023-6/+45
| * | | | Create marketBuyOrdersOptimizationsBrandon Millman2018-08-023-8/+63
|/ / / /
* | | | Update contract-wrappers CHANGELOG.jsonBrandon Millman2018-08-021-0/+9
* | | | Merge pull request #934 from 0xProject/feature/contract-wrappers/forwaderBrandon Millman2018-08-0211-10/+448
|\ \ \ \ | |_|/ / |/| | |
| * | | Clarify ethAmount is in weiBrandon Millman2018-07-311-2/+2
| * | | Update forwarder_wrapper_testBrandon Millman2018-07-311-0/+16
| * | | Add more assertionsBrandon Millman2018-07-313-6/+102
| * | | Write initial test for forwarder_wrapperBrandon Millman2018-07-312-16/+73
| * | | Fix spelling error in exchange wrapper testsBrandon Millman2018-07-311-1/+1
| * | | Add getOrdersInfo to exchange_wrapperBrandon Millman2018-07-313-3/+32
| * | | Implement initial forwarder wrapperBrandon Millman2018-07-318-2/+242
* | | | Add the CHANGELOG entry for #909Leonid Logvinov2018-07-311-0/+9
* | | | Merge pull request #909 from joincivil/ritave/resolver-check-dirsLeonid Logvinov2018-07-312-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'development' into ritave/resolver-check-dirsLeonid Logvinov2018-07-31208-6745/+59805
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #931 from 0xProject/feature/website/meta-tagsBrandon Millman2018-07-318-73/+138
|\ \ \ \
| * | | | Add back tags in htmlBrandon Millman2018-07-311-1/+7
| * | | | Fix jobs page overflow issueBrandon Millman2018-07-303-4/+6
| * | | | Create MetaTags componentBrandon Millman2018-07-307-76/+133
|/ / / /
* | | | Merge pull request #910 from 0xProject/feature/website/upgrade-allowance-togg...Francesco Agosti2018-07-2814-180/+346
|\ \ \ \
| * \ \ \ Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-07-28195-6494/+59326
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Add note about needing Yarn 1.6 to READMEFabio Berger2018-07-271-3/+5
* | | | | Add combinatorial tests for internal Exchange functions (#807)Alex Browne2018-07-2724-1269/+788
| |_|_|/ |/| | |
| * | | Remove unused variablefragosti2018-07-281-1/+0
| * | | Add loading state for initial load and other PR feedbackfragosti2018-07-282-10/+14
| * | | Make a non-jank Spinner component and use itfragosti2018-07-254-3/+84
| * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-07-25131-2380/+2820
| |\ \ \
| * | | | Center allowance toggles in account pagefragosti2018-07-251-7/+9
| * | | | Increase allowance toggle loading spinner size by 1fragosti2018-07-251-1/+1
| * | | | Add unlocking and locking token copyfragosti2018-07-251-2/+2
| * | | | Hide tooltip after allowance toggle clickfragosti2018-07-251-1/+3
| * | | | Make tooltip appear to the left of the toggle when onboarding in progressfragosti2018-07-256-3/+20
| * | | | Fix tooltip wrapping issue in onboardinfragosti2018-07-252-8/+16
| * | | | Fix wrap button alignment issuefragosti2018-07-257-224/+40
| * | | | WIP for allowance toggle redesign workingfragosti2018-07-214-16/+118
| * | | | Show token name dynamically in tooltipfragosti2018-07-214-13/+19
| * | | | Implement tooltipsfragosti2018-07-212-8/+56
| * | | | Add loading statefragosti2018-07-213-3/+4
| * | | | Have basic lock and check working in waleltfragosti2018-07-204-13/+93
| | | * | Added fix to CHANGELOGOlaf Tomalka2018-07-271-0/+4
| | | * | Fixed the relative resolver not checking if the file can be read in theOlaf Tomalka2018-07-251-1/+1
| | |/ /
| | | * Add discharge config and deployfragosti2018-08-084-14/+180
| | | * Add static site buildfragosti2018-08-083-4/+3
| | | * Add markdown sectionfragosti2018-08-083-3/+188
| | | * Refactor using some utility methodsfragosti2018-08-036-109/+135
| | | * Add errors and headersfragosti2018-08-032-0/+50
| | | * Limit error codes with rangesfragosti2018-08-031-2/+2
| | | * Create asset_pairs SRA endpoint (and establish conventions)fragosti2018-08-034-172/+81
| | | * Enforce stronger naming convention for json schema idsfragosti2018-08-0325-107/+107
| | | * All schema tests paddingfragosti2018-08-021-6/+17
| | | * update orders channel subscribe schemafragosti2018-08-022-76/+14
| | | * Update order book schema testfragosti2018-08-021-18/+43
| | | * Add relayerApiOrdersResponseTestfragosti2018-08-021-0/+33
| | | * Add tests for asset pair endpointfragosti2018-08-022-85/+111
| | | * Group all standard relayer api tests togetherfragosti2018-08-011-405/+406
| | | * Add test for relayerApiOrderSchemafragosti2018-08-014-3/+20
| | | * Add paginated collection test casefragosti2018-08-013-5/+33
| | | * Get schema tests running (not crashiing)fragosti2018-08-016-164/+125
| | | * Update schemas exportfragosti2018-07-311-23/+17
| | | * Update json-schemas for SRA v1fragosti2018-07-3118-118/+160
| | | * Add scriptsfragosti2018-07-282-6/+4
| | | * Add to READMEfragosti2018-07-271-1/+23
| | | * Create API development environment and json distributionfragosti2018-07-273-25/+459
| | | * Rename to sra-apifragosti2018-07-279-7/+8
| | | * Add typescript typings for Open API specfragosti2018-07-273-1/+19
| | | * Reset CHANGELOGfragosti2018-07-272-187/+3
| | | * Add basic smoke testfragosti2018-07-278-78/+201
| | | * Initial commitfragosti2018-07-278-0/+315
| |_|/ |/| |
* | | Publishcontracts@2.1.39@0xproject/website@0.0.43@0xproject/testnet-faucets@1.0.40@0xproject/react-docs-example@0.0.19@0xproject/metacoin@0.0.14@0xproject/abi-gen@1.0.4Fabio Berger2018-07-2627-151/+151
* | | Updated CHANGELOGSFabio Berger2018-07-2636-10/+184
* | | Update yarn.lockFabio Berger2018-07-261-0/+67
* | | Point to actual current versionFabio Berger2018-07-2611-22/+22
* | | Add changelog entries for other RCs that did publishFabio Berger2018-07-262-0/+16
* | | Fix changelogs and package versions for ones that weren't publishedFabio Berger2018-07-2616-21/+13
* | | Fix circle.ymlFabio Berger2018-07-261-1/+1
* | | Publishcontracts@2.1.38@0xproject/website@0.0.42@0xproject/testnet-faucets@1.0.39@0xproject/sol-compiler@1.0.3@0xproject/react-docs-example@0.0.18@0xproject/monorepo-scripts@1.0.4@0xproject/metacoin@0.0.13@0xproject/abi-gen@1.0.3Fabio Berger2018-07-2631-252/+252
* | | Updated CHANGELOGSFabio Berger2018-07-2652-7/+289
* | | Still test unrunnable packages for compilation issuesFabio Berger2018-07-261-8/+8
* | | Add changelog entries for next RC publishFabio Berger2018-07-267-0/+56
* | | Expose lerna depFabio Berger2018-07-261-1/+1
* | | Split running packages that cannot be run in a node.js scriptFabio Berger2018-07-261-1/+9
* | | Fix accidental import from test folderFabio Berger2018-07-261-1/+1
* | | Re-enable deleted the dir after test runsFabio Berger2018-07-261-1/+1
* | | Change test:installation so it also causes run-time errors to appearFabio Berger2018-07-261-3/+10
* | | Fix lint issueFabio Berger2018-07-261-2/+1
* | | Always append monorepo root path so script can be called from anywhereFabio Berger2018-07-261-3/+5
* | | Delete any remenants of test-env dir before creating a new oneFabio Berger2018-07-261-0/+1
* | | Print version that will be testedFabio Berger2018-07-261-1/+1
* | | Add ending slashFabio Berger2018-07-261-1/+1
* | | Add support for testing installations post-publish as wellFabio Berger2018-07-262-2/+5
* | | Fix asset pathFabio Berger2018-07-261-2/+2
* | | Publishcontracts@2.1.37@0xproject/website@0.0.41@0xproject/testnet-faucets@1.0.38@0xproject/react-docs-example@0.0.17@0xproject/monorepo-scripts@1.0.3@0xproject/metacoin@0.0.12@0xproject/abi-gen@1.0.2Fabio Berger2018-07-2631-261/+257
* | | Updated CHANGELOGSFabio Berger2018-07-2652-8/+299
* | | Fix linterFabio Berger2018-07-262-3/+0
* | | Revert to using execAsyncFabio Berger2018-07-261-10/+2
* | | update yarn.lockFabio Berger2018-07-261-7/+0
* | | Revert to publishing ethereum-typesFabio Berger2018-07-2618-18/+17
* | | Fix marshaller importFabio Berger2018-07-261-1/+1
* | | Update yarn.lockFabio Berger2018-07-261-0/+7
* | | Temporarily have all packages depend on an older, published version of ethere...Fabio Berger2018-07-2617-17/+17
* | | Temporarily make ethereum-types private to exclude from publishingFabio Berger2018-07-261-0/+1
* | | Add order-watcher artifacts to gitignoreFabio Berger2018-07-261-1/+2
* | | Fix changelogsFabio Berger2018-07-266-3/+30
* | | Remove artifacts for gitFabio Berger2018-07-264-3256/+0
* | | Call 'lerna publish' with spawn so we see stderr and stdout in real-timeFabio Berger2018-07-261-2/+10
* | | Merge pull request #902 from 0xProject/feature/web3-wrapper/unexport-marshallerFrancesco Agosti2018-07-263-2/+6
|\ \ \
| * \ \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-07-26177-3870/+4542
| |\ \ \
| * | | | Add remove marshaller to changelog notesfragosti2018-07-201-0/+8
| * | | | Stop exporting marshaller from web3-wrapperfragosti2018-07-203-6/+2
* | | | | Remove careers page feature flagBrandon Millman2018-07-262-14/+2
* | | | | Merge pull request #893 from 0xProject/feature/website/jobs-page-part2Brandon Millman2018-07-2630-438/+420
|\ \ \ \ \
| * | | | | Header copy changeBrandon Millman2018-07-261-8/+7