aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
Commit message (Expand)AuthorAgeFilesLines
* Improve homepage and add translations in chinese, russian, korean and spanishFabio Berger2018-02-2110-16/+398
* Move translate to reduxFabio Berger2018-02-215-91/+161
* Add translation infra and replace english text with calls to translateFabio Berger2018-02-216-219/+412
* Move tsconfig package to devDepsFabio Berger2018-02-211-1/+1
* Add Rinkeby network to smart contract docsFabio Berger2018-02-163-0/+8
* Updated CHANGELOGFabio Berger2018-02-161-2/+2
* remove hard-coded colorFabio Berger2018-02-162-4/+2
* Remove section links until they go somewhereFabio Berger2018-02-161-10/+3
* Add more padding on top of section titleFabio Berger2018-02-161-2/+2
* Add hack comment explaining param count short-cutFabio Berger2018-02-161-0/+3
* replace repeated conditionals with variableFabio Berger2018-02-161-18/+17
* Remove unneeded propsFabio Berger2018-02-162-2/+0
* use const over hard-codingFabio Berger2018-02-161-1/+1
* uncomment dev logicFabio Berger2018-02-162-5/+3
* Re-design docs pagesFabio Berger2018-02-167-39/+91
* Add icons for all doc pagesFabio Berger2018-02-165-0/+0
* Re-designed Wiki and half-redesigned docs pagesFabio Berger2018-02-1614-123/+277
* Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2018-02-164-4/+34
|\
| * Add missing public types from connect docsBrandon Millman2018-02-152-2/+3
| * Add docs staging to 0x.js packageBrandon Millman2018-02-151-2/+7
| * Add support for intersection types in docsBrandon Millman2018-02-153-2/+25
| * Add page options to relevant HttpClient methodsBrandon Millman2018-02-141-2/+3
* | Prettier fixesFabio Berger2018-02-161-30/+80
|/
* Publishcontracts@2.1.12@0xproject/website@0.0.15@0xproject/testnet-faucets@1.0.13@0xproject/monorepo-scripts@0.1.11@0xproject/deployer@0.0.9@0xproject/connect@0.5.8Fabio Berger2018-02-101-4/+4
* Publishcontracts@2.1.11@0xproject/website@0.0.14@0xproject/testnet-faucets@1.0.12@0xproject/monorepo-scripts@0.1.10@0xproject/deployer@0.0.8@0xproject/connect@0.5.7Fabio Berger2018-02-101-5/+5
* Merge pull request #379 from 0xProject/portal_jsonLeonid2018-02-0919-291/+189
|\
| * Implement blockchain.portalOrderToZeroExOrderLeonid Logvinov2018-02-092-30/+22
| * Make naming of schemas consistentLeonid Logvinov2018-02-096-12/+12
| * Address feedbackLeonid Logvinov2018-02-0815-157/+57
| * Remove hash from signatureDataLeonid Logvinov2018-02-0811-53/+37
| * Remove networkId from orderJSONLeonid Logvinov2018-02-087-20/+3
| * Split Order into signedOrder and metadataLeonid Logvinov2018-02-087-129/+164
| * Reuse ECSignatureLeonid Logvinov2018-02-071-4/+2
| * Remove unused types and take their namesLeonid Logvinov2018-02-077-51/+18
| * Introduce makerToken and takerToken fields for unsigned token metadataLeonid Logvinov2018-02-077-72/+68
| * Move .taker.amount to .takerTokenAmount and .maker.amount to .makerTokenAmountLeonid Logvinov2018-02-075-17/+21
| * Move .taker.feeAmount to .takerFee and .maker.feeAmount to .makerFeeLeonid Logvinov2018-02-075-12/+23
| * Rename signature to ecSignatureLeonid Logvinov2018-02-074-10/+10
| * Rename exchangeContract to exchangeContractAddressLeonid Logvinov2018-02-074-9/+9
| * Rename expiration to expirationUnixTimestampSecLeonid Logvinov2018-02-078-23/+51
* | Fix linksFabio Berger2018-02-092-6/+12
* | Center header above relayersFabio Berger2018-02-091-8/+8
* | Add blog to topBar and as a consequence support external links in topBar menu...Fabio Berger2018-02-092-3/+25
* | Add title above "benefits" sectionFabio Berger2018-02-091-1/+11
* | Add Relayer section to landingFabio Berger2018-02-0915-66/+81
* | Fix flash message when receiving test etherFabio Berger2018-02-081-1/+2
* | Publishcontracts@2.1.10@0xproject/website@0.0.13@0xproject/testnet-faucets@1.0.11@0xproject/deployer@0.0.7Brandon Millman2018-02-081-4/+4
* | Fix wiki stylingFabio Berger2018-02-081-14/+27
* | Only show faucet error if not on a testnetFabio Berger2018-02-071-4/+3
* | Move isTestNetwork into utils and also check it from showing ZRX request buttonFabio Berger2018-02-072-9/+13
* | Remove stray logFabio Berger2018-02-071-1/+0
* | Use isTestNetwork instead of isKovanTestNetwork on balances page except for D...Fabio Berger2018-02-071-7/+15
* | Properly detect Rinkeby and Ropsten TokenRegistry tokens as mintableFabio Berger2018-02-072-3/+31
* | Add networkId to faucet requests so that we can request tokens on Kovan, Rink...Fabio Berger2018-02-072-2/+4
|/
* Add networkId to event labelFabio Berger2018-02-074-7/+19
* Merge pull request #370 from 0xProject/feature/ga-portal-loggingTom Schmidt2018-02-077-64/+113
|\
| * Added logging for order filling and order cancellingThomas Schmidt2018-02-072-1/+26
| * Moved to async awaitThomas Schmidt2018-02-061-18/+13
| * Formatting and removed old GA codeThomas Schmidt2018-02-062-80/+77
| * Converted BigNumber to number for GA loggingThomas Schmidt2018-02-062-3/+3
| * GA logging for order creationThomas Schmidt2018-02-062-4/+21
| * Switch GA to React GA and add logging for PortalThomas Schmidt2018-02-065-7/+22
* | Merge pull request #363 from 0xProject/refactor/subproviders/injected-provide...Jacob Evans2018-02-061-1/+1
|\ \
| * | Change the InjectedWeb3Subprovider to accept Web3.ProviderJacob Evans2018-02-031-1/+1
* | | Publishcontracts@2.1.9@0xproject/website@0.0.12@0xproject/testnet-faucets@1.0.10@0xproject/monorepo-scripts@0.1.9@0xproject/deployer@0.0.6Leonid Logvinov2018-02-061-5/+5
| |/ |/|
* | Merge branch 'development' into feature/build_watchLeonid2018-02-052-11/+9
|\|
| * Publishcontracts@2.1.8@0xproject/website@0.0.11@0xproject/testnet-faucets@1.0.9@0xproject/monorepo-scripts@0.1.8@0xproject/deployer@0.0.5Leonid Logvinov2018-02-011-11/+8
| * Add OrderWatcherConfig to the list of public typesLeonid Logvinov2018-02-011-0/+1
* | Upgrade TS to the newest versionLeonid Logvinov2018-02-011-1/+1
|/
* Fix lint errorsBrandon Millman2018-01-311-1/+1
* Remove unused propFabio Berger2018-01-311-1/+0
* Merge pull request #351 from 0xProject/feature/portal-ledger-supportFabio Berger2018-01-3153-645/+1204
|\
| * Fix prettierFabio Berger2018-01-311-9/+1
| * Uppercase Networks enum valuesFabio Berger2018-01-317-22/+22
| * Make default gasPrice more readableFabio Berger2018-01-311-1/+3
| * Fix prettier messFabio Berger2018-01-311-6/+3
| * Fix linter errorsFabio Berger2018-01-3121-72/+20
| * Shrink imgFabio Berger2018-01-311-0/+0
| * Fix all setState calls after unmounted errors. Decided to create our own flag...Fabio Berger2018-01-317-43/+90
| * Fix bug where we were return undefined instead of the empty objectFabio Berger2018-01-311-1/+1
| * Default the derivation path to that found in the Ledger subproviderFabio Berger2018-01-311-1/+4
| * Add browser data to dialog infoFabio Berger2018-01-311-1/+1
| * Add Rinkeby supportFabio Berger2018-01-302-6/+3
| * Pass in whether we want the personal message prefix appended and never append...Fabio Berger2018-01-302-1/+20
| * Merge branch 'development' into feature/portal-ledger-supportFabio Berger2018-01-301-5/+5
| |\
| * | Wholesale replace the tokenByAddress and de-dup properlyFabio Berger2018-01-304-26/+31
| * | Call destroy ealier so that web3Wrapper stops polling for userAddress/network...Fabio Berger2018-01-302-3/+8
| * | Disallow negative amountsFabio Berger2018-01-301-1/+1
| * | Remove the ability to clear tokenByAddress. It should simply be updated.Fabio Berger2018-01-304-14/+0
| * | Use live backend on developmentFabio Berger2018-01-291-1/+1
| * | Fetch default gasPrice from our ethGasStation API mirror and set it for all t...Fabio Berger2018-01-291-3/+34
| * | remove unused typeFabio Berger2018-01-291-10/+0
| * | Small improvementsFabio Berger2018-01-291-2/+2
| * | Fix bug related to balance/allowance fetching being asyncFabio Berger2018-01-291-0/+14
| * | Add missing entries for Ropsten and Rinkeby testnets, added Ropsten to Ledger...Fabio Berger2018-01-296-23/+32
| * | Re-set Ledger config dialog to connect step if dialog is closedFabio Berger2018-01-291-0/+1
| * | Add flash message instructing user to confirm tx on LedgerFabio Berger2018-01-291-0/+13
| * | Add the stack trace to help with debuggingFabio Berger2018-01-291-1/+1
| * | Make it such that users can switch between Ledger accounts without first swit...Fabio Berger2018-01-293-9/+12
| * | Use colors module and remove in-lined colorsFabio Berger2018-01-292-7/+10
| * | Replace heavy loading animation with simple circular loaderFabio Berger2018-01-295-41/+14
| * | Add network name to the select providerFabio Berger2018-01-291-12/+15
| * | Fix bug where could not switch to Ledger and backFabio Berger2018-01-296-31/+65
| * | Implement just-in-time loading of token balances & allowancesFabio Berger2018-01-2823-295/+384
| * | Initial Ledger support implementationFabio Berger2018-01-2824-163/+559
| * | Remove unused Ledgerco importFabio Berger2018-01-282-2/+0
| * | Add light blue as our accent colorFabio Berger2018-01-281-0/+1
| * | Properly detect user signing cancellation on Metamask, Parity signer and LedgerFabio Berger2018-01-286-7/+7
* | | Fix prettierLeonid Logvinov2018-01-301-3/+6
| |/ |/|
* | Publishcontracts@2.1.7@0xproject/website@0.0.10@0xproject/testnet-faucets@1.0.8@0xproject/monorepo-scripts@0.1.7@0xproject/deployer@0.0.4Fabio Berger2018-01-301-11/+8
* | Add config file specifically in prettier command and fix filesFabio Berger2018-01-30118-13077/+13077
* | Fix prettierFabio Berger2018-01-30118-13077/+13077
* | Fix prettierFabio Berger2018-01-301-3/+6
* | Publishcontracts@2.1.6@0xproject/website@0.0.9@0xproject/testnet-faucets@1.0.7@0xproject/monorepo-scripts@0.1.6@0xproject/deployer@0.0.3Leonid Logvinov2018-01-301-11/+8
* | Run prettierAmir Bandeali2018-01-261-3/+6
|/
* PublishLeonid Logvinov2018-01-251-11/+8
* Fix fill/cancel order by looking for NoError instead of empty blockchainErr g...Fabio Berger2018-01-221-2/+2
* Add our mainnet and kovan nodes as backups for Portal requestsFabio Berger2018-01-191-2/+2
* Fix bug hiding the user info from topBarFabio Berger2018-01-191-1/+1
* Allow Token symbols to be alphanumericJacob Evans2018-01-191-4/+4
* Fix prettierLeonid Logvinov2018-01-183-46/+56
* Merge pull request #325 from 0xProject/fix/portal-bugsLeonid2018-01-187-19/+27
|\
| * Use intervalUtils.clearAsyncExcludingInterval instead of calling clearInterva...Fabio Berger2018-01-182-4/+4
| * Add discourse forum to Community section of website footerFabio Berger2018-01-183-0/+7
| * Remove dead-codeFabio Berger2018-01-181-5/+0
| * Fix Portal topbar so that it displays the mobile menuFabio Berger2018-01-181-8/+6
| * Add missing onError callbacksFabio Berger2018-01-182-2/+10
| * Fix balance page copy to refer to the Wrap ETH tab instead of a "convert" buttonFabio Berger2018-01-181-1/+1
* | Merge pull request #322 from 0xProject/fix/ci-timeLeonid2018-01-184-4/+4
|\ \
| * | Enable restrict-plus-operands and fix issues detectedLeonid Logvinov2018-01-174-4/+4
| |/
* | Run prettier to revert formatting changes made by the lerna publish stepBrandon Millman2018-01-181-3/+6
* | Publishcontracts@2.1.4@0xproject/website@0.0.7@0xproject/monorepo-scripts@0.1.4@0xproject/kovan_faucets@1.0.50x.js@0.30.0Brandon Millman2018-01-181-11/+8
|/
* Fix @bmilman linkedin linkLeonid Logvinov2018-01-121-1/+1
* Add new team photosLeonid Logvinov2018-01-123-4/+6
* Add a CHANGELOG to a websiteLeonid Logvinov2018-01-121-0/+5
* Add @tom and @dekz while removing @PhABCLeonid Logvinov2018-01-122-14/+26
* Prettify package.json filesLeonid Logvinov2018-01-121-3/+6
* Publishweb3-typescript-typings@0.9.3contracts@2.1.3@0xproject/website@0.0.6@0xproject/kovan_faucets@1.0.40x.js@0.29.2Leonid Logvinov2018-01-111-3/+3
* Publishweb3-typescript-typings@0.9.1contracts@2.1.2@0xproject/website@0.0.5@0xproject/monorepo-scripts@0.1.3@0xproject/kovan_faucets@1.0.3@0xproject/dev-utils@0.0.40x.js@0.29.1Leonid Logvinov2018-01-111-11/+8
* Fix ts error in portal after enabling more strict checksLeonid Logvinov2018-01-1012-38/+42
* Return to old way of including web3 typesLeonid Logvinov2018-01-101-1/+1
* Include web3 types via typeRoots and factor out common parts of tsconfig.jsonLeonid Logvinov2018-01-102-7/+5
* Apply prettify on json and md filesLeonid Logvinov2018-01-049-307/+308
* Fix linter errorsLeonid Logvinov2018-01-043-5/+3
* Use configured version of bignumber in all packagesLeonid Logvinov2018-01-0432-36/+31
* Apply prettier configLeonid Logvinov2018-01-03112-3298/+2774
* Publishcontracts@2.1.1@0xproject/website@0.0.4@0xproject/monorepo-scripts@0.1.2@0xproject/kovan_faucets@1.0.2@0xproject/dev-utils@0.0.30x.js@0.29.0Fabio Berger2017-12-281-4/+4
* Merge branch 'development' into fix/docLinksFabio Berger2017-12-2257-849/+849
|\
| * Merge pull request #285 from 0xProject/fix/underscorePrivateBrandon Millman2017-12-2257-849/+849
| |\
| | * Merge branch 'development' into fix/underscorePrivateBrandon Millman2017-12-219-18/+23
| | |\
| | * | Add new underscore-privates rule to @0xproject/tslint-config and fix lint errorsBrandon Millman2017-12-2057-849/+849
* | | | 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-211-4/+4
|\ \
| * | 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-211-4/+4
* | | Fix top-paddingFabio Berger2017-12-213-5/+5
|/ /
* | Merge pull request #277 from 0xProject/feature/weth-eventsLeonid2017-12-201-0/+5
|\ \ | |/ |/|
| * Export new public typesLeonid Logvinov2017-12-201-0/+3
| * Add etherToken.getLogsAsync and etherToken.subscribe with testsLeonid Logvinov2017-12-201-0/+2
* | Standardize on improved contributing sectionFabio Berger2017-12-201-0/+5
* | Update and improve website READMEFabio Berger2017-12-201-26/+30
|/
* 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-2073-994/+942
|\
| * Remove re-assignmentFabio Berger2017-12-201-5/+9
| * Merge branch 'development' into refactor/websiteFabio Berger2017-12-202-3/+4
| |\
| | * Rename SubscriptionOpts to BlockRangeLeonid Logvinov2017-12-192-3/+4
| * | 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-193-16/+25
| |\|
| * | 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-191-10/+19
|\ \ \ | | |/ | |/|
| * | Merge pull request #268 from 0xProject/fix/codeSelectingInDocsFabio Berger2017-12-191-10/+19
| |\ \
| | * | Fixed https://github.com/0xProject/wiki/issues/19 by disabling re-rendering o...Fabio Berger2017-12-181-10/+19
| | |/
| * / Update website calls to deposit/withdrawFabio Berger2017-12-182-6/+6
| |/
* | 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
|/
* 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
* Fix linter errorsFabio Berger2017-12-163-13/+0
* Merge branch 'development' into createWethPageFabio Berger2017-12-1658-265/+38
|\
| * Fix redundant spacesLeonid Logvinov2017-12-162-2/+2
| * Fix website unused varsLeonid Logvinov2017-12-1556-256/+28
| * Reuse intervalutils in websiteLeonid Logvinov2017-12-152-6/+6
| * Merge branch 'development' into feature/addKovanFaucetsBrandon Millman2017-12-141-1/+1
| |\
| | * Add new packages to main READMELeonid Logvinov2017-12-131-1/+1
| * | Fix build errorsBrandon Millman2017-12-131-1/+1
| |/
* | 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
|\|
| * 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-139-2/+264
|/ /
* | Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2017-12-134-15/+6
|\|
| * Merge pull request #257 from 0xProject/fix/ethereum-addressLeonid2017-12-123-8/+2
| |\
| | * Fix an invocationLeonid Logvinov2017-12-121-1/+1
| | * Move isAddress to shared utils and remove all dependencies on ethereum-addressLeonid Logvinov2017-12-113-7/+1
| * | Re-hard code the dependencyLeonid Logvinov2017-12-121-1/+1
| * | Don't unsubscribe on error. It's done automaticallyLeonid Logvinov2017-12-122-7/+4
| |/
* / Resize token iconsFabio Berger2017-12-136-0/+0
|/
* 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-091-2/+2
* Merge branch 'development' into feature/addSubprovidersFabio Berger2017-12-094-14/+12
|\
| * Merge branch 'development' into feature/web3-wrapperLeonid2017-12-082-6/+12
| |\
| * | Refactor web3Wrapper to a separate packageLeonid Logvinov2017-12-076-16/+14
* | | 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
* | Fix version and remove the UMD buildFabio Berger2017-12-071-1/+1
* | Fix tslint errorFabio Berger2017-12-071-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 15:31:58 +0800