aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Missing/superfluous type exports from connectFabio Berger2018-08-231-2/+6
* Break with -1 so that the exit code of the loop if hit is non-zeroFabio Berger2018-08-231-1/+1
* Prettier fixFabio Berger2018-08-231-1/+1
* merge developmentFabio Berger2018-08-2358-812/+1002
|\
| * Merge pull request #974 from 0xProject/feature/connect/sra-api-v2Francesco Agosti2018-08-2358-812/+1002
| |\
| | * Run prettierfragosti2018-08-231-1/+1
| | * Remove comment in updates json-schemas docfragosti2018-08-231-1/+0
| | * Add documentation for json-schemasfragosti2018-08-232-0/+36
| | * Fix typofragosti2018-08-222-1/+2
| | * Remove artifactsfragosti2018-08-221-10036/+0
| | * Update variable names, make release candidatefragosti2018-08-222-4/+4
| | * Update more names in docsfragosti2018-08-211-3/+4
| | * Improve documentationfragosti2018-08-213-6/+15
| | * Pin sra-report to 0xproject/connect v1.0.4fragosti2018-08-213-2/+16
| | * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-2153-58535/+46
| | |\
| | * \ Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-2160-1043/+2836
| | |\ \
| | * | | Run prettierfragosti2018-08-2112-35/+33
| | * | | lint everythingfragosti2018-08-213-9/+8
| | * | | Update websocket for SRA v2fragosti2018-08-2112-74/+71
| | * | | Remove default query parametersfragosti2018-08-188-37/+2880
| | * | | Add networkId request param optionfragosti2018-08-187-39/+64
| | * | | Rename websocket files and typesfragosti2018-08-174-36/+34
| | * | | Use uuid as string for requestIdfragosti2018-08-173-6/+14
| | * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-1747-214/+633
| | |\ \ \
| | * | | | 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
* | | | | | Replace complicated camelCase to spaces logic with change-case packageFabio Berger2018-08-233-22/+140
* | | | | | Add/improve commentsFabio Berger2018-08-233-5/+11
* | | | | | Fix changelogsFabio Berger2018-08-232-3/+4
* | | | | | Merge branch 'development' into wrap-typedocFabio Berger2018-08-231-1/+1
|\| | | | |
| * | | | | Merge pull request #996 from 0xProject/fix/npm-auto-login-delayFabio Berger2018-08-231-1/+1
| |\ \ \ \ \
| | * | | | | fix: Increase delay for non-interactive npm loginAlex Browne2018-08-221-1/+1
* | | | | | | Refactor publish script so that root package.json configs.packagesWithDocs is...Fabio Berger2018-08-2313-57/+41
* | | | | | | Fix many linter errors that showed up upon upgrading tsutilFabio Berger2018-08-2324-94/+83
* | | | | | | Remove monorepo-scripts from tslintconfig.jsonFabio Berger2018-08-221-1/+1
* | | | | | | Use actual packageName for external example importsFabio Berger2018-08-2215-2/+17
* | | | | | | Update all CHANGELOGsFabio Berger2018-08-228-2/+83
* | | | | | | Fix prettierFabio Berger2018-08-222-6/+7
* | | | | | | Update contract-wrappers CHANGELOGFabio Berger2018-08-221-2/+6
* | | | | | | Ignore error of first yarn installFabio Berger2018-08-221-1/+1
* | | | | | | Double install catching first ones errorFabio Berger2018-08-221-1/+3
* | | | | | | Add yarn cache cleanFabio Berger2018-08-221-0/+1
* | | | | | | Remove duplicate install cmdFabio Berger2018-08-221-3/+0
* | | | | | | Run yarn twice on CIFabio Berger2018-08-221-2/+3
* | | | | | | Check yarn info on CircleCiFabio Berger2018-08-221-0/+2
* | | | | | | Improve READMEFabio Berger2018-08-221-1/+1
* | | | | | | Fix remaining merge issuesFabio Berger2018-08-227-43/+39
* | | | | | | Merge development branchFabio Berger2018-08-22125-60381/+7836
|\| | | | | |
| * | | | | | Merge pull request #985 from 0xProject/feature/contracts/orderValidatorAmir Bandeali2018-08-2228-32/+1667
| |\ \ \ \ \ \
| | * | | | | | Add getBalancesAndAllowancesAmir Bandeali2018-08-222-0/+69
| | * | | | | | Add ZRX balances and allowances to TraderInfoAmir Bandeali2018-08-225-34/+364
| | * | | | | | Add OrderValidator to migrationsAmir Bandeali2018-08-229-7/+603
| | * | | | | | Add testsAmir Bandeali2018-08-225-1/+451
| | * | | | | | Don't throw if ERC721 token isn't ownedAmir Bandeali2018-08-221-1/+51
| | * | | | | | Add OrderValidator contractAmir Bandeali2018-08-2214-23/+163
| |/ / / / / /
| * | | | | | Merge pull request #995 from 0xProject/refactor/contracts/forwarderConstructorAmir Bandeali2018-08-224-12/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Remove redundant constructor argsAmir Bandeali2018-08-224-12/+8
| |/ / / / /
| * | | | | Merge pull request #994 from feuGeneA/remove-more-v2-artifactsFabio Berger2018-08-222-10348/+0
| |\ \ \ \ \
| | * | | | | remove more v2 contract artifactsF. Eugene Aumson2018-08-212-10348/+0
| | | |_|_|/ | | |/| | |
| * / | | | Fix file name from camel to snake caseFabio Berger2018-08-212-1/+1
| |/ / / /
| * | | | Merge pull request #987 from 0xProject/feature/add-sra-to-readmeFrancesco Agosti2018-08-211-0/+1
| |\ \ \ \
| | * | | | Apply prettirfragosti2018-08-211-1/+1
| | * | | | Add sra-api to READMEfragosti2018-08-211-0/+1
| | | |_|/ | | |/| |
| * | | | Merge pull request #990 from 0xProject/feature/website/update-onboarding-lock...Brandon Millman2018-08-212-5/+3
| |\ \ \ \
| | * | | | Update lock icon in onboardingBrandon Millman2018-08-212-5/+3
| * | | | | Merge pull request #989 from 0xProject/fix/sol-cov-incorrect-filesAlex Browne2018-08-211-1/+1
| |\ \ \ \ \
| | * | | | | fix(sol-cov): Remove old files and update config.contractsDirAlex Browne2018-08-213-191/+1
| * | | | | | Merge pull request #976 from feuGeneA/remove-v2-artifactsAmir Bandeali2018-08-2144-58525/+19
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | change clean to also remove generated artifactsF. Eugene Aumson2018-08-211-1/+1
| | * | | | | remove disabled scriptsF. Eugene Aumson2018-08-211-2/+0
| | * | | | | remove v2 contract artifactsF. Eugene Aumson2018-08-2144-58524/+20
| | | |/ / / | | |/| | |
| * | | | | Add Matt Taylor to websiteBrandon Millman2018-08-212-1/+8
| | |/ / / | |/| | |
| * | | | Merge pull request #988 from 0xProject/fix/website/build-errorBrandon Millman2018-08-213-3/+14
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add CODEOWNERS fileBrandon Millman2018-08-211-0/+8
| | * | | Remove exit 0 from website build commandBrandon Millman2018-08-211-1/+1
| | * | | Revert error renamesBrandon Millman2018-08-211-2/+5
| |/ / /
| * | | Update yarn lockBrandon Millman2018-08-211-2/+2
| * | | Change Yarn verson in READMEFabio Berger2018-08-191-7/+1
| * | | Merge pull request #975 from 0xProject/feature/contract-wrappers/executeTrans...Fabio Berger2018-08-194-0/+524
| |\ \ \
| | * | | Rename to Transaction Encoder.Jacob Evans2018-08-186-240/+521
| | * | | [Contract-wrappers] Exchange execute transaction encoderJacob Evans2018-08-163-0/+243
| * | | | Merge pull request #933 from 0xProject/refactor/contracts/tokensAmir Bandeali2018-08-1846-834/+4771
| |\ \ \ \
| | * | | | Update artifactsAmir Bandeali2018-08-177-52/+195
| | * | | | Fix typos, run prettier, and allow anyone to call on DummyERC721TokenAmir Bandeali2018-08-178-16/+17
| | * | | | Update CHANGELOGsAmir Bandeali2018-08-172-0/+13
| | * | | | Fix Geth testsAmir Bandeali2018-08-171-9/+9
| | * | | | Fix linting errorsAmir Bandeali2018-08-178-11/+10
| | * | | | Fix tests that assumed logs were being filteredAmir Bandeali2018-08-174-4/+11
| | * | | | Add tests for ERC721TokenAmir Bandeali2018-08-174-2/+281
| | * | | | Add ERC721Receiver that returns incorrect valueAmir Bandeali2018-08-173-1/+68
| | * | | | Add ERC721 revert reasons to typesAmir Bandeali2018-08-171-0/+5
| | * | | | Store methodId and number of indexed args in AbiDecoder to differentiate betw...Amir Bandeali2018-08-171-5/+9
| | * | | | Increase max mintable amountAmir Bandeali2018-08-173-16/+16
| | * | | | Fix DummyERC721ReceiverAmir Bandeali2018-08-173-141/+57
| | * | | | Update artifactsAmir Bandeali2018-08-179-98/+3263
| | * | | | Add tests for ERC20 token with no return valuesAmir Bandeali2018-08-176-5/+261
| | * | | | Add constructor back to DummyERC721TokenAmir Bandeali2018-08-172-0/+14
| | * | | | Restructure directoriesAmir Bandeali2018-08-176-52/+103
| | * | | | Update checking for erc721 existenceAmir Bandeali2018-08-171-3/+2
| | * | | | Update ERC20TokenAmir Bandeali2018-08-176-47/+113
| | * | | | Optimize ERC721TokenAmir Bandeali2018-08-175-510/+462
| |/ / / /
| * | | | Merge pull request #978 from 0xProject/feature/lenra-3.0.0-beta.25Alex Browne2018-08-172-22/+21
| |\ \ \ \
| | * | | | feat: Update lerna to version 3.0.0-beta.25 of our forkAlex Browne2018-08-172-23/+22
| | |/ / /
| * | | | Merge pull request #965 from feuGeneA/sol-compile-lotFabio Berger2018-08-178-92/+276
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'development' into sol-compile-lotF. Eugene Aumson2018-08-1750-268/+696
| | |\ \ \
| | * | | | move doesFileExist to fsWrapperF. Eugene Aumson2018-08-172-13/+13
| | * | | | change some *Sync to *AsyncF. Eugene Aumson2018-08-172-4/+19
| | * | | | clarify variable names for artifact mod timesF. Eugene Aumson2018-08-171-6/+6
| | * | | | flatten out interface to verifyAndPersist* methodF. Eugene Aumson2018-08-171-6/+6
| | * | | | clarify iteration rangeF. Eugene Aumson2018-08-171-1/+2
| | * | | | scrap comments in favor of self-documentationF. Eugene Aumson2018-08-171-3/+2
| | * | | | declare contractData before adding to mapF. Eugene Aumson2018-08-171-2/+3
| | * | | | change `return Promise<void>` to `await...`F. Eugene Aumson2018-08-171-1/+1
| | * | | | consolidate binPaths... ref's into fullSolcVersionF. Eugene Aumson2018-08-171-2/+2
| | * | | | extract method _shouldCompile()F. Eugene Aumson2018-08-161-13/+12
| | * | | | clarify recompilation testsF. Eugene Aumson2018-08-161-6/+8
| | * | | | change .rejectedWith(error) to .rejected()F. Eugene Aumson2018-08-161-1/+1
| | * | | | follow chai_setup patternF. Eugene Aumson2018-08-163-2/+16
| | * | | | renamed variable `compiled` to `compilerOutput`F. Eugene Aumson2018-08-161-6/+6
| | * | | | use `for...of _.keys` instead of `for...in`F. Eugene Aumson2018-08-161-5/+1
| | * | | | raise error for unknown compiler versionF. Eugene Aumson2018-08-161-0/+3
| | * | | | commentsF. Eugene Aumson2018-08-161-0/+3
| | * | | | remedy missing *IfExists identifier suffixF. Eugene Aumson2018-08-161-6/+3
| | * | | | extract interfaces for re-used complex data typesF. Eugene Aumson2018-08-161-23/+28
| | * | | | move getSolcAsync to static private methodF. Eugene Aumson2018-08-161-23/+23
| | * | | | rename variable inputsByVersion to versionToInputsF. Eugene Aumson2018-08-161-8/+8
| | * | | | move getSolcAsync to static private methodF. Eugene Aumson2018-08-161-25/+24
| | * | | | Update changelogF. Eugene Aumson2018-08-151-0/+10
| | * | | | test compilerF. Eugene Aumson2018-08-154-12/+82
| | * | | | simplify method interfaceF. Eugene Aumson2018-08-151-8/+12
| | * | | | simplify method parameterF. Eugene Aumson2018-08-151-6/+4
| | * | | | corrected whitespace (no functional changes)F. Eugene Aumson2018-08-151-39/+41
| | * | | | compile contracts in batchesF. Eugene Aumson2018-08-151-31/+70
| | * | | | extract method _verifyAndPersistCompilationAsync()F. Eugene Aumson2018-08-151-1/+18
| | * | | | extract method _compile()F. Eugene Aumson2018-08-151-24/+27
| | * | | | extract function getSolcAsync()F. Eugene Aumson2018-08-151-18/+25
| * | | | | Merge pull request #970 from 0xProject/dependabot/npm_and_yarn/copy-webpack-p...dependabot[bot]2018-08-171-4/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Bump copy-webpack-plugin from 4.5.1 to 4.5.2dependabot[bot]2018-08-171-4/+4
| |/ / / /
* | | | | Fix bugs in doc gen due to clone vs cloneDeep and pre-maturely removing place...Fabio Berger2018-08-221-7/+7
* | | | | Fix index.ts given fix in doc generationFabio Berger2018-08-224-31/+11
* | | | | Move types from sol-compiler to types so they can be used in other places wit...Fabio Berger2018-08-2230-111/+190
* | | | | Add generated_docs dir to clean commandFabio Berger2018-08-2211-11/+11
* | | | | Stop logging to console for each packages without a package.jsonFabio Berger2018-08-221-1/+1
* | | | | Use bash for loop for generating docs for each package, revert changes to scriptFabio Berger2018-08-227-67/+67
* | | | | Modify script so it can generate docs for a specific package or all packages...Fabio Berger2018-08-224-40/+65
* | | | | Add shouldUpload flag to docGenAndUpload commandFabio Berger2018-08-222-2/+16
* | | | | Fix lowercase names involving ERC acronymFabio Berger2018-08-221-1/+7
* | | | | Add doc comments to AbiDecoderFabio Berger2018-08-221-1/+18
* | | | | Fix sol-cov index.tsFabio Berger2018-08-221-11/+10
* | | | | Fix sol-compiler index.tsFabio Berger2018-08-221-9/+1
* | | | | Fix order-watcher index.tsFabio Berger2018-08-221-3/+9
* | | | | Fix typeFabio Berger2018-08-221-0/+1
* | | | | Don't check if types are used for libraries only include typesFabio Berger2018-08-222-1/+10
* | | | | Fix up order-utilsFabio Berger2018-08-213-5/+30
* | | | | Rather then look for typeArguments, we want to ignore Partial & Promise refe...Fabio Berger2018-08-211-1/+2
* | | | | Add link to Array typeFabio Berger2018-08-211-0/+1
* | | | | Add missing exports to 0x.js and contract-wrappers index.tsFabio Berger2018-08-212-0/+4
* | | | | Add missing keyFabio Berger2018-08-211-1/+1
* | | | | Move sol-compiler dep to `dependencies` now that types from it are exported i...Fabio Berger2018-08-211-1/+1
* | | | | Implement ignoring config typesFabio Berger2018-08-212-2/+7
* | | | | Add more types and ignores to docGenConfigsFabio Berger2018-08-211-3/+10
* | | | | Fix website given that it still depends on an old version of @0xproject/TypesFabio Berger2018-08-201-2/+5
* | | | | Cleanup web3-wrapper and subproviders index.tsFabio Berger2018-08-202-6/+26
* | | | | Cleanup connect index.tsFabio Berger2018-08-201-1/+1
* | | | | Cleanup contract-wrappers index.tsFabio Berger2018-08-207-40/+41
* | | | | Make sure we don't render protected propertiesFabio Berger2018-08-181-5/+9
* | | | | Make sure export isn't internal to the packageFabio Berger2018-08-181-1/+1
* | | | | Also ignore implementationOfFabio Berger2018-08-181-1/+1
* | | | | Refactor DocGenerateAndUploadUtils to be a class, and decompose large methods...Fabio Berger2018-08-183-348/+427
* | | | | Fix commentFabio Berger2018-08-171-1/+2
* | | | | Move doc configs to a separate fileFabio Berger2018-08-173-47/+59
* | | | | Remove outdating commentFabio Berger2018-08-176-12/+6
* | | | | Undo prettierFabio Berger2018-08-171-237/+237
* | | | | Update yarn.lockFabio Berger2018-08-171-3/+2
* | | | | Merge developmentFabio Berger2018-08-1751-242/+665
|\| | | |
| * | | | Merge pull request #928 from 0xProject/dependabot/npm_and_yarn/copyfiles-2.0.0Fabio Berger2018-08-1729-45/+30
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Bump copyfiles from 1.2.0 to 2.0.0dependabot[bot]2018-08-1529-45/+30
| * | | | Merge pull request #959 from 0xProject/bug/order-utils/rounding-error-small-m...Jacob Evans2018-08-1610-65/+232
| |\ \ \ \
| | * | | | Rename OrderAlreadyCancelledOrFilled -> OrderCancelled.Jacob Evans2018-08-165-37/+40
| | * | | | [Order-utils] Order is valid when maker amount is very smallJacob Evans2018-08-158-31/+195
| |/ / / /
| * | | | Merge pull request #954 from 0xProject/refactor/order-utils/market-utils-apiBrandon Millman2018-08-154-94/+131
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'development' into refactor/order-utils/market-utils-apiBrandon Millman2018-08-152-36/+45
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #920 from 0xProject/dependabot/npm_and_yarn/@types/fetch-m...Fabio Berger2018-08-152-36/+45
| |\ \ \ \
| | * | | | Bump @types/fetch-mock from 5.12.2 to 6.0.3dependabot[bot]2018-08-142-36/+45
| | | |/ / | | |/| |
| | | * | Merge branch 'development' into refactor/order-utils/market-utils-apiBrandon Millman2018-08-1539-44/+282
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #953 from 0xProject/feature/order-utils/order-sorting-utilsBrandon Millman2018-08-156-0/+230
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Update sortingUtils to support Order and SignedOrderBrandon Millman2018-08-141-44/+26
| | * | | Change rateUtils to use OrderBrandon Millman2018-08-141-20/+20
| | * | | Updated CHANGELOGBrandon Millman2018-08-101-0/+4
| | * | | Fix lint errorsBrandon Millman2018-08-104-11/+6
| | * | | Update tests for optional feeRateBrandon Millman2018-08-102-3/+14
| | * | | Make feeRate optional with a default of 0Brandon Millman2018-08-103-10/+13
| | * | | Add tests for sortingUtilsBrandon Millman2018-08-102-1/+66
| | * | | Implement sorting utilsBrandon Millman2018-08-102-0/+70
| | * | | Add tests for rateUtilsBrandon Millman2018-08-101-0/+55
| | * | | Implement rate utilsBrandon Millman2018-08-102-0/+45
| * | | | 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
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Add defaults for networkId and paginationfragosti2018-08-144-7/+10
| | | | * Make marketUtils interface compatible with Order and SignedOrderBrandon Millman2018-08-142-42/+42
| | | | * Update CHANGELOGBrandon Millman2018-08-141-0/+5
| | | | * Remove remaining amounts that are now defaults in testsBrandon Millman2018-08-141-36/+1
| | | | * Update marketUtils apiBrandon Millman2018-08-143-63/+125
| | |_|/ | |/| |
* | | | Fix external exports section nameFabio Berger2018-08-171-1/+1
* | | | Render external dep exportsFabio Berger2018-08-175-6/+50
* | | | Remove stray console logFabio Berger2018-08-171-1/+0
* | | | Add links for external dep exports to docJsonFabio Berger2018-08-171-4/+41
* | | | Remove unused ContractWrapper exportFabio Berger2018-08-171-2/+0
* | | | Export Web3ProviderEngine directly instead of indirectly via subprovidersFabio Berger2018-08-163-39/+44
* | | | Check for superfluous types in a packages index.ts and throw if they existFabio Berger2018-08-161-0/+31
* | | | Improve Error external linkFabio Berger2018-08-161-1/+1
* | | | Remove unused types from 0x.js index.ts discoveredFabio Berger2018-08-161-26/+0
* | | | Add externalTypeToLink to docJsonFabio Berger2018-08-161-0/+1
* | | | Move external types to link mapping to doc generation util and refactor typed...Fabio Berger2018-08-1617-322/+138
* | | | Add version to our custom DocJson formatFabio Berger2018-08-151-1/+3
* | | | Move purging private underscored items to the doc json generation phaseFabio Berger2018-08-154-30/+27
* | | | Link class reference types exported in same package to their declarationFabio Berger2018-08-1510-44/+163
* | | | Remove duplicate Typescript importFabio Berger2018-08-151-2/+1
* | | | Add ability to hide specific class constructorsFabio Berger2018-08-151-0/+21
* | | | Improve missing type detectionFabio Berger2018-08-151-4/+8
* | | | Flesh out 0x.js index.ts and added some exports to other index.ts in the processFabio Berger2018-08-154-6/+51
* | | | Merge in new 0x.js interfaceFabio Berger2018-08-1519-10889/+284
|\ \ \ \
| * | | | Remove 0x.js from Circle CIFabio Berger2018-08-141-245/+237
| * | | | Add PR nr.Fabio Berger2018-08-141-1/+2
| * | | | Fix mergeFabio Berger2018-08-1488-415/+667
| |\| | |
| * | | | Add CHANGELOG entry about public interface refactorFabio Berger2018-08-141-0/+9
| * | | | Merge branch 'development' into refactor/0x-js-exported-interfaceFabio Berger2018-08-142-16/+6
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Refactor 0x.js to simply re-export it's own sub-dependencies rather then wrap...Fabio Berger2018-08-1417-10671/+60
* | | | | Fix additional merge conflictsFabio Berger2018-08-157-33/+135
* | | | | Merge developmentFabio Berger2018-08-15248-2012/+5986
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | PublishAlex Browne2018-08-1432-280/+269
| * | | | Updated CHANGELOGSAlex Browne2018-08-1457-135/+398
| | |/ / | |/| |
| * | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 16:36:21 +0800