aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* feat: update README to reflect lack of commonjs modulefragosti2018-11-271-29/+1
* feat: make package privatefragosti2018-11-271-7/+4
* feat: Add Xianny to about pagefragosti2018-11-272-0/+8
* Merge pull request #1324 from 0xProject/addCommandLineInterfaceToMigrationsFabio B2018-11-274-0/+47
|\
| * Rename node-endpoint to rpc-url for clarityFabio Berger2018-11-261-4/+4
| * Merge branch 'development' into addCommandLineInterfaceToMigrationsFabio Berger2018-11-261-1/+2
| |\ | |/ |/|
* | fix(order_utils.py): work aroud pylint bug (#1322)F. Eugene Aumson2018-11-261-1/+2
| * merge developmentFabio Berger2018-11-2633-209/+473
| |\ | |/ |/|
* | Merge pull request #1323 from 0xProject/feature/contributing-autolabelerLeonid Logvinov2018-11-261-1/+0
|\ \
| * | Remove the instruction to prefix PRs with package name from a/PULL_REQUEST_TE...Leonid Logvinov2018-11-261-1/+0
|/ /
* | Merge pull request #1320 from 0xProject/feature/autolabelerLeonid Logvinov2018-11-261-0/+39
|\ \
| * | Add autolabeler configLeonid Logvinov2018-11-261-0/+39
|/ /
* | Merge pull request #1305 from 0xProject/feature/contract-templatesLeonid Logvinov2018-11-2616-7/+39
|\ \
| * | Rename contract-templates to abi-gen-templatesLeonid Logvinov2018-11-2314-7/+7
| * | Make contract-templates an npm packageLeonid Logvinov2018-11-2216-7/+39
* | | Merge pull request #1319 from 0xProject/revert-1312-feature/build-fix-instantLeonid Logvinov2018-11-263-11/+2
|\ \ \
| * | | Revert "[@0x/instant] Fix CI build broken by instant installation tests"Leonid Logvinov2018-11-263-11/+2
|/ / /
* | | Merge pull request #1312 from 0xProject/feature/build-fix-instantLeonid Logvinov2018-11-263-2/+11
|\ \ \
| * | | Fix the lerna paremeter name from cdVersions to cd-versionsLeonid Logvinov2018-11-232-1/+10
| * | | Copy assets in referenced in instant on commonjs buildLeonid Logvinov2018-11-231-1/+1
| |/ /
* | | Merge pull request #1309 from 0xProject/bug/contract-artifacts/testnet-exchangeJacob Evans2018-11-266-7/+58
|\ \ \
| * | | chore: Update CHANGELOGS use mainnet ZRX amount in Forwarder.Jacob Evans2018-11-262-1/+16
| * | | chore: Fund forwarder in migrationsJacob Evans2018-11-261-0/+5
| * | | bug: Use Testnet Exchange over mainnetJacob Evans2018-11-235-7/+38
| |/ /
* | | Merge pull request #1308 from 0xProject/bug/web3-wrapper/unmarshall-parity-re...Jacob Evans2018-11-262-2/+14
|\ \ \ | |/ / |/| |
| * | bug: Only unmarshall receipt if blockNumber present.Jacob Evans2018-11-232-2/+14
|/ /
* | Merge pull request #1281 from 0xProject/feature/instant/push-to-historyFrancesco Agosti2018-11-222-159/+281
|\ \
| * | fix: multiple render and closes edge case for onpopstate renderfragosti2018-11-221-25/+27
| * | chore: clean up index.umd.ts a bitfragosti2018-11-222-33/+39
| * | feat: add more to instant dev envfragosti2018-11-222-140/+202
| * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-2156-160/+703
| |\ \
| * \ \ Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-2046-50/+384
| |\ \ \
| * | | | feat: add isInstantRendered check to safeguard against double renders and dou...fragosti2018-11-172-5/+17
| * | | | chore: use lodash where relevantfragosti2018-11-171-1/+1
| * | | | fix: bug where we did not call onClose configfragosti2018-11-171-6/+8
| * | | | feat: add URL override paramfragosti2018-11-171-1/+1
| * | | | feat: add assert for shouldDisablePushToHistoryfragosti2018-11-171-7/+10
| * | | | feat: be more specific with callback namefragosti2018-11-171-7/+7
| * | | | feat: allow integrator to disable pushstate logicfragosti2018-11-172-25/+31
| * | | | feat: rename props to configfragosti2018-11-171-23/+27
| * | | | feat: close and open instant based on history changesfragosti2018-11-171-13/+38
* | | | | Merge pull request #1300 from 0xProject/feature/instant/events-accountBrandon Millman2018-11-225-33/+47
|\ \ \ \ \
| * | | | | chore(instant): revert usage of event propertiesBrandon Millman2018-11-222-12/+5
| * | | | | chore(instant): refactor usage of event properties in heapBrandon Millman2018-11-223-22/+26
| * | | | | chore(instant): refactor account tracking logic in middleware to be more read...Brandon Millman2018-11-221-8/+8
| * | | | | feat(instant): implement account related eventsBrandon Millman2018-11-214-20/+37
| | | | | * Add CHANGELOG entry to migrationsFabio Berger2018-11-261-0/+9
| | | | | * Fix typoFabio Berger2018-11-261-1/+1
| | | | | * Add command-line interface to @0x/migrationsFabio Berger2018-11-263-0/+43
| |_|_|_|/ |/| | | |
* | | | | Publishcontracts@2.1.55@0x/website@0.0.60@0x/web3-wrapper@3.1.5@0x/utils@2.0.6@0x/types@1.3.0@0x/testnet-faucets@1.0.57@0x/subproviders@2.1.5@0x/sra-spec@1.0.11@0x/sol-resolver@1.0.17@0x/sol-doc@1.0.8@0x/sol-cov@2.1.13@0x/sol-compiler@1.1.13@0x/react-shared@1.0.22@0x/react-docs@1.0.19@0x/order-watcher@2.2.5@0x/order-utils@3.0.3@0x/monorepo-scripts@1.0.14@0x/migrations@2.1.0@0x/metacoin@0.0.29@0x/json-schemas@2.1.2@0x/instant@1.0.1@0x/fill-scenarios@1.0.13@0x/dev-utils@1.0.18@0x/dev-tools-pages@0.0.7@0x/contract-wrappers@4.1.0@0x/contract-addresses@1.2.0@0x/connect@3.0.7@0x/base-contract@3.0.7@0x/asset-buyer@3.0.1@0x/assert@1.0.18@0x/abi-gen@1.0.17@0x/abi-gen-wrappers@1.1.00x.js@2.0.5Fabio Berger2018-11-2233-197/+197
* | | | | Updated CHANGELOGSFabio Berger2018-11-2254-8/+310
* | | | | print out error message and stackFabio Berger2018-11-221-1/+1
* | | | | immediately return the patch incremented version if no changelog entries existFabio Berger2018-11-221-0/+1
* | | | | Merge pull request #1301 from 0xProject/feature/migrationsDocRefFabio B2018-11-2213-8/+160
|\ \ \ \ \
| * | | | | Fix prettierFabio Berger2018-11-211-1/+9
| * | | | | remove unused flagFabio Berger2018-11-211-1/+1
| * | | | | Add CHANGELOG entryFabio Berger2018-11-211-0/+10
| * | | | | Fix additional commentsFabio Berger2018-11-211-2/+2
| * | | | | Improve commentsFabio Berger2018-11-211-4/+3
| * | | | | Add migrations, contract-addresses and contract-artifacts to Developers homeFabio Berger2018-11-211-0/+25
| * | | | | Create migrations doc reference pageFabio Berger2018-11-2110-2/+112
* | | | | | Put python package above TS/JS packagesFabio Berger2018-11-221-6/+6
| |_|_|_|/ |/| | | |
* | | | | Reduce title sizeFabio Berger2018-11-211-1/+1
* | | | | reduce text side in READMEFabio Berger2018-11-211-7/+7
* | | | | Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2018-11-2128-71/+126
|\ \ \ \ \
| * \ \ \ \ Merge pull request #1283 from 0xProject/feature/instant/make-instant-public-a...Francesco Agosti2018-11-215-15/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix: do not use document on importfragosti2018-11-201-2/+1
| | * | | | fix: npmignore file ignoring index.d.tsfragosti2018-11-201-1/+1
| | * | | | fix: specify new location of index.js in package.jsonfragosti2018-11-171-2/+2
| | * | | | feat: fix instant build and add to project referencesfragosti2018-11-172-8/+4
| | * | | | chore: make instant publicfragosti2018-11-171-2/+1
| * | | | | Merge pull request #1298 from 0xProject/fix/artifact-type-errorFabio B2018-11-2119-16/+73
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add additional CHANGELOG to types packageFabio Berger2018-11-211-0/+10
| | * | | | Add CHANGELOG entryFabio Berger2018-11-211-0/+10
| | * | | | Fix prettierFabio Berger2018-11-211-1/+1
| | * | | | Fix `SimpleContractArtifact` typeFabio Berger2018-11-211-2/+16
| | * | | | Update abi-gen-wrappersFabio Berger2018-11-2113-13/+26
| | * | | | Add @0x/types to dependencies of `@0x/abi-gen-wrappers`Fabio Berger2018-11-211-0/+1
| | * | | | Allow a `SimpleContractArtifact` to be passed into `deployFrom0xArtifactAsync`Fabio Berger2018-11-213-3/+12
| * | | | | Merge pull request #1290 from 0xProject/fix/instant/disable-token-pickerSteve Klebanoff2018-11-212-10/+20
| |\ \ \ \ \
| | * | | | | isDisabled -> isInputDisabledSteve Klebanoff2018-11-212-9/+10
| | * | | | | Allow user to select other token on successSteve Klebanoff2018-11-212-3/+11
| | * | | | | fix(instant): Don't allow changing of assets when order processingSteve Klebanoff2018-11-201-2/+3
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #1296 from 0xProject/fix/instant/svg-warningSteve Klebanoff2018-11-211-26/+16
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | fix(instant): Use new valid svg image for instantSteve Klebanoff2018-11-211-26/+16
| * | | | | Update issue templateFabio Berger2018-11-211-4/+8
| |/ / / /
* / / / / Improve top-level READMEFabio Berger2018-11-211-59/+60
|/ / / /
* | | | Merge pull request #1272 from 0xProject/feature/instant/heapSteve Klebanoff2018-11-2111-44/+347
|\ \ \ \
| * | | | Check for instant heap production credentials in pre-publish stepSteve Klebanoff2018-11-202-4/+12
| * | | | Merge branch 'development' into feature/instant/heapSteve Klebanoff2018-11-2038-12/+251
| |\| | |
| * | | | Linting: rename variableSteve Klebanoff2018-11-201-2/+2
| * | | | Get heap analytics id from ENV variableSteve Klebanoff2018-11-203-57/+73
| * | | | Change disabled analytics name, add assertion, and always setSteve Klebanoff2018-11-203-8/+9
| * | | | No need to explicit send in NODE_ENVSteve Klebanoff2018-11-201-1/+0
| * | | | Merge branch 'development' into feature/instant/heapSteve Klebanoff2018-11-2017-51/+155
| |\ \ \ \
| * | | | | Add way to disable via propsSteve Klebanoff2018-11-172-4/+25
| * | | | | Better way of reporting Fallback providerSteve Klebanoff2018-11-173-7/+1
| * | | | | Specify fallback web3 provider in analyticsSteve Klebanoff2018-11-174-0/+8
| * | | | | Remove old functionSteve Klebanoff2018-11-171-2/+0
| * | | | | Widget -> InstantSteve Klebanoff2018-11-172-1/+3
| * | | | | Trigger Wallet Ready when address changedSteve Klebanoff2018-11-171-2/+16
| * | | | | Getting rid of unused function, and using track prefixSteve Klebanoff2018-11-173-6/+4
| * | | | | Move ip import backSteve Klebanoff2018-11-171-1/+1
| * | | | | Merge branch 'development' into feature/instant/heapSteve Klebanoff2018-11-1739-170/+721
| |\ \ \ \ \
| * | | | | | Disable tslint for unused function so we can include this for future tracking...Steve Klebanoff2018-11-171-0/+1
| * | | | | | Report on git sha and npm version of buildSteve Klebanoff2018-11-173-3/+8
| * | | | | | null -> undefinedSteve Klebanoff2018-11-171-2/+2
| * | | | | | Add initials to TODO noteSteve Klebanoff2018-11-171-1/+1
| * | | | | | Take out old TODOSteve Klebanoff2018-11-171-1/+0
| * | | | | | Remove unused importSteve Klebanoff2018-11-171-1/+0
| * | | | | | Switch heap id on environment, and make sure app id is what we expectSteve Klebanoff2018-11-172-3/+16
| * | | | | | Add access to environment variablesSteve Klebanoff2018-11-171-0/+18
| * | | | | | We may not know num available assets available when wallet ready, so not trac...Steve Klebanoff2018-11-172-4/+2
| * | | | | | Make user and event properties more specificSteve Klebanoff2018-11-172-5/+16
| * | | | | | Typesafe analytic actionsSteve Klebanoff2018-11-174-28/+50
| * | | | | | Move variable assignments around to be more clearSteve Klebanoff2018-11-161-3/+5
| * | | | | | LintingSteve Klebanoff2018-11-165-5/+2
| * | | | | | Take out console.logsSteve Klebanoff2018-11-161-3/+0
| * | | | | | Move where we track widget opened, and report on networkId and providerNameSteve Klebanoff2018-11-162-4/+10
| * | | | | | Introduce ANALYTICS_ENABLED constantSteve Klebanoff2018-11-162-0/+7
| * | | | | | Report ETH in unitsSteve Klebanoff2018-11-161-3/+9
| * | | | | | Use pure functions instead of classSteve Klebanoff2018-11-161-27/+24
| * | | | | | feat(instant): Heap middleware and first tracking eventsSteve Klebanoff2018-11-165-10/+88
| * | | | | | First pass on widget version of heapSteve Klebanoff2018-11-162-0/+88
* | | | | | | Merge pull request #1287 from 0xProject/feature/instant/add-powered-bySteve Klebanoff2018-11-214-0/+47
|\ \ \ \ \ \ \
| * | | | | | | Import via TSSteve Klebanoff2018-11-201-1/+1
| * | | | | | | Add ability to import SVGs in TSSteve Klebanoff2018-11-201-0/+6
| * | | | | | | Fix lintingSteve Klebanoff2018-11-201-2/+1
| * | | | | | | Use anchor instead of TextSteve Klebanoff2018-11-201-4/+3
| * | | | | | | feat(instant): Add powered by 0x imageSteve Klebanoff2018-11-203-0/+43
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #1292 from 0xProject/feature/nonce-tx-optsLeonid Logvinov2018-11-208-0/+59
|\ \ \ \ \ \ \
| * | | | | | | Update packages/contract-wrappers/src/types.tsFabio B2018-11-201-1/+1
| * | | | | | | Update packages/contract-wrappers/CHANGELOG.jsonFabio B2018-11-201-1/+1
| * | | | | | | Add nonce to TxOptsLeonid Logvinov2018-11-208-0/+59
|/ / / / / / /
* | | | | | | Merge pull request #1291 from 0xProject/feature/web3-unmarshallingLeonid Logvinov2018-11-207-12/+90
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Properly unmarshall TransactionReceiptRPC to TransactionReceiptLeonid Logvinov2018-11-207-12/+90
|/ / / / / /
* | | | | | 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