aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Flesh out main repo READMEFabio Berger2017-12-201-0/+62
* Improve package descriptionsFabio Berger2017-12-201-8/+8
* 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
| | * | Add missing dependencyLeonid Logvinov2017-12-121-0/+1
| | * | Don't unsubscribe on error. It's done automaticallyLeonid Logvinov2017-12-123-28/+5
| | * | Rename blockAndLogStreamer to blockAndLogStreamerIfExistsLeonid Logvinov2017-12-121-14/+18
| | |/
* | / Resize token iconsFabio Berger2017-12-136-0/+0
|/ /
* | Merge pull request #259 from 0xProject/fix/addChangelogAndPostpublishScriptsBrandon Millman2017-12-1212-6/+97
|\ \ | |/ |/|
| * Fix broken postpublish_utils, add CHANGELOG and postpublish.js scripts to all...Brandon Millman2017-12-0912-6/+97
|/
* Publishwebsite@0.0.2contracts@2.0.0abi-gen-templates@0.0.2@0xproject/web3-wrapper@0.1.0@0xproject/utils@0.1.0@0xproject/types@0.1.0@0xproject/tslint-config@0.2.1@0xproject/subproviders@0.1.0@0xproject/monorepo-scripts@0.1.0@0xproject/json-schemas@0.6.10@0xproject/connect@0.3.0@0xproject/assert@0.0.7@0xproject/abi-gen@0.0.20x.js@0.27.2Brandon Millman2017-12-0914-44/+44
* Add scope to abi-gen dependency in 0x.jsBrandon Millman2017-12-091-1/+1
* Add @0xproject scope to abi-gen package nameBrandon Millman2017-12-091-1/+1
* Add yarn install to lerna:publish commandBrandon Millman2017-12-092-6/+2
* Make contracts package privateBrandon Millman2017-12-091-0/+1
* Update connect changelogBrandon Millman2017-12-091-1/+1
* Merge pull request #252 from 0xProject/feature/addSubprovidersFabio Berger2017-12-0925-233/+1270
|\
| * Merge branch 'development' into feature/addSubprovidersFabio Berger2017-12-0975-331/+404
| |\ | |/ |/|
* | Update README.mdFabio Berger2017-12-091-3/+3
* | Merge pull request #253 from 0xProject/feature/web3-wrapperLeonid2017-12-0970-315/+399
|\ \
| * | Inline network moduleLeonid Logvinov2017-12-082-21/+14
| * | Merge branch 'development' into feature/web3-wrapperLeonid2017-12-088-23/+22
| |\ \ | |/ / |/| |
* | | Stop supporting different file extensions in abi-genLeonid Logvinov2017-12-082-10/+4
* | | Merge pull request #256 from 0xProject/feature/standardSpecUpdateBrandon Millman2017-12-084-7/+6
|\ \ \
| * | | Update connect types in preperation for publishingBrandon Millman2017-12-084-7/+6
|/ / /
| * | Refactor networkId out of web3WrapperLeonid Logvinov2017-12-0812-31/+39
| * | Fix CI commandLeonid Logvinov2017-12-071-1/+1
| * | Address feedbackLeonid Logvinov2017-12-075-12/+4
| * | Refactor web3Wrapper to a separate packageLeonid Logvinov2017-12-0769-275/+366
| | * remove console.logFabio Berger2017-12-091-2/+0
| | * Fix unit testFabio Berger2017-12-091-1/+1
| | * Add missing paramsFabio Berger2017-12-091-0/+3
| | * Debug CircleCi failureFabio Berger2017-12-081-0/+2
| | * Update yarn.lockFabio Berger2017-12-081-1/+1
| | * Add todoFabio Berger2017-12-081-0/+1
| | * Add link to random id generatorFabio Berger2017-12-081-0/+1
| | * Remove `prebuild` command and add `test:circleci`Fabio Berger2017-12-081-1/+1
| | * Merge branch 'development' into feature/addSubprovidersFabio Berger2017-12-082-6/+12
| | |\ | |_|/ |/| |
* | | Make sure we don't pass empty maker into getOrderHashHexFabio Berger2017-12-081-1/+2
* | | Make sure we always pass in the correct networkId even if no injectedWeb3 foundFabio Berger2017-12-081-5/+10
|/ /
| * remove unneeded resetFabio Berger2017-12-071-2/+0
| * Use rejectedWithFabio Berger2017-12-071-9/+4
| * Add missing calls to configureFabio Berger2017-12-072-0/+2
| * remove unneeded type assertionsFabio Berger2017-12-071-2/+2
| * remove unused typeFabio Berger2017-12-072-5/+0
| * Simplify interface to signPersonalMessageAsyncFabio Berger2017-12-073-42/+12
| * Fix unit testFabio Berger2017-12-071-1/+1
| * Fix ethereumjs-tx declaration and importFabio Berger2017-12-072-2/+2
| * Use assert.isHexStringFabio Berger2017-12-072-5/+3
| * Add type defs for ledgerco and ethereumjs-txFabio Berger2017-12-072-13/+37
| * Make test only run unit tests since cannot run integration tests on CIFabio Berger2017-12-071-3/+4
| * Improve READMEFabio Berger2017-12-071-1/+1
| * Fix version and remove the UMD buildFabio Berger2017-12-073-66/+4
| * Fix tslint errorFabio Berger2017-12-071-1/+1
| * Standardize depsFabio Berger2017-12-073-9/+13
| * Merge branch 'development' into feature/addSubprovidersFabio Berger2017-12-0715-122/+164
| |\ | |/ |/|
* | Merge pull request #250 from 0xProject/feature/airport-experimentsLeonid2017-12-0612-128/+165
|\ \
| * \ Merge branch 'development' into feature/airport-experimentsLeonid2017-12-0617-57/+104
| |\ \ | |/ / |/| |
* | | Add missing awaitFabio Berger2017-12-061-1/+1
* | | Move declaration into proper conditional blockFabio Berger2017-12-061-1/+1
* | | Fix Party element so that an identicon's height is that which was passed inFabio Berger2017-12-061-1/+1
| * | Inline functionLeonid Logvinov2017-12-061-6/+1
| * | Introduce a constLeonid Logvinov2017-12-061-1/+3
| * | Make privateLeonid Logvinov2017-12-061-0/+1
| * | Add version matcher scriptLeonid Logvinov2017-12-064-0/+110
| * | Use same versions of dependencies everywhereLeonid Logvinov2017-12-068-129/+57
| | * Have comments hug statementsFabio Berger2017-12-061-3/+3
| | * Add declarationFabio Berger2017-12-061-0/+7
| | * Return actual error thrownFabio Berger2017-12-061-1/+1
| | * remove unused modulesFabio Berger2017-12-062-5/+0
| | * Use subproviders subpackage in website and remove old subprovidersFabio Berger2017-12-067-300/+45
| | * remove extra spaceFabio Berger2017-12-061-1/+0
| | * Add initial tests fort redundantRpcSubproviderFabio Berger2017-12-061-0/+62
| | * Add null to err typeFabio Berger2017-12-061-1/+1
| | * Use null instead of undefined when no error existsFabio Berger2017-12-061-3/+3
| | * Switch to using our custom base subproviderFabio Berger2017-12-061-1/+2
| | * remove unused importFabio Berger2017-12-061-1/+0
| | * Fix lint issuesFabio Berger2017-12-063-9/+11
| | * Merge branch 'development' into feature/addSubprovidersFabio Berger2017-12-06155-302/+17404
| | |\ | |_|/ |/| |
* | | Merge pull request #251 from 0xProject/feature/websocketVersion2Brandon Millman2017-12-0613-50/+101
|\ \ \
| * | | Add PR number to changelogBrandon Millman2017-12-061-1/+1
| * | | Add requestId to subscription messages and update json-schemasBrandon Millman2017-12-0613-50/+101
* | | | Merge pull request #249 from 0xProject/feature/typed-contractsLeonid2017-12-0638-305/+2758
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Address feedbackLeonid Logvinov2017-12-063-10/+10
| * | Update READMELeonid Logvinov2017-12-061-5/+6
| * | Regenerate filesLeonid Logvinov2017-12-065-5/+5
| * | Make it privateLeonid Logvinov2017-12-061-0/+1
| * | Change package nameLeonid Logvinov2017-12-061-1/+1
| * | Update READMELeonid Logvinov2017-12-061-2/+3