aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix(instant): Don't allow changing of assets when order processingSteve Klebanoff2018-11-201-2/+3
* Merge pull request #1276 from 0xProject/test/instant/bundle-sizeBrandon Millman2018-11-203-2/+11
|\
| * fix(instant): change lodash version to the same as other 0x packagesBrandon Millman2018-11-161-1/+1
| * fix(asset-buyer): change lodash version to the same as other 0x packagesBrandon Millman2018-11-162-1/+10
* | Merge pull request #1271 from 0xProject/feature/instant/iconsBrandon Millman2018-11-2036-10/+240
|\ \
| * | feat(instant): support custom iconUrlsBrandon Millman2018-11-202-9/+26
| * | Merge branch 'development' into feature/instant/iconsBrandon Millman2018-11-2038-55/+755
| |\ \ | |/ / |/| |
* | | Add 0x-order-utils.py library to developers homeFabio Berger2018-11-201-0/+9
* | | Fixes to CONTRIBUTING.mdFabio Berger2018-11-191-3/+3
* | | Improve our CONTRIBUTING.md instructionsFabio Berger2018-11-191-34/+65
* | | Merge pull request #1278 from 0xProject/feature/contract-addresses/rinkebyJacob Evans2018-11-192-0/+19
|\ \ \
| * | | feat: Deploy contracts to RinkebyJacob Evans2018-11-162-0/+19
* | | | fix(order_utils.py): publish docs to S3, not RTD (#1264)F. Eugene Aumson2018-11-174-2/+37
* | | | Merge pull request #1282 from 0xProject/fix/instant/release-notes-bugFrancesco Agosti2018-11-171-2/+3
|\ \ \ \
| * | | | fix: make instant package privatefragosti2018-11-171-1/+2
| * | | | feat: refer to map file in postpublish configsfragosti2018-11-171-1/+1
|/ / / /
* | | | Merge pull request #1275 from 0xProject/feature/instant/productionize-publish...Francesco Agosti2018-11-178-14/+22
|\ \ \ \
| * | | | feat: add new bundle name to bundle watchfragosti2018-11-171-1/+1
| * | | | fix: tslint ignore rule in wrong placefragosti2018-11-171-1/+1
| * | | | fix: remove private config linefragosti2018-11-161-1/+0
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-160-0/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-165-28/+37
| |\ \ \ \ \
| * | | | | | chore: run linterfragosti2018-11-161-6/+1
| * | | | | | feat: change version to 1.0.0fragosti2018-11-161-1/+1
| * | | | | | chore: update gitignorefragosti2018-11-161-2/+2
| * | | | | | fix: deploy commandsfragosti2018-11-163-4/+4
| * | | | | | feat: rename bundle to instant.js and move build to umd dirfragosti2018-11-164-7/+11
| * | | | | | feat: add npmignorefragosti2018-11-161-0/+5
| * | | | | | feat: change webpack config and make instant publicfragosti2018-11-161-2/+2
* | | | | | | Update blog post featureFabio Berger2018-11-171-2/+2
* | | | | | | Fix disclaimer on mobileFabio Berger2018-11-171-1/+1
* | | | | | | Add smart contract docs to Developer HomeFabio Berger2018-11-171-0/+8
* | | | | | | Add Apache license linkFabio Berger2018-11-171-0/+1
* | | | | | | Fix capitalization in titleFabio Berger2018-11-171-3/+10
* | | | | | | Remove excess semi-colonFabio Berger2018-11-171-1/+1
* | | | | | | Point directly to README for docs linkFabio Berger2018-11-171-1/+1
* | | | | | | Merge pull request #1253 from 0xProject/launchKitLandingFabio B2018-11-1621-1/+582
|\ \ \ \ \ \ \
| * | | | | | | Update iconsFabio Berger2018-11-165-50/+46
| * | | | | | | Fix disclaimerFabio Berger2018-11-161-1/+1
| * | | | | | | Add blogpost URLFabio Berger2018-11-161-1/+1
| * | | | | | | Add disclaimerFabio Berger2018-11-161-0/+29
| * | | | | | | Merge branch 'development' into launchKitLandingFabio Berger2018-11-16202-775/+2932
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Add launch kit to Developer home list of toolsFabio Berger2018-11-161-0/+9
| * | | | | | | fix linter issueFabio Berger2018-11-161-1/+1
| * | | | | | | Add support for responsive leftFabio Berger2018-11-161-0/+9
| * | | | | | | Update call-to-action linksFabio Berger2018-11-162-4/+6
| * | | | | | | Move benefits to language files and fix copyFabio Berger2018-11-147-34/+78
| * | | | | | | update yarn.lockFabio Berger2018-11-141-38/+1
| * | | | | | | Implement 0x launch kit landing pageFabio Berger2018-11-1418-1/+493
* | | | | | | | Update LICENSELeonid Logvinov2018-11-161-2/+2
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1277 from akfork/hotfix/fix-ganache-gas-limitJacob Evans2018-11-161-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | fix: fix exceeds block gas limit errorAkagi2012018-11-161-1/+1
|/ / / / / /
| | | | | * feat(instant): add icons to token selectorBrandon Millman2018-11-1635-10/+223
| |_|_|_|/ |/| | | |
* | | | | chore(instant): fix lint errorBrandon Millman2018-11-161-1/+1
| |_|_|/ |/| | |
* | | | fix: remove unused varsfragosti2018-11-161-6/+1
| |_|/ |/| |
* | | Merge pull request #1273 from 0xProject/fix/instant/heartbeat-errorsSteve Klebanoff2018-11-165-28/+37
|\ \ \ | |_|/ |/| |
| * | Send in affiliate info as optionSteve Klebanoff2018-11-163-12/+7
| * | Have heartbeat update not trigger errorsSteve Klebanoff2018-11-165-25/+39
* | | Merge pull request #1266 from 0xProject/feature/instant/fix-mobile-specific-c...Francesco Agosti2018-11-168-100/+73
|\ \ \ | |/ / |/| |
| * | Merge branch 'feature/instant/fix-mobile-specific-content' of https://github....fragosti2018-11-160-0/+0
| |\ \
| | * | feat: make onUnlockWalletClick different based on ONfragosti2018-11-153-35/+58
| | * | chore: remove wallet panel content for mobilefragosti2018-11-151-51/+1
| | * | feat: use blue for wallet prompt on mobilefragosti2018-11-154-8/+32
| | * | feat: use stable version of bowserfragosti2018-11-152-9/+5
| * | | fix: remove redundant handlerfragosti2018-11-162-26/+6
| * | | feat: make onUnlockWalletClick different based on ONfragosti2018-11-163-35/+58
| * | | chore: remove wallet panel content for mobilefragosti2018-11-161-51/+1
| * | | feat: use blue for wallet prompt on mobilefragosti2018-11-164-8/+32
| * | | feat: use stable version of bowserfragosti2018-11-162-9/+5
|/ / /
* | | Merge pull request #1265 from 0xProject/feature/instant/expose-webpack-dev-se...Francesco Agosti2018-11-163-3/+19
|\ \ \
| * | | fix: add http to external url stringfragosti2018-11-161-1/+1
| |/ /
| * | feat: expose webpack-dev-server content to local networkfragosti2018-11-153-3/+19
* | | Merge pull request #1263 from 0xProject/fix/website/node-envBrandon Millman2018-11-163-41/+3
|\ \ \ | |/ / |/| |
| * | fix(website): remove node env definition from webpackBrandon Millman2018-11-151-1/+0
| * | fix(website): currentProvider called on undefinedBrandon Millman2018-11-151-1/+1
| * | chore: update yarn lockBrandon Millman2018-11-151-39/+2
|/ /
* | Merge pull request #1257 from 0xProject/feature/instant/different-install-wal...Francesco Agosti2018-11-1516-67/+369
|\ \
| * | feat: use capital values for enumsfragosti2018-11-154-39/+81
| * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-15100-348/+902
| |\ \
| * | | fix: do not remove payment dropdown when confirmation pendingfragosti2018-11-141-2/+1
| * | | refactor: move wallet panel content os switching logic into two methodsfragosti2018-11-141-78/+79
| * | | feat: dont show payment dropdown content on mobilefragosti2018-11-141-0/+4
| * | | feat: center title label with circlefragosti2018-11-141-3/+3
| * | | chore: remove unused importfragosti2018-11-141-1/+1
| * | | feat: add coinbase wallet app logo to wallet promptfragosti2018-11-143-7/+24
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-1430-150/+364
| |\ \ \
| * | | | feat: display the correct provider type and change unlock / install prompt co...fragosti2018-11-1410-94/+110
| * | | | feat: change install wallet panel content based on browser and osfragosti2018-11-148-28/+214
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-1423-75/+93
| |\ \ \ \
* | \ \ \ \ Merge pull request #1258 from 0xProject/fix/instant/contract-callBrandon Millman2018-11-151-12/+17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fix(instant): catch errors coming from calls to the orderValidator contractBrandon Millman2018-11-141-12/+17
| | |_|/ / | |/| | |
* | | | | fix(instant): fix tabIndex attribute errorBrandon Millman2018-11-152-2/+2
* | | | | fix(order_utils.py): lazy load contract artifacts (#1262)F. Eugene Aumson2018-11-151-8/+21
* | | | | Merge pull request #1261 from 0xProject/fix/instant/erc20-picker-listBrandon Millman2018-11-155-11/+10
|\ \ \ \ \
| * | | | | fix(instant): match token search on prefixBrandon Millman2018-11-151-2/+4
| * | | | | fix(instant): border radiusBrandon Millman2018-11-153-9/+4
| * | | | | fix(instant): fix tabbing into erc20 token selectorBrandon Millman2018-11-152-0/+2
|/ / / / /
* | | | | fix(order_utils.py): validate order w/json schema (#1260)F. Eugene Aumson2018-11-159-61/+131
* | | | | feat(order_utils.py): sign_hash() (#1254)F. Eugene Aumson2018-11-1414-110/+286
* | | | | Publishcontracts@2.1.54@0x/website@0.0.59@0x/web3-wrapper@3.1.4@0x/utils@2.0.5@0x/testnet-faucets@1.0.56@0x/subproviders@2.1.4@0x/sra-spec@1.0.10@0x/sol-doc@1.0.7@0x/sol-cov@2.1.12@0x/sol-compiler@1.1.12@0x/react-shared@1.0.21@0x/react-docs@1.0.18@0x/order-watcher@2.2.4@0x/order-utils@3.0.2@0x/migrations@2.0.4@0x/metacoin@0.0.28@0x/json-schemas@2.1.1@0x/instant@0.0.7@0x/fill-scenarios@1.0.12@0x/dev-utils@1.0.17@0x/dev-tools-pages@0.0.6@0x/contract-wrappers@4.0.2@0x/connect@3.0.6@0x/base-contract@3.0.6@0x/asset-buyer@3.0.0@0x/assert@1.0.17@0x/abi-gen@1.0.16@0x/abi-gen-wrappers@1.0.50x.js@2.0.4Leonid Logvinov2018-11-1429-167/+167
* | | | | Updated CHANGELOGSLeonid Logvinov2018-11-1447-41/+287
* | | | | Merge pull request #1259 from 0xProject/feature/ow-zrx-bugLeonid Logvinov2018-11-142-1/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add a commentLeonid Logvinov2018-11-141-0/+1
| * | | | Fix a bug in an order-watcher order removal when maker token is ZRXLeonid Logvinov2018-11-142-1/+13
|/ / / /
* | | | Merge pull request #1242 from 0xProject/feature/instant/metamask-connect-flowFrancesco Agosti2018-11-1438-153/+644
|\ \ \ \
| * \ \ \ Merge branch 'feature/instant/metamask-connect-flow' of https://github.com/0x...fragosti2018-11-145-41/+44
| |\ \ \ \
| | * \ \ \ Merge pull request #1255 from 0xProject/feature/instant/metamask-connect-flow...Steve Klebanoff2018-11-145-41/+44
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | lintingSteve Klebanoff2018-11-141-1/+2
| | | * | | Remove ConnectedZeroExInstantContainer, introduce ConnectedBuyOrderProgressOr...Steve Klebanoff2018-11-145-41/+43
| | |/ / /
| * | | | Merge https://github.com/0xProject/0x-monorepo into feature/instant/metamask-...fragosti2018-11-1448-184/+413
| |\ \ \ \ | |/ / / / |/| / / / | |/ / /
* | | | Merge pull request #1252 from 0xProject/fix/asset-buyer/price-per-tokenBrandon Millman2018-11-1418-89/+118
|\ \ \ \
| * | | | chore(instant): fix prettierBrandon Millman2018-11-142-2/+10
| * | | | Merge branch 'development' into fix/asset-buyer/price-per-tokenBrandon Millman2018-11-1487-214/+619
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | chore(asset-buyer): update changelog to major version bumpBrandon Millman2018-11-141-1/+1
| * | | | chore(instant): update selectedAssetAmount in the redux state to be named sel...Brandon Millman2018-11-1413-65/+68
| * | | | chore(asset-buyer): update changelogBrandon Millman2018-11-131-0/+9
| * | | | feat(instant): calculate per unit eth amount to populate OrderDetails componentBrandon Millman2018-11-132-6/+15
| * | | | fix(asset-buyer): output assetEthAmount instead of ethPerAssetPrice in BuyQuo...Brandon Millman2018-11-134-31/+31
* | | | | feat(order_utils.py) generate_order_hash_hex() (#1234)F. Eugene Aumson2018-11-147-20/+208
| |/ / / |/| | |
* | | | Merge pull request #1244 from 0xProject/developerSectionNitsFabio B2018-11-1423-75/+93
|\ \ \ \
| * | | | chore: fix linter errorFabio Berger2018-11-121-1/+1
| * | | | Improve logo spacingFabio Berger2018-11-121-1/+24
| * | | | update yarn.lockFabio Berger2018-11-121-17/+2
| * | | | merge developmentFabio Berger2018-11-12248-2081/+5924
| |\ \ \ \
| * | | | | Increase logo sizeFabio Berger2018-11-121-3/+3
| * | | | | Replace remaining scroll-links with Link componentFabio Berger2018-11-122-24/+5
| * | | | | Adjust paddinFabio Berger2018-11-111-1/+1
| * | | | | Fix menuItem background colors depending on the contextFabio Berger2018-11-114-3/+18
| * | | | | Remove "Home" menu item, instead make different parts of logo link to differe...Fabio Berger2018-11-118-59/+53
| * | | | | Rename tutorial to match verb structureFabio Berger2018-11-115-5/+5
| * | | | | chore: Make `External exports` clickable on sidebarFabio Berger2018-10-261-1/+2
| * | | | | style: reduce border size on version dropdownFabio Berger2018-10-261-1/+1
| * | | | | style: make line-height of sidebar title 26px, make sure still bottom aligned...Fabio Berger2018-10-261-1/+2
| * | | | | Update yarn.lockFabio Berger2018-10-261-45/+1
| * | | | | style: remove small gap under topbarFabio Berger2018-10-262-23/+26
| | | | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-1461-118/+345
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Publishcontracts@2.1.53@0x/website@0.0.58@0x/web3-wrapper@3.1.3@0x/testnet-faucets@1.0.55@0x/subproviders@2.1.3@0x/sol-doc@1.0.6@0x/sol-cov@2.1.11@0x/sol-compiler@1.1.11@0x/react-shared@1.0.20@0x/react-docs@1.0.17@0x/order-watcher@2.2.3@0x/order-utils@3.0.1@0x/migrations@2.0.3@0x/metacoin@0.0.27@0x/instant@0.0.6@0x/fill-scenarios@1.0.11@0x/dev-utils@1.0.16@0x/dev-tools-pages@0.0.5@0x/contract-wrappers@4.0.1@0x/connect@3.0.5@0x/base-contract@3.0.5@0x/asset-buyer@2.2.2@0x/abi-gen-wrappers@1.0.40x.js@2.0.3Leonid Logvinov2018-11-1424-112/+112
* | | | | | Updated CHANGELOGSLeonid Logvinov2018-11-1437-2/+266
| | | | * | chore: PR feedbackfragosti2018-11-142-6/+5
| | | | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-144-3/+7
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Fix a bug when undefined was been tried to convert to an arrayLeonid Logvinov2018-11-142-1/+5
* | | | | | Merge pull request #1248 from 0xProject/fixLowercaseAddressBugFabio B2018-11-132-2/+2
|\ \ \ \ \ \
| * | | | | | fix: lowercase supplied address before comparing with derived addresses (whic...Fabio Berger2018-11-121-1/+2
| * | | | | | Remove unused instance variableFabio Berger2018-11-121-1/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1251 from 0xProject/feature/instant/asset-data-mapBrandon Millman2018-11-131-22/+141
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| | | | | * chore: run linterfragosti2018-11-131-1/+1
| | | | | * feat: use Omit type to improve type defitions in some containersfragosti2018-11-132-17/+6
| | | | | * chore: remove unused constantfragosti2018-11-132-2/+0
| | | | | * fix: rename handler creator namefragosti2018-11-133-3/+3
| | | | | * feat: make all button fontsizes 16px by defaultfragosti2018-11-136-7/+3
| | | | | * fix: remove requirement of default case in all switch statementsfragosti2018-11-138-22/+12
| | | | | * feat: prevent eth balance blinkfragosti2018-11-133-7/+49
| | | | | * Merge branch 'feature/instant/asset-data-map' of https://github.com/0xProject...fragosti2018-11-131-22/+141
| | | | | |\ | | |_|_|_|/ | |/| | | |
| * | | | | feat(instant): add extra asset metadataBrandon Millman2018-11-131-22/+141
| | | | | * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-13125-443/+878
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #1227 from WyseNynja/patch-1Fabio B2018-11-132-1/+10
|\ \ \ \ \ \
| * | | | | | Update CHANGELOG.jsonBryan Stitt2018-11-131-1/+1
| * | | | | | Merge branch 'development' into patch-1Bryan Stitt2018-11-13125-443/+869
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Publishcontracts@2.1.52@0x/website@0.0.57@0x/web3-wrapper@3.1.2@0x/testnet-faucets@1.0.54@0x/subproviders@2.1.2@0x/sra-spec@1.0.9@0x/sol-doc@1.0.5@0x/sol-cov@2.1.10@0x/sol-compiler@1.1.10@0x/react-shared@1.0.19@0x/react-docs@1.0.16@0x/order-watcher@2.2.2@0x/order-utils@3.0.0@0x/migrations@2.0.2@0x/metacoin@0.0.26@0x/json-schemas@2.1.0@0x/instant@0.0.5@0x/fill-scenarios@1.0.10@0x/dev-utils@1.0.15@0x/dev-tools-pages@0.0.4@0x/contract-wrappers@4.0.0@0x/connect@3.0.4@0x/base-contract@3.0.4@0x/asset-buyer@2.2.1@0x/assert@1.0.16@0x/abi-gen-wrappers@1.0.30x.js@2.0.2Leonid Logvinov2018-11-1227-136/+136
* | | | | | | Updated CHANGELOGSLeonid Logvinov2018-11-1243-43/+256
* | | | | | | Merge pull request #1250 from 0xProject/feature/json-schemas-connectLeonid Logvinov2018-11-1217-107/+113
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix static testsLeonid Logvinov2018-11-121-1/+0
| * | | | | | Add PR numberLeonid Logvinov2018-11-121-1/+2
| * | | | | | Move connect schemas to JSON SchemasLeonid Logvinov2018-11-1217-107/+112
* | | | | | | Merge pull request #1235 from 0xProject/fixOrderValidationFabio B2018-11-1215-124/+217
|\ \ \ \ \ \ \
| * | | | | | | Add fixes affecting the public interface to the CHANGELOGsFabio Berger2018-11-122-0/+45
| * | | | | | | Use correctly formatted signature so that it rejects with the expected reason...Fabio Berger2018-11-121-1/+2
| * | | | | | | Remove unnecessary conversion to BigNumberFabio Berger2018-11-121-2/+2
| * | | | | | | Use rejectedWithFabio Berger2018-11-121-2/+2
| * | | | | | | Use RevertReason when possibleFabio Berger2018-11-121-1/+1
| * | | | | | | rename paramFabio Berger2018-11-121-2/+2
| * | | | | | | address linter errorsFabio Berger2018-11-111-2/+0
| * | | | | | | Move signature validation into OrderValidationUtils.validateOrderFillableOrTh...Fabio Berger2018-11-103-15/+16
| * | | | | | | Merge branch 'development' into fixOrderValidationFabio Berger2018-11-10131-393/+1151
| |\ \ \ \ \ \ \
| * | | | | | | | Revert comment changeFabio Berger2018-11-101-1/+1
| * | | | | | | | Keep more helpful error messages, and stop swallowing errors when returning c...Fabio Berger2018-11-101-59/+72
| * | | | | | | | Merge branch 'development' into fixOrderValidationFabio Berger2018-11-0983-632/+1428
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused validateFillOrKill methodFabio Berger2018-11-091-30/+1
| * | | | | | | | | Fix validateOrderFillableOrThrowAsync method so it also checks order signatur...Fabio Berger2018-11-0912-30/+94
* | | | | | | | | | Merge pull request #1246 from 0xProject/bug/web3-wrapper/eth-call-nullFabio B2018-11-121-3/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | bug(web3-wrapper): throws when contract returns nullJacob Evans2018-11-121-3/+0
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1238 from 0xProject/fix/website/code-splittingBrandon Millman2018-11-1224-32/+34
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | fix(website): fix code splittingBrandon Millman2018-11-1224-32/+34
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1241 from 0xProject/feature/contracts/changelogsAmir Bandeali2018-11-122-1/+116
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add CHANGELOG comment to READMEAmir Bandeali2018-11-121-1/+1
| * | | | | | | | Add CHANGELOG.jsonAmir Bandeali2018-11-121-0/+115
|/ / / / / / / /
| | | | | * | | Update CHANGELOG.jsonBryan Stitt2018-11-131-1/+1
| | | | | * | | Update packages/order-watcher/CHANGELOG.jsonFabio B2018-11-131-1/+0
| | | | | * | | Update packages/order-watcher/CHANGELOG.jsonLeonid Logvinov2018-11-131-1/+1
| | | | | * | | Update CHANGELOG.jsonBryan Stitt2018-11-121-1/+1
| | | | | * | | Merge branch 'development' into patch-1Bryan Stitt2018-11-12158-930/+2191
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| | | | | * | | update changelogBryan Stitt2018-11-121-0/+10
| | | | | * | | start jsonRpcRequestId at 1, not 0Bryan Stitt2018-11-081-1/+1
| | | | | | | * feat: integrate wallet flow with heartbeat and other branchesfragosti2018-11-136-48/+81
| | | | | | | * fix: no longer refer to error account statefragosti2018-11-101-1/+0
| | | | | | | * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-1010-27/+115
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #1239 from 0xProject/feature/instant/privacy-modeBrandon Millman2018-11-106-16/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | feat(instant): handle privacy mode in walletsBrandon Millman2018-11-106-16/+11
|/ / / / / / / /
* | | | | | | | Merge pull request #1237 from 0xProject/feature/instant/buy-quote-heartbeatSteve Klebanoff2018-11-107-13/+106
|\ \ \ \ \ \ \ \
| * | | | | | | | lintingSteve Klebanoff2018-11-102-1/+2
| * | | | | | | | Don't start heartbeat if no accountSteve Klebanoff2018-11-101-6/+8
| * | | | | | | | Lodash noopSteve Klebanoff2018-11-101-1/+1
| * | | | | | | | Using built in intervalUtils instead of rolling ownSteve Klebanoff2018-11-101-20/+5
| * | | | | | | | Update account more frequentlySteve Klebanoff2018-11-101-1/+1
| * | | | | | | | Linting and renaming variablesSteve Klebanoff2018-11-105-21/+23
| * | | | | | | | Use interface like named parameters hereSteve Klebanoff2018-11-102-3/+4
| * | | | | | | | Emulate named parameters with interfaceSteve Klebanoff2018-11-103-7/+17
| * | | | | | | | Make sure we only update price when they are not in the middle of an orderSteve Klebanoff2018-11-101-2/+3
| * | | | | | | | Use existing functions instead of writing our ownSteve Klebanoff2018-11-107-94/+28
| * | | | | | | | Merge branch 'development' into feature/instant/buy-quote-heartbeatSteve Klebanoff2018-11-10143-603/+1514
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Variable name cleanupSteve Klebanoff2018-11-091-9/+9
| * | | | | | | | Remove unneeded Promise.resolveSteve Klebanoff2018-11-091-1/+0
| * | | | | | | | Remove old TODOSteve Klebanoff2018-11-091-1/+0
| * | | | | | | | move files around and renameSteve Klebanoff2018-11-093-24/+20
| * | | | | | | | wip: BuyQuote heartbeatSteve Klebanoff2018-11-094-5/+45
| * | | | | | | | Make heartbeat more genericSteve Klebanoff2018-11-092-23/+29
| * | | | | | | | wip: abstract out updating buy quoteSteve Klebanoff2018-11-092-39/+59
| * | | | | | | | lintingSteve Klebanoff2018-11-091-0/+1
| * | | | | | | | feat(instant): Heartbeat for updating account infoSteve Klebanoff2018-11-094-3/+62
| | | | | | | | * fix: set all button font sizes in buy flow to 16pxfragosti2018-11-101-2/+2
| | | | | | | | * fix: remove unused ProgressBar from BuyOrderProgress and fix issue where paym...fragosti2018-11-102-17/+4
| | | | | | | | * fix: minimize height difference between different statesfragosti2018-11-101-2/+3
| | | | | | | | * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-106-12/+50
| | | | | | | | |\ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | feat(instant): Dismissible overlay error messagesSteve Klebanoff2018-11-106-12/+50
| |/ / / / / / / |/| | | | | | |
| | | | | | | * feat: toggle wallet connection colorfragosti2018-11-102-10/+26
| | | | | | | * feat: refactor button styles and add href to Textfragosti2018-11-105-20/+24
| | | | | | | * feat: add more info section to the metamask panelfragosti2018-11-103-5/+10
| | | | | | | * feat: allow href prop on buttonfragosti2018-11-104-8/+33
| | | | | | | * feat: implement basic StandardModalContent with accompanying InstallWalletPan...fragosti2018-11-106-5/+88
| | | | | | | * feat: add padding to close icon to increase tap areafragosti2018-11-101-1/+1
| | | | | | | * feat: open metamask sliding panel if locked on clickfragosti2018-11-102-23/+50
| | | | | | | * feat: create connect metamaskfragosti2018-11-101-2/+20
| | | | | | | * feat: connect payment method to state and display different content based on ...fragosti2018-11-102-32/+78
| | | | | | | * feat: add account payment method containerfragosti2018-11-103-31/+57
| | | | | | | * feat: make zero ex instant container switch between progress and paymentfragosti2018-11-101-0/+21
| | | | | | | * feat: refactor progress bar code to expose static progress barfragosti2018-11-105-26/+73
| | | | | | | * feat: implement CurrentStandardSlidingPanel and put it in the main containerfragosti2018-11-1010-8/+109
| | | | | | | * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-1098-297/+678
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Publishethereum-types@1.1.2contracts@2.1.51@0x/website@0.0.56@0x/web3-wrapper@3.1.1@0x/utils@2.0.4@0x/typescript-typings@3.0.4@0x/types@1.2.1@0x/tslint-config@1.0.10@0x/testnet-faucets@1.0.53@0x/subproviders@2.1.1@0x/sra-spec@1.0.8@0x/sol-resolver@1.0.16@0x/sol-doc@1.0.4@0x/sol-cov@2.1.9@0x/sol-compiler@1.1.9@0x/react-shared@1.0.18@0x/react-docs@1.0.15@0x/order-watcher@2.2.1@0x/order-utils@2.0.1@0x/monorepo-scripts@1.0.13@0x/migrations@2.0.1@0x/metacoin@0.0.25@0x/json-schemas@2.0.1@0x/instant@0.0.4@0x/fill-scenarios@1.0.9@0x/dev-utils@1.0.14@0x/dev-tools-pages@0.0.3@0x/contract-wrappers@3.0.1@0x/contract-artifacts@1.1.0@0x/contract-addresses@1.1.0@0x/connect@3.0.3@0x/base-contract@3.0.3@0x/asset-buyer@2.2.0@0x/assert@1.0.15@0x/abi-gen@1.0.15@0x/abi-gen-wrappers@1.0.20x.js@2.0.1Jacob Evans2018-11-0937-283/+283
* | | | | | | | Updated CHANGELOGSJacob Evans2018-11-0961-14/+395
| | | | | | | * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0913-48/+164
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #1232 from 0xProject/feature/instant/account-state-changeBrandon Millman2018-11-0911-42/+148
|\ \ \ \ \ \ \ \
| * | | | | | | | fix(instant): fix bug where we potentially fetch balance for the wrong accountBrandon Millman2018-11-094-9/+18
| * | | | | | | | Merge branch 'development' into feature/instant/account-state-changeBrandon Millman2018-11-0935-291/+504
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | |
| * | | | | | | chore(instant): fix lint errorsBrandon Millman2018-11-081-1/+1
| * | | | | | | feat(instant): fetch balance at startupBrandon Millman2018-11-087-20/+53
| * | | | | | | feat(instant): fetch account address at startup and drive account state changesBrandon Millman2018-11-089-25/+88
* | | | | | | | Merge pull request #1236 from 0xProject/fix/subproviders/lock-ledger-4.24.0Jacob Evans2018-11-092-6/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | fix: Lock Ledger hw-transport to 4.24.0Jacob Evans2018-11-092-6/+16
| | |/ / / / / / | |/| | | | | |
| | | | | | | * feat: allow panel children to fill entire content / remove title from panel c...fragosti2018-11-093-16/+10