aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove hack above migrations packageFabio Berger2018-04-191-3/+0
* Fix expiration watcher comparatorLeonid Logvinov2018-04-187-12/+72
* Publishcontracts@2.1.23@0xproject/website@0.0.26@0xproject/testnet-faucets@1.0.24@0xproject/sra-report@0.0.9@0xproject/sol-resolver@0.0.2@0xproject/react-docs-example@0.0.8@0xproject/monorepo-scripts@0.1.18@0xproject/migrations@0.0.2@0xproject/metacoin@0.0.4@0xproject/dev-utils@0.3.6@0xproject/base-contract@0.2.1Fabio Berger2018-04-1826-167/+168
* Print out stderrFabio Berger2018-04-181-0/+4
* Updated CHANGELOGSFabio Berger2018-04-1839-149/+366
* Merge pull request #535 from 0xProject/fix/commentRenderingFabio Berger2018-04-188-30/+75
|\
| * Bold property namesFabio Berger2018-04-181-2/+5
| * Update PR templateFabio Berger2018-04-181-2/+1
| * Improve rendering of type definition commentsFabio Berger2018-04-182-1/+43
| * Fix commentsFabio Berger2018-04-185-27/+28
* | Merge pull request #531 from 0xProject/feature/deployer/solidity-0.4.22Jacob Evans2018-04-187-7/+33
|\ \
| * | Update test fixturesJacob Evans2018-04-182-5/+11
| * | Remove prettier change on package.jsonJacob Evans2018-04-182-15/+10
| * | Update changelog with PRJacob Evans2018-04-181-1/+2
| * | Update deployer and contracts repo to use solidity 0.4.22Jacob Evans2018-04-185-12/+36
* | | Merge pull request #532 from 0xProject/bug/0x.js/fix-formatting-and-lintingJacob Evans2018-04-187-12/+26
|\ \ \
| * | | Fix linter and prettierJacob Evans2018-04-187-12/+26
|/ / /
* | | Merge pull request #527 from avonian/redundant_order_removal_bugFabio Berger2018-04-182-0/+7
|\ \ \ | |/ / |/| |
| * | Update CHANGELOGAra Kevonian2018-04-171-0/+4
| * | Revert removeOrder flag in favor of noopAra Kevonian2018-04-172-5/+6
| * | Fix redundant expired order removal bugAra Kevonian2018-04-171-3/+5
|/ /
* | Merge pull request #510 from avonian/developmentFabio Berger2018-04-1711-32/+165
|\ \ | |/ |/|
| * Use this.defaultBlock in OrderFilledCancelledLazyStoreAra Kevonian2018-04-171-2/+2
| * Add stateLayer param to getOrderState and clean up variable namesAra Kevonian2018-04-177-28/+39
| * Rename BalanceAndAllowanceFetchers to BalanceAndProxyAllowanceFetchersAra Kevonian2018-04-135-17/+17
| * Implement Simple FetchersAra Kevonian2018-04-138-8/+58
| * Modify lazy stores to implement abstract fetcher classesAra Kevonian2018-04-108-31/+50
| * Lint/PrettifyAra Kevonian2018-04-094-38/+33
| * Implement `zeroEx.exchange.getOrderStateAsync`Ara Kevonian2018-04-093-18/+76
* | Reduce wiki article padding on mobile and remove commented out codeFabio Berger2018-04-171-4/+1
* | Merge pull request #524 from 0xProject/feature/0x.js/remove-hd-wallet-from-testJacob Evans2018-04-176-57/+30
|\ \
| * \ Merge branch 'development' into feature/0x.js/remove-hd-wallet-from-testJacob Evans2018-04-1750-670/+636
| |\ \ | |/ / |/| |
* | | Merge pull request #512 from 0xProject/feature/resolverLeonid Logvinov2018-04-1745-663/+635
|\ \ \
| * | | Rename resolver to sol-resolverLeonid Logvinov2018-04-1620-108/+35
| * | | Uncomment testsLeonid Logvinov2018-04-132-9/+6
| * | | Rename getAllContracts to getAllLeonid Logvinov2018-04-133-3/+3
| * | | Introduce packagePathLeonid Logvinov2018-04-131-1/+2
| * | | Remove artifactsLeonid Logvinov2018-04-1314-5529/+0
| * | | Fix testsLeonid Logvinov2018-04-122-2/+3
| * | | Implement the resolverLeonid Logvinov2018-04-1236-450/+408
| * | | Use solc.compileStandardWrapperLeonid Logvinov2018-04-121-9/+11
| * | | Improve on readabilityLeonid Logvinov2018-04-123-23/+16
| * | | Update CHANGELOG'sLeonid Logvinov2018-04-121-0/+9
| * | | Use solc.compileStandardWrapperLeonid Logvinov2018-04-127-62/+208
| * | | Add ony abi-gen changes from Greg's PRLeonid Logvinov2018-04-1216-56/+387
| * | | Revert "Merge pull request #493 from hysz/features/deployer/multipleCodebaseS...Leonid Logvinov2018-04-1240-521/+5657
* | | | Add SignedOrder type to 0x Connect docsFabio Berger2018-04-131-1/+1
* | | | Standardize external type linksFabio Berger2018-04-133-6/+6
* | | | Fix calendar text color to it shows upFabio Berger2018-04-131-1/+1
| | * | Change changelog note as it has no public impactJacob Evans2018-04-171-2/+1
| | * | Prettier on CHANGELOG.jsonJacob Evans2018-04-141-1/+1
| | * | Update the Changelog with pr numberJacob Evans2018-04-143-1/+19
| | * | Remove truffle-hdwallet from 0x.js testsJacob Evans2018-04-134-57/+19
| |/ / |/| |
* | | Add /jobs endpoint to website, link to it and have it re-direct to AngellistFabio Berger2018-04-135-5/+19
* | | Remove unneeded template stringsFabio Berger2018-04-131-4/+5
* | | Remove legacy exportFabio Berger2018-04-131-1/+0
* | | Merge pull request #523 from ritave/patch-1Leonid Logvinov2018-04-121-1/+0
|\ \ \ | |/ / |/| |
| * | Remove Greenkeeper from READMEOlaf Tomalka2018-04-121-1/+0
|/ /
* | Merge pull request #507 from 0xProject/feature/subproviders/mnemonic-wallet-s...Jacob Evans2018-04-1221-130/+704
|\ \
| * | Revert Ledger back to assigning ledgerClient to instance variableJacob Evans2018-04-123-15/+22
| * | Rename to parentDerivedKeyInfo to be explicity about how we walk the treeJacob Evans2018-04-121-8/+8
| * | Pluck key off of base path branch for MnemonicJacob Evans2018-04-124-35/+32
| * | Merge branch 'development' into feature/subproviders/mnemonic-wallet-subproviderJacob Evans2018-04-12179-635/+1672
| |\ \
| * | | Update documentation and add to website docsJacob Evans2018-04-115-23/+27
| * | | Renamed DerivedHDKey to DerivedHDKeyInfoJacob Evans2018-04-1112-157/+164
| * | | Update website to support latest ledgerJacob Evans2018-04-115-16/+26
| * | | Move type declaration for hdkey to typescript-typingsJacob Evans2018-04-113-13/+20
| * | | Test valid address format but not foundJacob Evans2018-04-115-12/+26
| * | | Update JSDoc for methods in ledger and mnemonic walletJacob Evans2018-04-113-11/+11
| * | | Update changelog and add derivationBasePathJacob Evans2018-04-115-29/+33
| * | | Follow file naming pattern for mnemonic and private key subproviderJacob Evans2018-04-113-3/+3
| * | | Iterator pattern for walking derived keysJacob Evans2018-04-113-45/+62
| * | | Tests for signed transactions and multiple accountsJacob Evans2018-04-113-0/+12
| * | | Test signed messages with the second accountJacob Evans2018-04-113-1/+15
| * | | Throw errors when the address is not specified or invalidJacob Evans2018-04-119-42/+67
| * | | Add isChildKey to derived keyJacob Evans2018-04-114-72/+73
| * | | Improve Documentation for functions and constructorsJacob Evans2018-04-102-6/+24
| * | | Rename to IS_CHILD_KEYJacob Evans2018-04-103-19/+13
| * | | Refactor ledger to support multiple accounts with from addressJacob Evans2018-04-108-62/+103
| * | | Added walletUtils and address in signMessageJacob Evans2018-04-107-64/+149
| * | | Add Mnemonic wallet subproviderJacob Evans2018-04-0610-4/+320
* | | | Fix web3-wrapper versionFabio Berger2018-04-121-1/+1
* | | | Merge pull request #520 from 0xProject/fix/installation-testsFabio Berger2018-04-129-14/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix some of the publishing/installation issuesLeonid Logvinov2018-04-1210-14/+17
* | | | Merge pull request #519 from 0xProject/fix/docImprovementsFabio Berger2018-04-1224-52/+121
|\ \ \ \
| * \ \ \ Merge branch 'development' into fix/docImprovementsFabio Berger2018-04-12136-543/+1030
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #500 from 0xProject/removeMigrateStepFabio Berger2018-04-1282-350/+476
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'development' into removeMigrateStepFabio Berger2018-04-1263-165/+357
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Publishcontracts@2.1.22@0xproject/website@0.0.25@0xproject/testnet-faucets@1.0.23@0xproject/sra-report@0.0.8@0xproject/react-docs-example@0.0.7@0xproject/monorepo-scripts@0.1.17@0xproject/metacoin@0.0.3@0xproject/dev-utils@0.3.5@0xproject/base-contract@0.2.0Leonid Logvinov2018-04-1224-155/+155
* | | | | Updated CHANGELOGSLeonid Logvinov2018-04-1238-7/+199
| * | | | Prettier ignore Metacoin artifactsFabio Berger2018-04-121-0/+1
| * | | | Improve deployer error messageFabio Berger2018-04-111-1/+1
| * | | | Fix 0x.js testsFabio Berger2018-04-111-1/+2
| * | | | Fix lint issueFabio Berger2018-04-111-2/+2
| * | | | 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