aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Simply exportFabio Berger2018-04-111-3/+1
| * | | | Move NULL_BYTES to @0xproject/utilsFabio Berger2018-04-1110-117/+35
| * | | | Simplify the testsFabio Berger2018-04-115-10/+6
| * | | | Merge branch 'development' into removeMigrateStepFabio Berger2018-04-1140-167/+815
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #514 from 0xProject/publishImprovementsFabio Berger2018-04-118-30/+199
|\ \ \ \ \
| * | | | | Fix lint errorFabio Berger2018-04-111-0/+1
| * | | | | Add step to publishing that upload staging doc jsons, deploys staging website...Fabio Berger2018-04-105-8/+152
| * | | | | Fix web3Wrapper build commandFabio Berger2018-04-101-1/+1
| * | | | | Add top-level `yarn lerna:stage_docs` to upload docJsons to the staging S3 bu...Fabio Berger2018-04-101-0/+1
| * | | | | Refactor publish script to have it's main execution body be lean and discrete...Fabio Berger2018-04-092-21/+44
| | |_|_|/ | |/| | |
| | * | | Removed unused commandFabio Berger2018-04-091-4/+0
| | * | | Remove 0x.js test artifactsFabio Berger2018-04-0914-5555/+0
| | * | | Fix tslintFabio Berger2018-04-091-2/+2
| | * | | Move migrations into separate monorepo subpackage and hook it up to 0x.js and...Fabio Berger2018-04-0926-32/+181
| | * | | merge developmentFabio Berger2018-04-0944-306/+1417
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Remove unused varFabio Berger2018-04-071-1/+0
| | * | | Refactor RedundantRpcSubprovider into RedundantSubproviderFabio Berger2018-04-065-30/+49
| | * | | Make all `handleRequest` methods async, rename _engine to engine to remain co...Fabio Berger2018-04-065-13/+21
| | * | | Use provider over web3 in deployer, dev-utils and subprovider tests, rename s...Fabio Berger2018-04-069-18/+21
| | * | | Move away from using web3 directly in 0x.js testsFabio Berger2018-04-0617-75/+75
| | * | | Merge branch 'development' into removeMigrateStepFabio Berger2018-04-0587-723/+792
| | |\ \ \
| | * | | | Add --exit to all mocha calls so they exit when called from top-level yarn co...Fabio Berger2018-04-047-7/+7
| | * | | | Move migrations over from contracts to 0x.jsFabio Berger2018-04-047-58/+42
| | * | | | Add contract artifacts to 0x.js testsFabio Berger2018-04-0414-0/+5555
| | * | | | Update 0x.js to run tests against in-process ganacheFabio Berger2018-04-0411-19/+60
| | * | | | Update dev-utils and subproviders tests to use ganache in-process providerFabio Berger2018-04-047-27/+38
| | * | | | Make deployer tests run on inprocess ganacheFabio Berger2018-04-044-2/+9
| | * | | | Fix typosFabio Berger2018-04-041-2/+2
| | * | | | Add top-level test commandFabio Berger2018-04-041-0/+1
| | | | * | Add comment about Provider typeFabio Berger2018-04-111-0/+4
| | | | * | Update CHANGELOGFabio Berger2018-04-111-0/+13
| | | | * | Merge branch 'development' into fix/docImprovementsFabio Berger2018-04-116-6/+6
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Fix documentation links in some READMEsBrandon Millman2018-04-115-5/+5
* | | | | | Merge pull request #517 from lgedeon/developmentBrandon Millman2018-04-111-1/+1
|\ \ \ \ \ \
| * | | | | | Fix relative linkLuke Gedeon2018-04-111-1/+1
|/ / / / / /
| | | | * | Update 0x.js and web3-wrapper doc urls so that last segment is identical to p...Fabio Berger2018-04-118-11/+33
| | | | * | Show staging docs on development and stagingFabio Berger2018-04-112-4/+12
| | | | * | Add support for displaying default param valuesFabio Berger2018-04-113-0/+4
| | | | * | Fix sol-cov, web3-wrapper, subproviders documentation pages given recent chan...Fabio Berger2018-04-114-18/+34
| | | | * | Add missing space in property declarationFabio Berger2018-04-111-1/+1
| | | | * | Fix 0x.js docs now that many types are no longer references through the Web3 ...Fabio Berger2018-04-111-12/+3
| | | | * | Add missing types to 0x.js docsFabio Berger2018-04-111-0/+3
| | | | * | Add support for nested methods within type declarations. Make sure they rende...Fabio Berger2018-04-113-4/+10
| | | | * | Introduce type JSONRpcErrorCallbackFabio Berger2018-04-111-1/+3
| | | | * | Small fix to READMEFabio Berger2018-04-111-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge pull request #493 from hysz/features/deployer/multipleCodebaseSupportAmir Bandeali2018-04-1027-131/+611
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added a detailed description of `renameOverloadedMethods` (special thanks to ...Greg Hysen2018-04-108-75/+68
| * | | | Updated deployer to accept a list of contract directories as input. Contract ...Greg Hysen2018-04-1027-132/+619
|/ / / /
* | | | Since we moved Web3Wrapper class from index to it's own file, we need to upda...Fabio Berger2018-04-071-1/+1
* | | | Update ERCDex logoFabio Berger2018-04-071-0/+0
| |_|/ |/| |
* | | Merge pull request #506 from 0xProject/feature/subproviders/pk-wallet-subprov...Jacob Evans2018-04-0612-224/+450
|\ \ \
| * | | Update shared fixture data for network 42Jacob Evans2018-04-064-38/+28
| * | | FeedbackJacob Evans2018-04-0610-96/+61
| * | | Use PKWalletSubprovider in testnet faucetJacob Evans2018-04-051-2/+5
| * | | Create a private key subproviderJacob Evans2018-04-059-156/+424
| |/ /
* | | Merge pull request #505 from 0xProject/fix/readmeContributingSectionFabio Berger2018-04-0622-64/+664
|\ \ \
| * | | Use depcheck async supportFabio Berger2018-04-051-9/+1
| * | | Fix contributing linksFabio Berger2018-04-0521-21/+21
| * | | Improve contributing section of all packages so they include building entire ...Fabio Berger2018-04-0522-81/+681
| |/ /
* | | Merge pull request #503 from 0xProject/feature/website/relayer-gridBrandon Millman2018-04-067-11/+294
|\ \ \
| * | | Implement initial relayer gridBrandon Millman2018-04-057-11/+294
| |/ /
* | | Merge pull request #504 from 0xProject/fix/website/wallet-key-warningBrandon Millman2018-04-062-6/+13
|\ \ \ | |_|/ |/| |
| * | Change undefined to nullBrandon Millman2018-04-061-3/+1
| * | Fix missing key warnings in wallet componentBrandon Millman2018-04-052-5/+14
| |/
* | Merge pull request #501 from 0xProject/feature/provider-over-wrapperLeonid Logvinov2018-04-0587-723/+792
|\ \ | |/ |/|
| * Fix testsLeonid Logvinov2018-04-053-4/+3
| * Call static functions as staticLeonid Logvinov2018-04-051-2/+2
| * Address feedbackLeonid Logvinov2018-04-055-6/+4
| * Move our contract templates to accept Provider instead of Web3WrapperLeonid Logvinov2018-04-0485-719/+791
|/
* Merge pull request #496 from 0xProject/removeUnusedDepsFabio Berger2018-04-0417-1506/+178
|\
| * Merge branch 'development' into removeUnusedDepsFabio Berger2018-04-0425-449/+178
| |\ | |/ |/|
* | Merge pull request #495 from 0xProject/fix/publishProcessFabio Berger2018-04-0424-447/+176
|\ \
| * | Fix package.jsonFabio Berger2018-04-031-1/+1
| * | Remove `isPublished` from all CHANGELOG.json filesxFabio Berger2018-04-0319-312/+156
| * | Now that every version of a package published has a corresponding entry in it...Fabio Berger2018-04-033-33/+19
| * | Remove temporary convert_changelog scriptFabio Berger2018-04-032-101/+0
* | | Temporarily remove installation testLeonid Logvinov2018-04-031-3/+3
|/ /
| * Used generic declaration to remove need for `any`Fabio Berger2018-04-041-1/+1
| * Use Results typeFabio Berger2018-04-041-3/+3
| * Add comment about ignored packagesFabio Berger2018-04-031-0/+1
| * Remove Dharma integration from WebsiteFabio Berger2018-04-033-320/+41
| * Add find_unused_deps monorepo scriptFabio Berger2018-04-032-1/+49
| * Remove remaining unused depsFabio Berger2018-04-037-1173/+97
| * Update yarn.lockFabio Berger2018-04-031-0/+23
| * Fix TS errorFabio Berger2018-04-031-1/+1
| * Add missing request typesFabio Berger2018-04-031-0/+1
| * Fix yarnFabio Berger2018-04-031-40/+4
| * Stop using utilsFabio Berger2018-04-034-28/+3
| * Update yarn.lockFabio Berger2018-04-031-40/+71
| * Use @0xproject/utils promisify everywhereFabio Berger2018-04-037-8/+4
| * Update tslint-config. To avoid circular deps, this must always be one version...Fabio Berger2018-04-031-1/+1
| * Remove unused contracts depsFabio Berger2018-04-031-8/+1
| * Remove unused 0x.js depsFabio Berger2018-04-032-5/+0
|/
* After publishLeonid Logvinov2018-04-0217-17/+34
* Publishcontracts@2.1.21@0xproject/website@0.0.24@0xproject/testnet-faucets@1.0.22@0xproject/sra-report@0.0.7@0xproject/react-docs-example@0.0.6@0xproject/monorepo-scripts@0.1.16@0xproject/metacoin@0.0.2@0xproject/dev-utils@0.3.4@0xproject/base-contract@0.1.0Leonid Logvinov2018-04-0224-159/+159
* Updated CHANGELOGSLeonid Logvinov2018-04-0239-184/+331
* Merge pull request #485 from 0xProject/feature/metacoinLeonid Logvinov2018-04-0285-742/+1307
|\
| * Fix a typoLeonid Logvinov2018-04-022-3/+3
| * Compile only the Exchange contract in compiler testsLeonid Logvinov2018-04-021-1/+1
| * Fix versionLeonid Logvinov2018-04-022-4/+67
| * Fix a typoLeonid Logvinov2018-04-022-2/+2
| * Merge branch 'development' into feature/metacoinLeonid Logvinov2018-04-0236-30/+76
| |\
| * | Update CHANGELOG.json'sLeonid Logvinov2018-04-0210-18/+53
| * | Fix contracts and artifacts pathsLeonid Logvinov2018-04-023-13/+6
| * | Stop passing _abiDecoderLeonid Logvinov2018-04-021-1/+1
| * | Report errors locallyLeonid Logvinov2018-04-021-9/+12
| * | move all configs to a config fileLeonid Logvinov2018-04-024-11/+17
| * | Remove a repo sectionLeonid Logvinov2018-04-021-11/+0
| * | Incroduce the Warning constantLeonid Logvinov2018-04-021-1/+2
| * | Regroup gitignore entriesLeonid Logvinov2018-04-021-2/+1
| * | Add metacoin example projectLeonid Logvinov2018-04-0282-732/+1209
* | | small README fixesFabio Berger2018-04-021-2/+2
* | | Update docs list in READMEFabio Berger2018-04-021-0/+5
| |/ |/|
* | Add manual postpublish command to all public packages and update CHANGELOG.jsonFabio Berger2018-04-0236-30/+65
* | Fix postpublish util to ignore namespaceFabio Berger2018-04-021-2/+14
|/
* Fix release notes bugFabio Berger2018-04-021-1/+1
* Should print out `lerna publish` stdout so we can see if anything went wrongFabio Berger2018-04-021-0/+6
* Publishcontracts@2.1.20@0xproject/website@0.0.23@0xproject/web3-wrapper@0.4.0@0xproject/utils@0.4.4@0xproject/typescript-typings@0.0.2@0xproject/types@0.4.2@0xproject/tslint-config@0.4.13@0xproject/testnet-faucets@1.0.21@0xproject/subproviders@0.8.3@0xproject/sra-report@0.0.6@0xproject/sol-cov@0.0.5@0xproject/react-shared@0.1.0@0xproject/react-docs@0.0.5@0xproject/react-docs-example@0.0.5@0xproject/monorepo-scripts@0.1.15@0xproject/json-schemas@0.7.18@0xproject/dev-utils@0.3.3@0xproject/deployer@0.3.4@0xproject/connect@0.6.7@0xproject/base-contract@0.0.6@0xproject/assert@0.2.4@0xproject/abi-gen@0.2.8Fabio Berger2018-04-0223-152/+166
* Updated CHANGELOGSFabio Berger2018-04-0238-56/+303
* Generate CHANGELOG.json filesFabio Berger2018-04-0219-0/+2017
* Merge pull request #489 from 0xProject/refactor/publishProcessFabio Berger2018-04-0214-34/+430
|\
| * Fix hasty find/replaceFabio Berger2018-04-021-3/+3
| * Default to 4spFabio Berger2018-04-022-3/+3
| * Update moment, no longer need separate moment typesFabio Berger2018-04-023-15/+3
| * Move prettify command to utils and also call it on CHANGELOG.mdFabio Berger2018-04-023-9/+12
| * Add prettier run on generated CHANGELOG.json and fix scriptsFabio Berger2018-04-024-13/+21
| * Remove semi-colons from monorepo-scripts package.jsonFabio Berger2018-04-022-5/+8
| * Get rid of ; in top-level package.jsonFabio Berger2018-04-021-4/+12
| * Fix TSLint errorFabio Berger2018-04-021-1/+1
| * Make dry-run configurable from top-level package.jsonFabio Berger2018-04-022-2/+2
| * Merge branch 'development' into refactor/publishProcessFabio Berger2018-04-029-32/+31
| |\ | |/ |/|
* | Merge pull request #491 from 0xProject/fix/buildErrorsFabio Berger2018-04-029-32/+31
|\ \
| * | Run prettier, update deployer CHANGELOGAmir Bandeali2018-04-024-11/+13
| * | Create solc_bin dir if does not exist before attempting to compileAmir Bandeali2018-04-024-13/+16
| * | Add missing type importAmir Bandeali2018-04-011-8/+2
|/ /
| * Improve namingFabio Berger2018-04-021-3/+3
| * Merge branch 'development' into refactor/publishProcessFabio Berger2018-04-0220-142/+624
| |\ | |/ |/|
* | Merge pull request #487 from 0xProject/feature/website/wallet-setupBrandon Millman2018-03-315-9/+132
|\ \
| * | Add HACK comment and reorganize use other wallet buttonBrandon Millman2018-03-311-10/+12
| * | Implement wallet locked and uninstalled statesBrandon Millman2018-03-305-9/+130
* | | Merge pull request #488 from avonian/developmentLeonid Logvinov2018-03-316-62/+80
|\ \ \ | |/ / |/| |
| * | Fixed comment(s) for PR #488Ara Kevonian2018-03-311-3/+3
| * | OrderStateWatcher fixes for PR #488Ara Kevonian2018-03-312-6/+5
| * | Amended comments to clarify changes on PR #488Ara Kevonian2018-03-303-3/+5
| * | Monitor different state layers with OrderWatcherAra Kevonian2018-03-306-60/+77
|/ /
* | Merge pull request #476 from 0xProject/feature/website/wallet-wrapBrandon Millman2018-03-3011-72/+413
|\ \
| * | Style changesBrandon Millman2018-03-302-5/+9
| * | Merge branch 'development' into feature/website/wallet-wrapBrandon Millman2018-03-30186-2362/+2846
| |\ \ | |/ / |/| |
| * | Remove props that are covered by the defaultsBrandon Millman2018-03-231-2/+0
| * | Implement ETH/WETH conversion and allowance toggle stylingBrandon Millman2018-03-2312-72/+411
| | * Add temp comment, clean up codeFabio Berger2018-04-021-8/+21
| | * Fixes for clarityFabio Berger2018-03-301-2/+3
| | * Remove CHANGELOG from website since it's a public packageFabio Berger2018-03-301-5/+0
| | * Remove CHANGELOG.json files since will be generated on developmentFabio Berger2018-03-3019-1946/+0
| | * Set IS_DRY_RUN to falseFabio Berger2018-03-301-1/+1
| | * Add more loggingFabio Berger2018-03-303-2/+11
| | * Expose publish command from top-level dirFabio Berger2018-03-302-3/+5
| | * Remove top-level internal dep b/c it's not clear to me what it's used forFabio Berger2018-03-301-1/+0
| | * Fetch Github release notes from CHANGELOG.json and update CHANGELOG once they...Fabio Berger2018-03-301-2/+34
| | * rename variable called `path` to `includePath` to avoid conflict with `path` ...Fabio Berger2018-03-301-4/+6
| | * Move monorepo root constant to constants fileFabio Berger2018-03-302-7/+12
| | * Rename prepublish to publish now that it goes straight to actually publishing...Fabio Berger2018-03-302-1/+1
| | * Call `lerna publish` and supply it with new package versionsFabio Berger2018-03-302-5/+45
| | * Add check that timestamp has been set before generating MD versionFabio Berger2018-03-301-1/+6
| | * Add committing and pushing CHANGELOG changes to GithubFabio Berger2018-03-303-6/+15
| | * Show semver diffFabio Berger2018-03-301-0/+10
| | * Improve READMEFabio Berger2018-03-301-3/+7
| | * Fix changelog.jsonFabio Berger2018-03-291-1/+2
| | * Merge branch 'development' into refactor/publishProcessFabio Berger2018-03-291-4/+1
| | |\ | |_|/ |/| |
* | | Fix CHANGELOGFabio Berger2018-03-291-4/+1
* | | Update Yarn.lockFabio Berger2018-03-291-5/+5
| | * Generate CHANGELOG.mdsFabio Berger2018-03-291-1/+28
| | * remove console.logsFabio Berger2018-03-291-2/+0
| | * Begin global pre-publishing script. Updates changelog.json files in packages ...Fabio Berger2018-03-293-0/+119
| | * Add 0.x.x edgecaseFabio Berger2018-03-293-2/+14
| | * Fix semver-sort versionFabio Berger2018-03-292-2/+2
| | * Generate CHANGELOG.json files and add convert_changelog scriptFabio Berger2018-03-2922-0/+2045
| | * Update Yarn lock and fix dep versionsFabio Berger2018-03-292-9/+13
| |/ |/|
* | Standardize changelog dates and formatFabio Berger2018-03-293-19/+19
* | Merge pull request #482 from 0xProject/feature/web3-typesLeonid Logvinov2018-03-2855-513/+490
|\ \
| * | Fix stubbing of a non-existent propertyLeonid Logvinov2018-03-281-1/+1
| * | Remove redundant castLeonid Logvinov2018-03-281-1/+1
| * | Move common types out of web3 typesLeonid Logvinov2018-03-2754-512/+489
* | | Merge pull request #483 from 0xProject/refactor/removeHardcodedWethFabio Berger2018-03-282-28/+1
|\ \ \
| * | | Remove WETH hack now that updated WETH address is in TokenRegistryFabio Berger2018-03-272-28/+1
* | | | Merge pull request #484 from 0xProject/fix/gitignoreIssueFabio Berger2018-03-2822-3/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | merge developmentxFabio Berger2018-03-28113-1618/+2097
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #480 from 0xProject/feature/clean-state-testsLeonid Logvinov2018-03-27101-1376/+1693
|\ \ \ \
| * | | | Add typeRootsLeonid Logvinov2018-03-273-2/+1
| * | | | Add clean-state testsLeonid Logvinov2018-03-27101-1376/+1694
|/ / / /
* | | | Merge pull request #460 from 0xProject/feature/deployer-improvementsLeonid Logvinov2018-03-2715-239/+404
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'development' into feature/deployer-improvementsLeonid Logvinov2018-03-24109-566/+2470
| |\ \ \ | | | |/ | | |/|
| * | | Set timeout for compiler testsLeonid Logvinov2018-03-221-3/+3
| * | | Remove redundant typesLeonid Logvinov2018-03-221-18/+0
| * | | Add missing param commentsLeonid Logvinov2018-03-221-0/+3
| * | | Fix a commentLeonid Logvinov2018-03-221-1/+1
| * | | Add a commentLeonid Logvinov2018-03-221-0/+1
| * | | Move npm-run-all to devDependenciesLeonid Logvinov2018-03-221-1/+1
| * | | Revert optimizer configLeonid Logvinov2018-03-221-1/+1
| * | | Remove .onlyLeonid Logvinov2018-03-211-1/+1
| * | | Revert version range changesLeonid Logvinov2018-03-2124-24/+24
| * | | Add function docsLeonid Logvinov2018-03-211-2/+6
| * | | Add function docsLeonid Logvinov2018-03-212-0/+6
| * | | Add tests for compiler utilsLeonid Logvinov2018-03-217-52/+159
| * | | Enable strictNullChecksLeonid Logvinov2018-03-216-156/+182
| * | | Change the type of optimizerEnabled to boolean and convert it to number only ...Leonid Logvinov2018-03-215-9/+8
| * | | Support proper semver version rangesLeonid Logvinov2018-03-214-16/+27
| * | | Change version ranges to only support patch version incrementsLeonid Logvinov2018-03-2124-24/+24
| * | | Compile contracts sequentiallyLeonid Logvinov2018-03-211-1/+3
| * | | Throw an error if contract file doesn't contain the contract with the same nameLeonid Logvinov2018-03-211-0/+5
| * | | Stop printing help on errorLeonid Logvinov2018-03-212-2/+16
| * | | Rename onDeployCommand to onDeployCommandAsync and onCompileCommand to onComp...Leonid Logvinov2018-03-211-4/+9
| | | * Add monorepo_scripts to npmignoreFabio Berger2018-03-2721-0/+21
| | | * Remove nested .gitignore files since `yarn publish` gets confused by them and...Fabio Berger2018-03-274-3/+7
| |_|/ |/| |
* | | Revert TokenRegistry address on KovanFabio Berger2018-03-272-2/+1
* | | Merge pull request #479 from 0xProject/bug/website/portal-fill-mixed-decimalsFabio Berger2018-03-262-3/+6
|\ \ \
| * | | Improve rounding error messageFabio Berger2018-03-261-1/+2
| * | | Portal fill with mixed decimalsJacob Evans2018-03-261-2/+4
|/ / /
* | / Add error popover if TokenRegistry on network user is browsing on don't inclu...Fabio Berger2018-03-253-0/+31
| |/ |/|
* | Get LogEntry type to show up correctly as a Web3 typeFabio Berger2018-03-231-1/+2
* | Fix typosFabio Berger2018-03-237-8/+8
* | Fix 0x.js docs to include types from generated contract wrappersFabio Berger2018-03-233-3/+16
* | Fix S3 bucket nameFabio Berger2018-03-231-2/+2
* | Use past tense in FAQFabio Berger2018-03-231-2/+2
* | Replace Auctus with ERCDEX in projects sectionFabio Berger2018-03-231-6/+6
* | Fix Ethfinex link, looks like they have their own domain nowFabio Berger2018-03-231-1/+1
* | Merge pull request #465 from 0xProject/addExtraDocsFabio Berger2018-03-2393-503/+1952
|\ \
| * | Use _.filter instead of _.reduceFabio Berger2018-03-231-8/+4
| * | Improve list of improvementsFabio Berger2018-03-231-7/+8
| * | Make handleRequest public and add comment for itFabio Berger2018-03-229-26/+80
| * | Make setEngine publicFabio Berger2018-03-221-3/+3
| * | Fix lazy load so each doc page is a separate bundleFabio Berger2018-03-221-5/+5
| * | Remove spaceFabio Berger2018-03-221-1/+0
| * | npm -> yarnFabio Berger2018-03-222-2/+2
| * | Add assertion to notify any developer trying to render a package with files c...Fabio Berger2018-03-221-0/+10
| * | Fix lint rules directoryFabio Berger2018-03-221-1/+1
| * | Use isEmptyFabio Berger2018-03-221-4/+4
| * | Remove no longer existent commandFabio Berger2018-03-221-1/+0
| * | Fix benefits listFabio Berger2018-03-221-2/+2
| * | Use yarn instead of npmFabio Berger2018-03-224-6/+6
| * | Add default docs iconFabio Berger2018-03-222-1/+1
| * | Merge branch 'development' into addExtraDocsFabio Berger2018-03-2211-47/+485
| |\ \ | |/ / |/| |
* | | Merge pull request #468 from 0xProject/feature/website/wallet-interfaceBrandon Millman2018-03-228-46/+470
|\ \ \
| * | | Change blockchain prop to not optionalBrandon Millman2018-03-221-1/+1
| * | | Other style changesBrandon Millman2018-03-221-3/+3
| * | | Updated padding and colorsBrandon Millman2018-03-223-6/+14
| * | | Refactor TokenState typeBrandon Millman2018-03-224-55/+40
| * | | Implement initial wallet interfaceBrandon Millman2018-03-213-2/+433
| | |/ | |/|
* | | Merge pull request #470 from 0xProject/fix/fillOrdersUpToValidationLeonid Logvinov2018-03-213-0/+17
|\ \ \ | |/ / |/| |
| * | Fix a bug causing fillOrdersUpTo validation to fail because of some extra ord...Leonid Logvinov2018-03-213-0/+17
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 20:37:46 +0800