aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix(instant): catch errors coming from calls to the orderValidator contractBrandon Millman2018-11-141-12/+17
* 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
| | | | | | | * feat: add metamask logofragosti2018-11-091-0/+78
| | | | | | | * feat: add lock iconfragosti2018-11-091-0/+6
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #1230 from 0xProject/feature/instant/dropdown-uiFrancesco Agosti2018-11-0924-53/+314
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix: wrong prop names usedfragosti2018-11-091-2/+2
| * | | | | | chore: PR feedbackfragosti2018-11-091-9/+9
| * | | | | | fix: broken features because of mergefragosti2018-11-093-1/+5
| * | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0914-102/+226
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | [instant] Viewport specific errors (#1228)Steve Klebanoff2018-11-098-49/+118
* | | | | | | Merge pull request #977 from 0xProject/feature/utils/prettybignumRemco Bloemen2018-11-091-0/+23
|\ \ \ \ \ \ \
| * | | | | | | Added more commentsRemco Bloemen2018-11-091-0/+5
| * | | | | | | Merge remote-tracking branch 'origin/development' into feature/utils/prettybi...Remco Bloemen2018-11-0928-247/+367
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Include wholeNumberSchema in sra-spec schemasFabio Berger2018-11-091-0/+2
* | | | | | | | Merge pull request #1231 from 0xProject/fix/instant/default-amount-quoteBrandon Millman2018-11-094-53/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | chore(instant): fix linterBrandon Millman2018-11-091-0/+1
| * | | | | | | | fix(instant): update buy quote at start up in the case of default amountBrandon Millman2018-11-084-53/+82
| | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge remote-tracking branch 'origin/development' into feature/utils/prettybi...Remco Bloemen2018-11-091460-164360/+65361
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix isNodeRemco Bloemen2018-11-091-1/+1
| | * | | | | | Add upstream issueRemco Bloemen2018-08-221-0/+1
| | * | | | | | Use const require instead of importRemco Bloemen2018-08-221-1/+5
| | * | | | | | Fix tslint issuesRemco Bloemen2018-08-221-2/+3
| | * | | | | | Use detect-nodeRemco Bloemen2018-08-221-1/+2
| | * | | | | | Set curstom inspect printer in BigNumberRemco Bloemen2018-08-221-0/+11
| | | * | | | | fix: remove default props, fix lint problemsfragosti2018-11-093-8/+7
| | | * | | | | chore: convert payment method to stateless componentfragosti2018-11-091-29/+25
| | | * | | | | feat: add boxShadow on dropdown hoverfragosti2018-11-092-0/+3
| | | * | | | | fix: various style issuesfragosti2018-11-093-18/+21
| | | * | | | | fix: remove all:initial rule from all div based ui compoenntsfragosti2018-11-093-3/+0
| | | * | | | | fix: token selector scrolling container heightfragosti2018-11-092-3/+5
| | | * | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0938-495/+688
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1220 from 0xProject/feature/instant/prevent-css-leakageFrancesco Agosti2018-11-0921-189/+276
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0929-337/+503
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1226 from 0xProject/fix/website/build-timeBrandon Millman2018-11-092-5/+6
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | fix(website): turn off production flag when building locallyBrandon Millman2018-11-082-5/+6
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #1221 from 0xProject/feature/instant/fallback-providerBrandon Millman2018-11-0820-316/+425
|\ \ \ \ \ \ \ \
| * | | | | | | | chore(instant): increase max bundle size for bundle watchBrandon Millman2018-11-081-1/+1
| * | | | | | | | feat(instant): add Account to the ProviderStateBrandon Millman2018-11-083-39/+97
| * | | | | | | | feat(instant): fallback to an empty wallet provider when none is injectedBrandon Millman2018-11-0815-282/+333
| * | | | | | | | chore(instant): update OrderState enum to follow capitalization conventionsBrandon Millman2018-11-078-43/+43
| | | * | | | | | fix: apply css reset to overlay as wellfragosti2018-11-085-35/+41
| | | * | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0822-34/+333
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | chore: linterfragosti2018-11-076-10/+6
| | | * | | | | | fix: progress barfragosti2018-11-072-7/+9
| | | * | | | | | fix: use fontSize prop in buttonfragosti2018-11-071-2/+1
| | | * | | | | | feat: make instant resistant to external stylesfragosti2018-11-0716-171/+233
| | | * | | | | | feat: add faux externall css filefragosti2018-11-072-0/+22
| | |/ / / / / / | |/| | | | | |
| | | | * | | | chore: cleanupfragosti2018-11-081-2/+3
| | | | * | | | fix: restore button to previous statefragosti2018-11-081-38/+24
| | | | * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-087-16/+72
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge pull request #1219 from 0xProject/feature/instant/mobile-full-bleedSteve Klebanoff2018-11-087-16/+72
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Small code review tweaksSteve Klebanoff2018-11-082-2/+2
| * | | | | | | Take out unneeded conditionalsSteve Klebanoff2018-11-071-2/+2
| * | | | | | | remove unused dependecnySteve Klebanoff2018-11-071-1/+0
| * | | | | | | remove unused importSteve Klebanoff2018-11-071-2/+0
| * | | | | | | remove old commentSteve Klebanoff2018-11-071-1/+0
| * | | | | | | Merge branch 'development' into feature/instant/mobile-full-bleedSteve Klebanoff2018-11-0726-48/+166
| |\| | | | | |
| * | | | | | | Hide X when smallSteve Klebanoff2018-11-072-3/+3
| * | | | | | | Fix mobile view of selecting assetsSteve Klebanoff2018-11-071-1/+1
| * | | | | | | Get rid of unused propertiesSteve Klebanoff2018-11-072-4/+0
| * | | | | | | new MediaChoice approach for setting conditional css propertiesSteve Klebanoff2018-11-076-61/+19
| * | | | | | | better function definitonSteve Klebanoff2018-11-073-17/+11
| * | | | | | | proof of concept workingSteve Klebanoff2018-11-073-9/+22
| * | | | | | | wip: mediachoice experimentSteve Klebanoff2018-11-073-0/+37
| * | | | | | | feat(instant): when on mobile, show mobile specific styling that takes up who...Steve Klebanoff2018-11-075-4/+58
| * | | | | | | Putting back in old heights as not necessary for full bleedSteve Klebanoff2018-11-072-2/+2
| * | | | | | | wip: height 100%Steve Klebanoff2018-11-062-2/+4
| * | | | | | | wip: full display of mobile hard codedSteve Klebanoff2018-11-066-6/+13
| * | | | | | | fix(instant): fix provided ordersSteve Klebanoff2018-11-061-1/+1
| | |_|_|_|/ / | |/| | | | |
| | | | * | | feat: implement copy-to-clipboardfragosti2018-11-084-0/+30
| | | | * | | feat: add MetaMask sign, refactor Circlefragosti2018-11-084-18/+37
| | | | * | | feat: create PaymentMethodDropdownfragosti2018-11-089-43/+86
| | | | * | | chore: remove unused propsfragosti2018-11-081-2/+2
| | | | * | | fix: height of token selector overflow divfragosti2018-11-082-7/+7
| | | | * | | feat: refactor out overlay component and use it to implement click-outsidefragosti2018-11-085-68/+89
| | | | * | | feat: implement basic dropdown componentfragosti2018-11-086-8/+169
| |_|_|/ / / |/| | | | |
* | | | | | [order_utils.py] is_signature_valid, via Exchange contract (#1216)F. Eugene Aumson2018-11-0820-33/+328
* | | | | | Merge pull request #1217 from 0xProject/fix/asset-buyer/lower-default-expiry-...Brandon Millman2018-11-072-1/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fix(asset-buyer): lower default expiryBuffer from 5 minutes to 2 minutesBrandon Millman2018-11-072-1/+5
|/ / / / /
* | | | | Merge pull request #1210 from 0xProject/feature/instant/beta-bucketFrancesco Agosti2018-11-075-13/+72
|\ \ \ \ \
| * | | | | chore: move to underscoresfragosti2018-11-062-4/+4
| * | | | | chore: prettier and linterfragosti2018-11-032-12/+11
| * | | | | fix: typo in READMEfragosti2018-11-031-1/+1
| * | | | | feat: break up deploy into deploy-dogfood and deploy-stagingfragosti2018-11-035-13/+72
| |/ / / /
* | | | | Merge pull request #1213 from 0xProject/feature/instant/more-testnet-liquidityFrancesco Agosti2018-11-073-10/+46
|\ \ \ \ \
| * | | | | fix: remove unused importfragosti2018-11-061-1/+0
| * | | | | chore: clarify a commentfragosti2018-11-061-2/+2
| * | | | | feat: add GNT and MKR testnet orders, fix typofragosti2018-11-063-10/+46
| |/ / / /
* | | | | Merge pull request #1211 from 0xProject/chore/import-ui-directlySteve Klebanoff2018-11-0717-25/+50
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | add extra spaceSteve Klebanoff2018-11-061-0/+1
| * | | | remove unused importSteve Klebanoff2018-11-061-1/+0
| * | | | chore(instant): import UI components directlySteve Klebanoff2018-11-0617-25/+49
| |/ / /
* / / / chore(instant): fix lint errorBrandon Millman2018-11-061-1/+0
|/ / /
* | | Merge pull request #1204 from 0xProject/feature/instant/maker-asset-datas-int...Francesco Agosti2018-11-0327-98/+454
|\ \ \
| * \ \ Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0316-104/+132
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1206 from 0xProject/fix/instant/decimal-fields-scaling-am...Steve Klebanoff2018-11-039-70/+85
|\ \ \ \
| * | | | lintingSteve Klebanoff2018-11-031-1/+0
| * | | | Merge branch 'development' into fix/instant/decimal-fields-scaling-amount-inp...Steve Klebanoff2018-11-038-34/+46
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1209 from 0xProject/feature/instant/optional-providerBrandon Millman2018-11-038-34/+46
|\ \ \ \ \
| * | | | | feat(instant): pass in provider through props, fallback to injected providerBrandon Millman2018-11-038-34/+46
| | * | | | Use generic MaybeSteve Klebanoff2018-11-033-8/+9
| | * | | | lintingSteve Klebanoff2018-11-032-2/+2
| | * | | | Merge branch 'development' into fix/instant/decimal-fields-scaling-amount-inp...Steve Klebanoff2018-11-0323-59/+515
| | |\ \ \ \ | |_|/ / / / |/| | | | |
| | * | | | onChange -> onAmountChangeSteve Klebanoff2018-11-032-5/+5
| | * | | | Move MaybeBigNumber functions into helperSteve Klebanoff2018-11-032-17/+29
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 22:33:22 +0800