aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Fix Ledger tests given change from `personal_sign` to `eth_sign`Fabio Berger2017-12-282-7/+7
| * | | | Merge pull request #300 from cavanmflynn/fix/ledger-subprovider-signingFabio Berger2017-12-281-2/+2
| |\ \ \ \
| | * | | | Update subprovider to catch correct RPC methodCavan Flynn2017-12-281-2/+2
| |/ / / /
| * | | | Rename guideFabio Berger2017-12-261-4/+2
| * | | | Update contribution guideFabio Berger2017-12-261-32/+19
| * | | | Fix broken links in the abi-gen READMEBrandon Millman2017-12-251-4/+4
| |/ / /
| | | * Refactor JSON parsing in HttpClientBrandon Millman2017-12-256-63/+121
| | |/
| | * Prevent getFeesAsync method on HttpClient from mutating inputBrandon Millman2017-12-253-11/+12
| |/
| * Merge pull request #289 from 0xProject/fix/missingBigNumberConfigsBrandon Millman2017-12-224-7/+13
| |\
| | * Remove unused importBrandon Millman2017-12-221-1/+0
| | * Add missing calls to bigNumberConfigs in packages where we are instantiating ...Brandon Millman2017-12-224-6/+13
| * | Merge pull request #288 from 0xProject/fix/docLinksFabio Berger2017-12-2211-22/+70
| |\ \ | | |/ | |/|
| | * Merge branch 'development' into fix/docLinksFabio Berger2017-12-2298-1395/+1497
| | |\ | | |/ | |/|
| * | Merge pull request #285 from 0xProject/fix/underscorePrivateBrandon Millman2017-12-2294-1366/+1433
| |\ \
| | * | Add some missed underscores, update changelog and commentsBrandon Millman2017-12-217-34/+28
| | * | Merge branch 'development' into fix/underscorePrivateBrandon Millman2017-12-2149-409/+1430
| | |\ \
| | * | | Add new underscore-privates rule to @0xproject/tslint-config and fix lint errorsBrandon Millman2017-12-2093-1345/+1418
| * | | | Merge pull request #287 from 0xProject/fix/toBaseUnitAmountFabio Berger2017-12-223-1/+22
| |\ \ \ \
| | * | | | Add to CHANGELOGFabio Berger2017-12-211-0/+5
| | * | | | Refactor toBaseUnitAmount so that it throws if user supplies unitAmount with ...Fabio Berger2017-12-212-0/+10
| | * | | | Make assertion stricter so that one cannot submit invalid baseUnit amounts to...Fabio Berger2017-12-212-1/+7
| | | |/ / | | |/| |
| * | | | Merge pull request #286 from 0xProject/feature/updateContractsReadmeAmir Bandeali2017-12-211-28/+42
| |\ \ \ \
| | * | | | Update and standardize contracts READMEAmir Bandeali2017-12-211-28/+42
| |/ / / /
| | | | * Create types sectionName constantFabio Berger2017-12-224-3/+7
| | | | * Add sectionName prefix to all anchor links in order to fix method name collis...Fabio Berger2017-12-228-20/+64
| | |_|/ | |/| |
| * | | Fix Max button bugFabio Berger2017-12-211-1/+1
| |/ /
| * | Move call to error reporter to end of handler so that even if reporting the e...Fabio Berger2017-12-214-6/+6
| * | Update outdated WETH rangesFabio Berger2017-12-211-4/+4
| * | Fix conditionalFabio Berger2017-12-211-1/+1
| * | Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2017-12-2115-58/+58
| |\ \
| | * | Publishcontracts@2.1.0@0xproject/website@0.0.3@0xproject/monorepo-scripts@0.1.1@0xproject/kovan_faucets@1.0.1@0xproject/dev-utils@0.0.20x.js@0.28.0Leonid Logvinov2017-12-2115-58/+58
| * | | Fix top-paddingFabio Berger2017-12-213-5/+5
| |/ /
| * | Update CHANGELOGsLeonid Logvinov2017-12-204-4/+8
| * | Add slashes to base URLsLeonid Logvinov2017-12-201-3/+3
| * | Merge pull request #280 from 0xProject/feature/updateReadmesBrandon Millman2017-12-204-25/+169
| |\ \
| | * \ Merge branch 'development' into feature/updateReadmesBrandon Millman2017-12-202-24/+18
| | |\ \
| | * | | Fix wordingBrandon Millman2017-12-204-8/+8
| | * | | Merge branch 'development' into feature/updateReadmesBrandon Millman2017-12-2073-1030/+1113
| | |\ \ \
| | * | | | Update some wording and remove N/A test sectionsBrandon Millman2017-12-204-28/+9
| | * | | | Update readmes for connect, kovan-facuets, types, and utils packagesBrandon Millman2017-12-204-17/+180
| * | | | | Merge pull request #277 from 0xProject/feature/weth-eventsLeonid2017-12-2019-305/+1178
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix linter issueLeonid Logvinov2017-12-201-1/+0
| | * | | | Fix WETH symbolLeonid Logvinov2017-12-201-1/+1
| | * | | | Update snapshot and artifactsLeonid Logvinov2017-12-204-4/+4
| | * | | | Replace our EtherTokens with WETH9 from makerLeonid Logvinov2017-12-206-303/+2
| | * | | | Fix test descriptionLeonid Logvinov2017-12-201-1/+1
| | * | | | Fix a typoLeonid Logvinov2017-12-201-1/+1
| | * | | | Add err==null assertionsLeonid Logvinov2017-12-201-0/+4
| | * | | | Add WETH9 testsLeonid Logvinov2017-12-203-4/+58
| | * | | | Use the new snapshot including WETH9 and it's artifactsLeonid Logvinov2017-12-204-6/+6
| | * | | | Add WETH9 and mirationsLeonid Logvinov2017-12-202-0/+769
| | * | | | Fix WETH events watchingLeonid Logvinov2017-12-202-3/+3
| | * | | | Fix a typoLeonid Logvinov2017-12-201-1/+1
| | * | | | Init the _etherTokenContractsByAddressLeonid Logvinov2017-12-201-1/+1
| | * | | | Export new public typesLeonid Logvinov2017-12-202-0/+6
| | * | | | Update CHANGELOGLeonid Logvinov2017-12-201-0/+4
| | * | | | Make order watcher react to new etherToken eventsLeonid Logvinov2017-12-201-0/+33
| | * | | | Add EtherToken events to the ABILeonid Logvinov2017-12-202-2/+36
| | * | | | Enable multiple EtherTokenContract instancesLeonid Logvinov2017-12-201-4/+9
| | * | | | Add etherToken.getLogsAsync and etherToken.subscribe with testsLeonid Logvinov2017-12-208-8/+274
| * | | | | Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2017-12-204-17/+191
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #279 from 0xProject/feature/READMEsLeonid2017-12-204-17/+191
| | |\ \ \ \ \
| | | * | | | | Change contributing testLeonid Logvinov2017-12-204-4/+4
| | | * | | | | Fix yarn workspaces explanationLeonid Logvinov2017-12-204-6/+13
| | | * | | | | Change CONTRIBUTING sectionLeonid Logvinov2017-12-204-5/+9
| | | * | | | | Fix the headersLeonid Logvinov2017-12-204-4/+4
| | | * | | | | Address feedbackLeonid Logvinov2017-12-204-36/+76
| | | * | | | | Write 4 README'sLeonid Logvinov2017-12-204-12/+135
| | | |/ / / /
| * | / / / / Fix md linkFabio Berger2017-12-201-1/+1
| |/ / / / /
| * | | | | Fix linkFabio Berger2017-12-201-1/+1
| * | | | | Merge pull request #284 from 0xProject/feature/newAndImprovedReadmesFabio Berger2017-12-204-40/+229
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Standardize on improved contributing sectionFabio Berger2017-12-204-3/+8
| | * | | | Add Yarn < v1.0 disclaimerFabio Berger2017-12-201-0/+5
| | * | | | Flesh out LedgerSubprovider usage exampleFabio Berger2017-12-201-1/+11
| | * | | | Fix commandFabio Berger2017-12-201-1/+1
| | * | | | Update and improve website READMEFabio Berger2017-12-201-26/+30
| | * | | | Add mono repo scripts READMEFabio Berger2017-12-201-0/+51
| | * | | | Add clean instructionsFabio Berger2017-12-201-0/+6
| | * | | | Improve subproviders readmeFabio Berger2017-12-201-6/+52
| | * | | | Flesh out main repo READMEFabio Berger2017-12-201-0/+62
| | * | | | Improve package descriptionsFabio Berger2017-12-201-8/+8
| | | |/ / | | |/| |
| * | | | Merge pull request #278 from 0xProject/fix/error-taker-formatLeonid2017-12-207-24/+88
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Don't throw in transformersLeonid Logvinov2017-12-201-1/+1
| | * | | Update CHANGELOGLeonid Logvinov2017-12-191-0/+1
| | * | | Throw a better error message when taker is null|undefined or anything but not...Leonid Logvinov2017-12-196-24/+87
| | | |/ | | |/|
| * | | Merge pull request #282 from 0xProject/fix/zrx-testsAmir Bandeali2017-12-202-24/+18
| |\ \ \ | | |_|/ | |/| |
| | * | Remove reliance on testrpc snapshot in ZRX testsAmir Bandeali2017-12-202-24/+18
| * | | Merge pull request #283 from 0xProject/createWethPageFabio Berger2017-12-2011-59/+195
| |\ \ \ | | |/ / | |/| |
| | * | Remove etherToken from smart contract docsFabio Berger2017-12-203-7/+0
| | * | Update new WETH addresses and localStorage clearance keyFabio Berger2017-12-201-3/+3
| | * | Fix mergeFabio Berger2017-12-204-7/+8
| | * | Merge branch 'development' into createWethPageFabio Berger2017-12-2092-1051/+1012
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #275 from 0xProject/refactor/websiteFabio Berger2017-12-2072-982/+929
| |\ \ \ | | |_|/ | |/| |
| | * | Remove re-assignmentFabio Berger2017-12-201-5/+9
| | * | Merge branch 'development' into refactor/websiteFabio Berger2017-12-2021-60/+74
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #273 from 0xProject/fix/contract-fixesLeonid2017-12-196-13/+21
| |\ \ \
| | * | | Introduce an identityCommandBuilderLeonid Logvinov2017-12-191-2/+3
| | * | | Define types for methodIDLeonid Logvinov2017-12-191-1/+1
| | * | | Define types for ethereumjs-abiLeonid Logvinov2017-12-191-1/+4
| | * | | Install types for yargsLeonid Logvinov2017-12-196-11/+15
| |/ / /
| * | | Merge pull request #272 from 0xProject/fix/subscription-optsLeonid2017-12-1915-47/+53
| |\ \ \
| | * | | Fix commentsLeonid Logvinov2017-12-192-2/+2
| | * | | Fix linter issuesLeonid Logvinov2017-12-193-4/+4
| | * | | Fix linter errorLeonid Logvinov2017-12-191-4/+4
| | * | | Rename SubscriptionOpts to BlockRangeLeonid Logvinov2017-12-1915-45/+51
| |/ / /
| | * | Fix scrolling topBar on PortalFabio Berger2017-12-192-2/+2
| | * | Fix overflow issue on calculated fillAmountFabio Berger2017-12-191-15/+13
| | * | Fix faulty importFabio Berger2017-12-191-1/+1
| | * | Refactor remaining _.assign to spread operatorFabio Berger2017-12-194-8/+15
| | * | Move muiTheme into it's own moduleFabio Berger2017-12-192-35/+37
| | * | Merge branch 'development' into refactor/websiteFabio Berger2017-12-1927-105/+142
| | |\ \ | | |/ / | |/| |
| | * | Refactor configs and constants, standardize on uppercase/snakecase, alphebeti...Fabio Berger2017-12-1928-295/+298
| | * | Sort colors into color spectrumFabio Berger2017-12-181-8/+22
| | * | remove unused styleFabio Berger2017-12-181-5/+0
| | * | standarize on `grey` over `gray` spelling and other color related fixesFabio Berger2017-12-1840-92/+91
| | * | Standardize colors to always be in uppercase hex and consolidate material-ui ...Fabio Berger2017-12-1821-50/+48
| | * | Consolidate all custom colors and material-ui colors into a colors moduleFabio Berger2017-12-1848-226/+169
| | * | Remove unused `location` propFabio Berger2017-12-186-8/+6
| | * | Use bigNumberConfigs from @0xproject/utils in website repoFabio Berger2017-12-182-5/+3
| | * | Fix unhoverable help tooltip by renaming `Trade Permissions` to `Allowance`Fabio Berger2017-12-181-2/+2
| | * | Replace remaining strEnums with property TS string enumsFabio Berger2017-12-1815-92/+79
| | * | Update ActionType enum and move from using _.assign in reducerFabio Berger2017-12-183-180/+222
| | * | Remove unused enumsFabio Berger2017-12-183-39/+0
| | * | Update first two string enums to native typeFabio Berger2017-12-1813-58/+56
| | | * Add WETHFabio Berger2017-12-191-1/+1
| | | * remove extra spaceFabio Berger2017-12-191-1/+1
| | | * Remove binding on prop passed callbacksFabio Berger2017-12-192-4/+4
| | | * Add airtable tasks to TODO'sFabio Berger2017-12-191-0/+3
| | | * Merge branch 'development' into createWethPageFabio Berger2017-12-1915-36/+91
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #268 from 0xProject/fix/codeSelectingInDocsFabio Berger2017-12-192-10/+20
| |\ \ \
| | * | | Fixed https://github.com/0xProject/wiki/issues/19 by disabling re-rendering o...Fabio Berger2017-12-181-10/+19
| | * | | Add convenience `rebuild` commandFabio Berger2017-12-181-0/+1
| | |/ /
| * | | Merge pull request #267 from 0xProject/refactor/passInEtherTokenAddressFabio Berger2017-12-1914-69/+57
| |\ \ \
| | * | | Add additional public changes introduced to changelogFabio Berger2017-12-191-1/+3
| | * | | Update website calls to deposit/withdrawFabio Berger2017-12-182-6/+6
| | * | | Add entry to CHANGELOGFabio Berger2017-12-171-0/+4
| * | | | Merge pull request #269 from 0xProject/fix/brokenCiBrandon Millman2017-12-185-7/+13
| |\ \ \ \
| | * | | | Move web3 import after subprovider imports in test web3_factoryBrandon Millman2017-12-185-7/+13
| | | |/ / | | |/| |
| * | | | Merge pull request #271 from 0xProject/fix/ledger-derivationLeonid2017-12-187-19/+52
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update CHANGELOGLeonid Logvinov2017-12-181-1/+2
| | * | | Add a commentLeonid Logvinov2017-12-181-0/+2
| | * | | Introduce a variable for trueLeonid Logvinov2017-12-181-1/+4
| | * | | Remove redundant template stringLeonid Logvinov2017-12-181-1/+1
| | * | | Implement the address derivationsLeonid Logvinov2017-12-184-17/+32
| | * | | Add hdnode dependencyLeonid Logvinov2017-12-183-1/+13
| | | | * Temporarily pretend as if new WETH contracts are already whitelisted by token...Fabio Berger2017-12-182-6/+18
| | | | * Add notice dialog to balances page about updating the WETH contract. We also ...Fabio Berger2017-12-183-10/+79
| | | | * Fix linter errorsFabio Berger2017-12-181-2/+4
| | | | * Move weth.io url to constantsFabio Berger2017-12-182-1/+2
| | | | * Make it such that Wrapped Ether page works on networks without any outdated W...Fabio Berger2017-12-181-11/+19
| | | | * Add `Max` convenience button in unwrap WETH dialogFabio Berger2017-12-181-1/+15
| | | | * Link all EtherTokens to Etherscan and add address tooltipFabio Berger2017-12-181-20/+53
| | | | * Update to passing etherTokenAddress into withdraw and deposit callsFabio Berger2017-12-182-6/+6
| | | | * Since sending the error report could take some time, we first trigger `onErro...Fabio Berger2017-12-171-1/+1
| | | |/
| | | * Fix tests in contractsFabio Berger2017-12-172-13/+11
| | | * Modify the etherToken wrapper methods to accept an etherTokenAddress as the f...Fabio Berger2017-12-176-46/+21
| | | * Fix documentation issue where `unsubscribeAll` shown as method on every contr...Fabio Berger2017-12-173-4/+13
| | |/ | |/|
| * | Temporary hack to alleviate issues with updating tokenRegistry with new WETH ...Fabio Berger2017-12-161-1/+14
| * | Two mysteriously missing importsFabio Berger2017-12-162-0/+2
| * | Merge pull request #264 from 0xProject/createWethPageFabio Berger2017-12-1614-93/+539
| |\ \ | | |/ | |/|
| | * Fix linter errorsFabio Berger2017-12-163-13/+0
| | * Merge branch 'development' into createWethPageFabio Berger2017-12-16217-3087/+2758
| | |\ | | |/ | |/|
| * | Merge pull request #266 from 0xProject/fix/no-unused-varsLeonid2017-12-16111-432/+109
| |\ \
| | * | Fix redundant spacesLeonid Logvinov2017-12-169-28/+58
| | * | Fix testsLeonid Logvinov2017-12-151-0/+1
| | * | Fix website unused varsLeonid Logvinov2017-12-1556-256/+28
| | * | Fix connect unused varsLeonid Logvinov2017-12-1524-54/+8
| | * | Fix 0x.js unused varsLeonid Logvinov2017-12-1525-94/+13
| | * | Dissallow unused vars/importsLeonid Logvinov2017-12-151-0/+1
| |/ /
| * | Merge pull request #265 from 0xProject/feature/custom-linter-ruleLeonid2017-12-158-4/+61
| |\ \
| | * | Implement first custom linter rule async-suffixLeonid Logvinov2017-12-158-4/+61
| |/ /
| * | Merge pull request #258 from 0xProject/feature/contracts-refactorLeonid2017-12-1566-2397/+272
| |\ \
| | * | Reuse intervalutils in websiteLeonid Logvinov2017-12-152-6/+6
| | * | Add a newlineLeonid Logvinov2017-12-151-1/+2
| | * | Name a variableLeonid Logvinov2017-12-151-1/+2
| | * | Add a commentLeonid Logvinov2017-12-151-0/+2
| | * | Fix a conditionalLeonid Logvinov2017-12-151-5/+1
| | * | Make migrations deterministicLeonid Logvinov2017-12-141-57/+45
| | * | Fix linter errorLeonid Logvinov2017-12-141-1/+1
| | * | Fix linter errorsLeonid Logvinov2017-12-143-3/+3
| | * | Add a function to init token balancesLeonid Logvinov2017-12-142-4/+30
| | * | Rename tokenUtils.getNonProtocolTokens to tokenUtils.getDummyTokensLeonid Logvinov2017-12-144-11/+14
| | * | Add DummyToken to gitignoreLeonid Logvinov2017-12-141-0/+1
| | * | Add DummyToken to artifacts listLeonid Logvinov2017-12-141-0/+2
| | * | Increase mocha timeoutLeonid Logvinov2017-12-141-1/+1
| | * | Add DummyToken to artifacts listLeonid Logvinov2017-12-141-1/+1
| | * | Update addresses and add DummyToken artifactLeonid Logvinov2017-12-145-4/+27
| | * | Change circle commit hash to the newest one from the monorepoLeonid Logvinov2017-12-141-1/+1
| | * | Fix CI buildLeonid Logvinov2017-12-141-1/+1
| | * | Delete abi-gen-templatesLeonid Logvinov2017-12-141-15/+0
| | * | Move shared types to types packageLeonid Logvinov2017-12-143-29/+7
| | * | Move more shared utils into utils package and reuse themLeonid Logvinov2017-12-1429-171/+41
| | * | Create dev-utils with blockchainLifecycle in itLeonid Logvinov2017-12-147-0/+158
| | * | Move 0x.js temnplates to 0x.js instead of having them as a separate packageLeonid Logvinov2017-12-148-8/+6
| | * | Remove generated contracts and ignore them. Add a prebuild command to regener...Leonid Logvinov2017-12-147-2165/+8
| |/ /
| * | Reorganize packages section of readmeBrandon Millman2017-12-141-16/+21
| * | Merge pull request #229 from 0xProject/feature/addKovanFaucetsBrandon Millman2017-12-1421-75/+1402
| |\ \
| | * | Fix hanging requests by importing web3 lastBrandon Millman2017-12-143-2/+17
| | * | Add kovan faucet to main READMEBrandon Millman2017-12-141-0/+1
| | * | Merge branch 'development' into feature/addKovanFaucetsBrandon Millman2017-12-143-5/+10
| | |\ \ | | |/ / | |/| |
| * | | Add new packages to main READMELeonid Logvinov2017-12-132-2/+10
| * | | Remove redundant totalSupply from token interfaceAmir Bandeali2017-12-131-3/+0
| | * | Cleanup kovan-faucet packageBrandon Millman2017-12-1412-48/+37
| | * | Fix build errorsBrandon Millman2017-12-1319-142/+540
| | * | Add kovan faucet project into the mono repoBrandon Millman2017-12-1323-24/+948
| |/ /
| * | Merge pull request #255 from 0xProject/feature/updateWethAmir Bandeali2017-12-1344-185/+909
| |\ \
| | * | Increase timeout on deployer testsAmir Bandeali2017-12-131-1/+1
| | * | Add version string to EtherToken_v2Amir Bandeali2017-12-131-0/+1
| | * | Formatting fixesAmir Bandeali2017-12-136-18/+29
| | * | Add missing package in utils, fix linting errorAmir Bandeali2017-12-131-0/+1
| | * | fix tests after merging with developmentAmir Bandeali2017-12-131-3/+3
| | * | Add test:circleci command, add newlines to end of contractsAmir Bandeali2017-12-1325-2/+25
| | * | Add gas limits to failing testsAmir Bandeali2017-12-136-14/+31
| | * | Rename contracts lib to utilsAmir Bandeali2017-12-1313-9/+214
| | * | Refactor unlimited allowance logic out of ERC20TokenAmir Bandeali2017-12-138-20/+56
| | * | Fix typo, change variable name to be consistentAmir Bandeali2017-12-132-6/+6
| | * | Update 0x.js version, fix build errorsAmir Bandeali2017-12-139-60/+41
| | * | Add updated contracts, reorganize contract file structureAmir Bandeali2017-12-1325-120/+170
| | * | Add tests for ERC20Token and EtherToken_v2Amir Bandeali2017-12-138-14/+183
| | * | Fix errors with new testrpc versionAmir Bandeali2017-12-138-44/+45
| | * | Add version to new EtherToken, fix typosAmir Bandeali2017-12-135-5/+126
| | * | Add updated ERC20 implementation, update WETHAmir Bandeali2017-12-133-2/+110
| |/ /
| | * Update name to be a call to actionFabio Berger2017-12-161-1/+1
| | * Add default value for onConversionSuccessfulFabio Berger2017-12-161-3/+2
| | * Improve WETH page stylingFabio Berger2017-12-152-12/+35
| | * Use new wrap/unwrap buttons, fetch outdated WETH balances and re-fetch after ...Fabio Berger2017-12-153-72/+208
| | * Refactor the WETH conversion dialog/button to be either wrap or unwrap specif...Fabio Berger2017-12-152-59/+109
| | * Clear trackedTokens so that a user starts tracking the new WETH and no longer...Fabio Berger2017-12-143-0/+14
| | * Make label optional and make sure the input field still renders properly with...Fabio Berger2017-12-141-3/+4
| | * Remove ETH-WETH convert button from balances pageFabio Berger2017-12-142-25/+0
| | * Remove temporary hackFabio Berger2017-12-141-2/+0
| | * Use boxed ETHFabio Berger2017-12-141-0/+0
| | * Merge branch 'development' into createWethPageFabio Berger2017-12-132-31/+57
| | |\ | | |/ | |/|
| * | update yarn.lockFabio Berger2017-12-131-1/+21
| * | Merge pull request #263 from 0xProject/fix/docsCallPathBrandon Millman2017-12-131-30/+44
| |\ \
| | * | Fix typedoc_utils to take into account subPackageName when rendering call pathBrandon Millman2017-12-131-30/+44
| |/ /
| * | Merge pull request #261 from 0xProject/feature/addWebSocketDocsBrandon Millman2017-12-131-1/+13
| |\ \
| | * | Add WebSocketOrderbookChannel to connect docsBrandon Millman2017-12-121-1/+13
| | | * progress weth pageFabio Berger2017-12-1310-3/+285
| | |/ | |/|
| * | Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2017-12-1331-138/+154
| |\|
| | * Merge pull request #257 from 0xProject/fix/ethereum-addressLeonid2017-12-1213-24/+58
| | |\
| | | * Add missing dependencyLeonid Logvinov2017-12-121-0/+1
| | | * Fix a dependencyLeonid Logvinov2017-12-121-1/+1
| | | * Fix an invocationLeonid Logvinov2017-12-121-1/+1
| | | * Move dependencyLeonid Logvinov2017-12-122-1/+1
| | | * Merge dependenciesLeonid Logvinov2017-12-121-3/+1
| | | * Move isAddress to shared utils and remove all dependencies on ethereum-addressLeonid Logvinov2017-12-1112-26/+19
| | | * Remove ethereum-address dependency and add this logic to the repoLeonid Logvinov2017-12-114-5/+48
| | * | Merge pull request #262 from 0xProject/fix/portal-bugLeonid2017-12-1221-114/+96
| | |\ \
| | | * | Re-hard code the dependencyLeonid Logvinov2017-12-1217-73/+73