Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Set .env in builds, and update profile to use 0xproject | Steve Klebanoff | 2018-11-30 | 4 | -11/+8 |
| | |||||
* | fix: add clarification to NOTE in README | fragosti | 2018-11-29 | 1 | -1/+1 |
| | |||||
* | feat: add URL to other parts of README | fragosti | 2018-11-29 | 1 | -2/+2 |
| | |||||
* | feat: write version info directly to exported object | fragosti | 2018-11-29 | 3 | -14/+7 |
| | |||||
* | feat: add deploy_live command | fragosti | 2018-11-29 | 3 | -3/+25 |
| | |||||
* | feat: write version info to window | fragosti | 2018-11-29 | 2 | -0/+11 |
| | |||||
* | feat: update README to reflect lack of commonjs module | fragosti | 2018-11-27 | 1 | -29/+1 |
| | |||||
* | feat: make package private | fragosti | 2018-11-27 | 1 | -7/+4 |
| | |||||
* | feat: Add Xianny to about page | fragosti | 2018-11-27 | 2 | -0/+8 |
| | |||||
* | Merge pull request #1324 from 0xProject/addCommandLineInterfaceToMigrations | Fabio B | 2018-11-27 | 4 | -0/+47 |
|\ | | | | | Add CLI interface to @0x/migrations | ||||
| * | Rename node-endpoint to rpc-url for clarity | Fabio Berger | 2018-11-26 | 1 | -4/+4 |
| | | |||||
| * | Merge branch 'development' into addCommandLineInterfaceToMigrations | Fabio Berger | 2018-11-26 | 1 | -1/+2 |
| |\ | |/ |/| | | | | | * development: fix(order_utils.py): work aroud pylint bug (#1322) | ||||
* | | fix(order_utils.py): work aroud pylint bug (#1322) | F. Eugene Aumson | 2018-11-26 | 1 | -1/+2 |
| | | |||||
| * | merge development | Fabio Berger | 2018-11-26 | 33 | -209/+473 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1323 from 0xProject/feature/contributing-autolabeler | Leonid Logvinov | 2018-11-26 | 1 | -1/+0 |
|\ \ | | | | | | | Remove the instruction to prefix PRs with package name from PULL_REQUEST_TEMPLATE.md | ||||
| * | | Remove the instruction to prefix PRs with package name from ↵ | Leonid Logvinov | 2018-11-26 | 1 | -1/+0 |
|/ / | | | | | | | a/PULL_REQUEST_TEMPLATE.md | ||||
* | | Merge pull request #1320 from 0xProject/feature/autolabeler | Leonid Logvinov | 2018-11-26 | 1 | -0/+39 |
|\ \ | | | | | | | Add autolabeler config | ||||
| * | | Add autolabeler config | Leonid Logvinov | 2018-11-26 | 1 | -0/+39 |
|/ / | |||||
* | | Merge pull request #1305 from 0xProject/feature/contract-templates | Leonid Logvinov | 2018-11-26 | 16 | -7/+39 |
|\ \ | | | | | | | [@0x/contract-templates] Make contract-templates an npm package | ||||
| * | | Rename contract-templates to abi-gen-templates | Leonid Logvinov | 2018-11-23 | 14 | -7/+7 |
| | | | |||||
| * | | Make contract-templates an npm package | Leonid Logvinov | 2018-11-22 | 16 | -7/+39 |
| | | | |||||
* | | | Merge pull request #1319 from 0xProject/revert-1312-feature/build-fix-instant | Leonid Logvinov | 2018-11-26 | 3 | -11/+2 |
|\ \ \ | | | | | | | | | Revert "[@0x/instant] Fix CI build broken by instant installation tests" | ||||
| * | | | Revert "[@0x/instant] Fix CI build broken by instant installation tests" | Leonid Logvinov | 2018-11-26 | 3 | -11/+2 |
|/ / / | |||||
* | | | Merge pull request #1312 from 0xProject/feature/build-fix-instant | Leonid Logvinov | 2018-11-26 | 3 | -2/+11 |
|\ \ \ | | | | | | | | | [@0x/instant] Fix CI build broken by instant installation tests | ||||
| * | | | Fix the lerna paremeter name from cdVersions to cd-versions | Leonid Logvinov | 2018-11-23 | 2 | -1/+10 |
| | | | | |||||
| * | | | Copy assets in referenced in instant on commonjs build | Leonid Logvinov | 2018-11-23 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #1309 from 0xProject/bug/contract-artifacts/testnet-exchange | Jacob Evans | 2018-11-26 | 6 | -7/+58 |
|\ \ \ | | | | | | | | | [contract-artifacts] Use Testnet Exchange artifact | ||||
| * | | | chore: Update CHANGELOGS use mainnet ZRX amount in Forwarder. | Jacob Evans | 2018-11-26 | 2 | -1/+16 |
| | | | | |||||
| * | | | chore: Fund forwarder in migrations | Jacob Evans | 2018-11-26 | 1 | -0/+5 |
| | | | | |||||
| * | | | bug: Use Testnet Exchange over mainnet | Jacob Evans | 2018-11-23 | 5 | -7/+38 |
| |/ / | |||||
* | | | Merge pull request #1308 from ↵ | Jacob Evans | 2018-11-26 | 2 | -2/+14 |
|\ \ \ | |/ / |/| | | | | | | | | 0xProject/bug/web3-wrapper/unmarshall-parity-receipt [web3-wrapper] Only unmarshall receipt if blockNumber present | ||||
| * | | bug: Only unmarshall receipt if blockNumber present. | Jacob Evans | 2018-11-23 | 2 | -2/+14 |
|/ / | | | | | | | | | https://github.com/paritytech/parity-ethereum/issues/1180 Parity can return a pending transaction receipt with a number of null values | ||||
* | | Merge pull request #1281 from 0xProject/feature/instant/push-to-history | Francesco Agosti | 2018-11-22 | 2 | -159/+281 |
|\ \ | | | | | | | [instant] Close/open Instant on correct history changes. Provide option to disable. | ||||
| * | | fix: multiple render and closes edge case for onpopstate render | fragosti | 2018-11-22 | 1 | -25/+27 |
| | | | |||||
| * | | chore: clean up index.umd.ts a bit | fragosti | 2018-11-22 | 2 | -33/+39 |
| | | | |||||
| * | | feat: add more to instant dev env | fragosti | 2018-11-22 | 2 | -140/+202 |
| | | | |||||
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-11-21 | 56 | -160/+703 |
| |\ \ | | | | | | | | | | | | | feature/instant/push-to-history | ||||
| * \ \ | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-11-20 | 46 | -50/+384 |
| |\ \ \ | | | | | | | | | | | | | | | | feature/instant/push-to-history | ||||
| * | | | | feat: add isInstantRendered check to safeguard against double renders and ↵ | fragosti | 2018-11-17 | 2 | -5/+17 |
| | | | | | | | | | | | | | | | | | | | | double removes | ||||
| * | | | | chore: use lodash where relevant | fragosti | 2018-11-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix: bug where we did not call onClose config | fragosti | 2018-11-17 | 1 | -6/+8 |
| | | | | | |||||
| * | | | | feat: add URL override param | fragosti | 2018-11-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | feat: add assert for shouldDisablePushToHistory | fragosti | 2018-11-17 | 1 | -7/+10 |
| | | | | | |||||
| * | | | | feat: be more specific with callback name | fragosti | 2018-11-17 | 1 | -7/+7 |
| | | | | | |||||
| * | | | | feat: allow integrator to disable pushstate logic | fragosti | 2018-11-17 | 2 | -25/+31 |
| | | | | | |||||
| * | | | | feat: rename props to config | fragosti | 2018-11-17 | 1 | -23/+27 |
| | | | | | |||||
| * | | | | feat: close and open instant based on history changes | fragosti | 2018-11-17 | 1 | -13/+38 |
| | | | | | |||||
* | | | | | Merge pull request #1300 from 0xProject/feature/instant/events-account | Brandon Millman | 2018-11-22 | 5 | -33/+47 |
|\ \ \ \ \ | | | | | | | | | | | | | [instant] Implement account related events | ||||
| * | | | | | chore(instant): revert usage of event properties | Brandon Millman | 2018-11-22 | 2 | -12/+5 |
| | | | | | | |||||
| * | | | | | chore(instant): refactor usage of event properties in heap | Brandon Millman | 2018-11-22 | 3 | -22/+26 |
| | | | | | | |||||
| * | | | | | chore(instant): refactor account tracking logic in middleware to be more ↵ | Brandon Millman | 2018-11-22 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | readable | ||||
| * | | | | | feat(instant): implement account related events | Brandon Millman | 2018-11-21 | 4 | -20/+37 |
| | | | | | | |||||
| | | | | * | Add CHANGELOG entry to migrations | Fabio Berger | 2018-11-26 | 1 | -0/+9 |
| | | | | | | |||||
| | | | | * | Fix typo | Fabio Berger | 2018-11-26 | 1 | -1/+1 |
| | | | | | | |||||
| | | | | * | Add command-line interface to @0x/migrations | Fabio Berger | 2018-11-26 | 3 | -0/+43 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Publish | Fabio Berger | 2018-11-22 | 33 | -197/+197 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@2.0.5 - @0x/abi-gen@1.0.17 - @0x/abi-gen-wrappers@1.1.0 - @0x/assert@1.0.18 - @0x/asset-buyer@3.0.1 - @0x/base-contract@3.0.7 - @0x/connect@3.0.7 - @0x/contract-addresses@1.2.0 - @0x/contract-wrappers@4.1.0 - contracts@2.1.55 - @0x/dev-tools-pages@0.0.7 - @0x/dev-utils@1.0.18 - @0x/fill-scenarios@1.0.13 - @0x/instant@1.0.1 - @0x/json-schemas@2.1.2 - @0x/metacoin@0.0.29 - @0x/migrations@2.1.0 - @0x/monorepo-scripts@1.0.14 - @0x/order-utils@3.0.3 - @0x/order-watcher@2.2.5 - @0x/react-docs@1.0.19 - @0x/react-shared@1.0.22 - @0x/sol-compiler@1.1.13 - @0x/sol-cov@2.1.13 - @0x/sol-doc@1.0.8 - @0x/sol-resolver@1.0.17 - @0x/sra-spec@1.0.11 - @0x/subproviders@2.1.5 - @0x/testnet-faucets@1.0.57 - @0x/types@1.3.0 - @0x/utils@2.0.6 - @0x/web3-wrapper@3.1.5 - @0x/website@0.0.60 | ||||
* | | | | | Updated CHANGELOGS | Fabio Berger | 2018-11-22 | 54 | -8/+310 |
| | | | | | |||||
* | | | | | print out error message and stack | Fabio Berger | 2018-11-22 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | immediately return the patch incremented version if no changelog entries exist | Fabio Berger | 2018-11-22 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1301 from 0xProject/feature/migrationsDocRef | Fabio B | 2018-11-22 | 13 | -8/+160 |
|\ \ \ \ \ | | | | | | | | | | | | | Add Migrations Doc Ref | ||||
| * | | | | | Fix prettier | Fabio Berger | 2018-11-21 | 1 | -1/+9 |
| | | | | | | |||||
| * | | | | | remove unused flag | Fabio Berger | 2018-11-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add CHANGELOG entry | Fabio Berger | 2018-11-21 | 1 | -0/+10 |
| | | | | | | |||||
| * | | | | | Fix additional comments | Fabio Berger | 2018-11-21 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Improve comments | Fabio Berger | 2018-11-21 | 1 | -4/+3 |
| | | | | | | |||||
| * | | | | | Add migrations, contract-addresses and contract-artifacts to Developers home | Fabio Berger | 2018-11-21 | 1 | -0/+25 |
| | | | | | | |||||
| * | | | | | Create migrations doc reference page | Fabio Berger | 2018-11-21 | 10 | -2/+112 |
| | | | | | | |||||
* | | | | | | Put python package above TS/JS packages | Fabio Berger | 2018-11-22 | 1 | -6/+6 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Reduce title size | Fabio Berger | 2018-11-21 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | reduce text side in README | Fabio Berger | 2018-11-21 | 1 | -7/+7 |
| | | | | | |||||
* | | | | | Merge branch 'development' of github.com:0xProject/0x-monorepo into development | Fabio Berger | 2018-11-21 | 28 | -71/+126 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x-monorepo: Add additional CHANGELOG to types package Add CHANGELOG entry Fix prettier Fix `SimpleContractArtifact` type Update abi-gen-wrappers Add @0x/types to dependencies of `@0x/abi-gen-wrappers` Allow a `SimpleContractArtifact` to be passed into `deployFrom0xArtifactAsync` Update issue template fix(instant): Use new valid svg image for instant isDisabled -> isInputDisabled Allow user to select other token on success fix: do not use document on import fix(instant): Don't allow changing of assets when order processing fix: npmignore file ignoring index.d.ts fix: specify new location of index.js in package.json feat: fix instant build and add to project references chore: make instant public | ||||
| * \ \ \ \ | Merge pull request #1283 from ↵ | Francesco Agosti | 2018-11-21 | 5 | -15/+9 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | 0xProject/feature/instant/make-instant-public-and-fix-publishing [instant] Make package public and fix publishing | ||||
| | * | | | | fix: do not use document on import | fragosti | 2018-11-20 | 1 | -2/+1 |
| | | | | | | |||||
| | * | | | | fix: npmignore file ignoring index.d.ts | fragosti | 2018-11-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | fix: specify new location of index.js in package.json | fragosti | 2018-11-17 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | feat: fix instant build and add to project references | fragosti | 2018-11-17 | 2 | -8/+4 |
| | | | | | | |||||
| | * | | | | chore: make instant public | fragosti | 2018-11-17 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #1298 from 0xProject/fix/artifact-type-error | Fabio B | 2018-11-21 | 19 | -16/+73 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Fix Artifact Interface Type Issue | ||||
| | * | | | | Add additional CHANGELOG to types package | Fabio Berger | 2018-11-21 | 1 | -0/+10 |
| | | | | | | |||||
| | * | | | | Add CHANGELOG entry | Fabio Berger | 2018-11-21 | 1 | -0/+10 |
| | | | | | | |||||
| | * | | | | Fix prettier | Fabio Berger | 2018-11-21 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix `SimpleContractArtifact` type | Fabio Berger | 2018-11-21 | 1 | -2/+16 |
| | | | | | | |||||
| | * | | | | Update abi-gen-wrappers | Fabio Berger | 2018-11-21 | 13 | -13/+26 |
| | | | | | | |||||
| | * | | | | Add @0x/types to dependencies of `@0x/abi-gen-wrappers` | Fabio Berger | 2018-11-21 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Allow a `SimpleContractArtifact` to be passed into `deployFrom0xArtifactAsync` | Fabio Berger | 2018-11-21 | 3 | -3/+12 |
| | | | | | | |||||
| * | | | | | Merge pull request #1290 from 0xProject/fix/instant/disable-token-picker | Steve Klebanoff | 2018-11-21 | 2 | -10/+20 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | [instant] Don't allow changing of assets when order in progress | ||||
| | * | | | | | isDisabled -> isInputDisabled | Steve Klebanoff | 2018-11-21 | 2 | -9/+10 |
| | | | | | | | |||||
| | * | | | | | Allow user to select other token on success | Steve Klebanoff | 2018-11-21 | 2 | -3/+11 |
| | | | | | | | |||||
| | * | | | | | fix(instant): Don't allow changing of assets when order processing | Steve Klebanoff | 2018-11-20 | 1 | -2/+3 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #1296 from 0xProject/fix/instant/svg-warning | Steve Klebanoff | 2018-11-21 | 1 | -26/+16 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | [instant] Replace "Powered By 0x" svg | ||||
| | * | | | | fix(instant): Use new valid svg image for instant | Steve Klebanoff | 2018-11-21 | 1 | -26/+16 |
| | | | | | | |||||
| * | | | | | Update issue template | Fabio Berger | 2018-11-21 | 1 | -4/+8 |
| |/ / / / | |||||
* / / / / | Improve top-level README | Fabio Berger | 2018-11-21 | 1 | -59/+60 |
|/ / / / | |||||
* | | | | Merge pull request #1272 from 0xProject/feature/instant/heap | Steve Klebanoff | 2018-11-21 | 11 | -44/+347 |
|\ \ \ \ | | | | | | | | | | | [instant] Base heap integration | ||||
| * | | | | Check for instant heap production credentials in pre-publish step | Steve Klebanoff | 2018-11-20 | 2 | -4/+12 |
| | | | | | |||||
| * | | | | Merge branch 'development' into feature/instant/heap | Steve Klebanoff | 2018-11-20 | 38 | -12/+251 |
| |\| | | | |||||
| * | | | | Linting: rename variable | Steve Klebanoff | 2018-11-20 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Get heap analytics id from ENV variable | Steve Klebanoff | 2018-11-20 | 3 | -57/+73 |
| | | | | | |||||
| * | | | | Change disabled analytics name, add assertion, and always set | Steve Klebanoff | 2018-11-20 | 3 | -8/+9 |
| | | | | | |||||
| * | | | | No need to explicit send in NODE_ENV | Steve Klebanoff | 2018-11-20 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'development' into feature/instant/heap | Steve Klebanoff | 2018-11-20 | 17 | -51/+155 |
| |\ \ \ \ | |||||
| * | | | | | Add way to disable via props | Steve Klebanoff | 2018-11-17 | 2 | -4/+25 |
| | | | | | | |||||
| * | | | | | Better way of reporting Fallback provider | Steve Klebanoff | 2018-11-17 | 3 | -7/+1 |
| | | | | | | |||||
| * | | | | | Specify fallback web3 provider in analytics | Steve Klebanoff | 2018-11-17 | 4 | -0/+8 |
| | | | | | | |||||
| * | | | | | Remove old function | Steve Klebanoff | 2018-11-17 | 1 | -2/+0 |
| | | | | | | |||||
| * | | | | | Widget -> Instant | Steve Klebanoff | 2018-11-17 | 2 | -1/+3 |
| | | | | | | |||||
| * | | | | | Trigger Wallet Ready when address changed | Steve Klebanoff | 2018-11-17 | 1 | -2/+16 |
| | | | | | | |||||
| * | | | | | Getting rid of unused function, and using track prefix | Steve Klebanoff | 2018-11-17 | 3 | -6/+4 |
| | | | | | | |||||
| * | | | | | Move ip import back | Steve Klebanoff | 2018-11-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'development' into feature/instant/heap | Steve Klebanoff | 2018-11-17 | 39 | -170/+721 |
| |\ \ \ \ \ | |||||
| * | | | | | | Disable tslint for unused function so we can include this for future ↵ | Steve Klebanoff | 2018-11-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | tracking events | ||||
| * | | | | | | Report on git sha and npm version of build | Steve Klebanoff | 2018-11-17 | 3 | -3/+8 |
| | | | | | | | |||||
| * | | | | | | null -> undefined | Steve Klebanoff | 2018-11-17 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Add initials to TODO note | Steve Klebanoff | 2018-11-17 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Take out old TODO | Steve Klebanoff | 2018-11-17 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Remove unused import | Steve Klebanoff | 2018-11-17 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Switch heap id on environment, and make sure app id is what we expect | Steve Klebanoff | 2018-11-17 | 2 | -3/+16 |
| | | | | | | | |||||
| * | | | | | | Add access to environment variables | Steve Klebanoff | 2018-11-17 | 1 | -0/+18 |
| | | | | | | | |||||
| * | | | | | | We may not know num available assets available when wallet ready, so not ↵ | Steve Klebanoff | 2018-11-17 | 2 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | trackin there | ||||
| * | | | | | | Make user and event properties more specific | Steve Klebanoff | 2018-11-17 | 2 | -5/+16 |
| | | | | | | | |||||
| * | | | | | | Typesafe analytic actions | Steve Klebanoff | 2018-11-17 | 4 | -28/+50 |
| | | | | | | | |||||
| * | | | | | | Move variable assignments around to be more clear | Steve Klebanoff | 2018-11-16 | 1 | -3/+5 |
| | | | | | | | |||||
| * | | | | | | Linting | Steve Klebanoff | 2018-11-16 | 5 | -5/+2 |
| | | | | | | | |||||
| * | | | | | | Take out console.logs | Steve Klebanoff | 2018-11-16 | 1 | -3/+0 |
| | | | | | | | |||||
| * | | | | | | Move where we track widget opened, and report on networkId and providerName | Steve Klebanoff | 2018-11-16 | 2 | -4/+10 |
| | | | | | | | |||||
| * | | | | | | Introduce ANALYTICS_ENABLED constant | Steve Klebanoff | 2018-11-16 | 2 | -0/+7 |
| | | | | | | | |||||
| * | | | | | | Report ETH in units | Steve Klebanoff | 2018-11-16 | 1 | -3/+9 |
| | | | | | | | |||||
| * | | | | | | Use pure functions instead of class | Steve Klebanoff | 2018-11-16 | 1 | -27/+24 |
| | | | | | | | |||||
| * | | | | | | feat(instant): Heap middleware and first tracking events | Steve Klebanoff | 2018-11-16 | 5 | -10/+88 |
| | | | | | | | |||||
| * | | | | | | First pass on widget version of heap | Steve Klebanoff | 2018-11-16 | 2 | -0/+88 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1287 from 0xProject/feature/instant/add-powered-by | Steve Klebanoff | 2018-11-21 | 4 | -0/+47 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [instant] Add "Powered By 0x" | ||||
| * | | | | | | | Import via TS | Steve Klebanoff | 2018-11-20 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Add ability to import SVGs in TS | Steve Klebanoff | 2018-11-20 | 1 | -0/+6 |
| | | | | | | | | |||||
| * | | | | | | | Fix linting | Steve Klebanoff | 2018-11-20 | 1 | -2/+1 |
| | | | | | | | | |||||
| * | | | | | | | Use anchor instead of Text | Steve Klebanoff | 2018-11-20 | 1 | -4/+3 |
| | | | | | | | | |||||
| * | | | | | | | feat(instant): Add powered by 0x image | Steve Klebanoff | 2018-11-20 | 3 | -0/+43 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #1292 from 0xProject/feature/nonce-tx-opts | Leonid Logvinov | 2018-11-20 | 8 | -0/+59 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add `nonce` to `TxOpts` | ||||
| * | | | | | | | Update packages/contract-wrappers/src/types.ts | Fabio B | 2018-11-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: LogvinovLeon <logvinov.leon@gmail.com> | ||||
| * | | | | | | | Update packages/contract-wrappers/CHANGELOG.json | Fabio B | 2018-11-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: LogvinovLeon <logvinov.leon@gmail.com> | ||||
| * | | | | | | | Add nonce to TxOpts | Leonid Logvinov | 2018-11-20 | 8 | -0/+59 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1291 from 0xProject/feature/web3-unmarshalling | Leonid Logvinov | 2018-11-20 | 7 | -12/+90 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | [@0x/web3-wrapper] Properly unmarshall `TransactionReceiptRPC` to `TransactionReceipt` | ||||
| * | | | | | | Properly unmarshall TransactionReceiptRPC to TransactionReceipt | Leonid Logvinov | 2018-11-20 | 7 | -12/+90 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1276 from 0xProject/test/instant/bundle-size | Brandon Millman | 2018-11-20 | 3 | -2/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [asset-buyer][instant] downgrade lodash to be consistent with the rest of 0x packages | ||||
| * | | | | | | fix(instant): change lodash version to the same as other 0x packages | Brandon Millman | 2018-11-16 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix(asset-buyer): change lodash version to the same as other 0x packages | Brandon Millman | 2018-11-16 | 2 | -1/+10 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1271 from 0xProject/feature/instant/icons | Brandon Millman | 2018-11-20 | 36 | -10/+240 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | [instant] Add icons to token selector | ||||
| * | | | | | | feat(instant): support custom iconUrls | Brandon Millman | 2018-11-20 | 2 | -9/+26 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'development' into feature/instant/icons | Brandon Millman | 2018-11-20 | 38 | -55/+755 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (37 commits) Add 0x-order-utils.py library to developers home Fixes to CONTRIBUTING.md Improve our CONTRIBUTING.md instructions fix(order_utils.py): publish docs to S3, not RTD (#1264) fix: make instant package private feat: refer to map file in postpublish configs feat: add new bundle name to bundle watch fix: tslint ignore rule in wrong place Update blog post feature Fix disclaimer on mobile Add smart contract docs to Developer Home Add Apache license link Fix capitalization in title Remove excess semi-colon Point directly to README for docs link Update icons Update LICENSE Fix disclaimer Add blogpost URL Add disclaimer ... | ||||
* | | | | | | | Add 0x-order-utils.py library to developers home | Fabio Berger | 2018-11-20 | 1 | -0/+9 |
| | | | | | | | |||||
* | | | | | | | Fixes to CONTRIBUTING.md | Fabio Berger | 2018-11-19 | 1 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | Improve our CONTRIBUTING.md instructions | Fabio Berger | 2018-11-19 | 1 | -34/+65 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1278 from 0xProject/feature/contract-addresses/rinkeby | Jacob Evans | 2018-11-19 | 2 | -0/+19 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Deploy contracts to Rinkeby | ||||
| * | | | | | | | feat: Deploy contracts to Rinkeby | Jacob Evans | 2018-11-16 | 2 | -0/+19 |
| | | | | | | | | |||||
* | | | | | | | | fix(order_utils.py): publish docs to S3, not RTD (#1264) | F. Eugene Aumson | 2018-11-17 | 4 | -2/+37 |
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Publishing to readthedocs.io (RTD) wasn't working, for various reasons. Changed to publish docs to S3. | ||||
* | | | | | | | Merge pull request #1282 from 0xProject/fix/instant/release-notes-bug | Francesco Agosti | 2018-11-17 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | [instant] (temporarily) make instant private | ||||
| * | | | | | | fix: make instant package private | fragosti | 2018-11-17 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | feat: refer to map file in postpublish configs | fragosti | 2018-11-17 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1275 from ↵ | Francesco Agosti | 2018-11-17 | 8 | -14/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/instant/productionize-publish-flow [instant] Productionize publish flow | ||||
| * | | | | | | feat: add new bundle name to bundle watch | fragosti | 2018-11-17 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix: tslint ignore rule in wrong place | fragosti | 2018-11-17 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix: remove private config line | fragosti | 2018-11-16 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-11-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | feature/instant/productionize-publish-flow | ||||
| * \ \ \ \ \ \ | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-11-16 | 5 | -28/+37 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/instant/productionize-publish-flow | ||||
| * | | | | | | | | chore: run linter | fragosti | 2018-11-16 | 1 | -6/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | feat: change version to 1.0.0 | fragosti | 2018-11-16 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | chore: update gitignore | fragosti | 2018-11-16 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | fix: deploy commands | fragosti | 2018-11-16 | 3 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | feat: rename bundle to instant.js and move build to umd dir | fragosti | 2018-11-16 | 4 | -7/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | feat: add npmignore | fragosti | 2018-11-16 | 1 | -0/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | feat: change webpack config and make instant public | fragosti | 2018-11-16 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Update blog post feature | Fabio Berger | 2018-11-17 | 1 | -2/+2 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Fix disclaimer on mobile | Fabio Berger | 2018-11-17 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Add smart contract docs to Developer Home | Fabio Berger | 2018-11-17 | 1 | -0/+8 |
| | | | | | | | | |||||
* | | | | | | | | Add Apache license link | Fabio Berger | 2018-11-17 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | Fix capitalization in title | Fabio Berger | 2018-11-17 | 1 | -3/+10 |
| | | | | | | | | |||||
* | | | | | | | | Remove excess semi-colon | Fabio Berger | 2018-11-17 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Point directly to README for docs link | Fabio Berger | 2018-11-17 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1253 from 0xProject/launchKitLanding | Fabio B | 2018-11-16 | 21 | -1/+582 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | 0x Launch kit landing page | ||||
| * | | | | | | | | Update icons | Fabio Berger | 2018-11-16 | 5 | -50/+46 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix disclaimer | Fabio Berger | 2018-11-16 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add blogpost URL | Fabio Berger | 2018-11-16 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add disclaimer | Fabio Berger | 2018-11-16 | 1 | -0/+29 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'development' into launchKitLanding | Fabio Berger | 2018-11-16 | 202 | -775/+2932 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (110 commits) fix: fix exceeds block gas limit error chore(instant): fix lint error fix: remove unused vars Send in affiliate info as option Have heartbeat update not trigger errors fix: remove redundant handler feat: make onUnlockWalletClick different based on ON chore: remove wallet panel content for mobile feat: use blue for wallet prompt on mobile feat: use stable version of bowser fix: add http to external url string feat: make onUnlockWalletClick different based on ON chore: remove wallet panel content for mobile feat: use blue for wallet prompt on mobile feat: use stable version of bowser feat: expose webpack-dev-server content to local network fix(website): remove node env definition from webpack fix(website): currentProvider called on undefined chore: update yarn lock feat: use capital values for enums ... | ||||
| * | | | | | | | | Add launch kit to Developer home list of tools | Fabio Berger | 2018-11-16 | 1 | -0/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | fix linter issue | Fabio Berger | 2018-11-16 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add support for responsive left | Fabio Berger | 2018-11-16 | 1 | -0/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Update call-to-action links | Fabio Berger | 2018-11-16 | 2 | -4/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Move benefits to language files and fix copy | Fabio Berger | 2018-11-14 | 7 | -34/+78 |
| | | | | | | | | | |||||
| * | | | | | | | | update yarn.lock | Fabio Berger | 2018-11-14 | 1 | -38/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Implement 0x launch kit landing page | Fabio Berger | 2018-11-14 | 18 | -1/+493 |
| | | | | | | | | | |||||
* | | | | | | | | | Update LICENSE | Leonid Logvinov | 2018-11-16 | 1 | -2/+2 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #1277 from akfork/hotfix/fix-ganache-gas-limit | Jacob Evans | 2018-11-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | [ganache]: fix exceeds block gas limit error | ||||
| * | | | | | | | fix: fix exceeds block gas limit error | Akagi201 | 2018-11-16 | 1 | -1/+1 |
|/ / / / / / / | |||||
| | | | | * / | feat(instant): add icons to token selector | Brandon Millman | 2018-11-16 | 35 | -10/+223 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | chore(instant): fix lint error | Brandon Millman | 2018-11-16 | 1 | -1/+1 |
| |_|_|/ / |/| | | | | |||||
* | | | | | fix: remove unused vars | fragosti | 2018-11-16 | 1 | -6/+1 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #1273 from 0xProject/fix/instant/heartbeat-errors | Steve Klebanoff | 2018-11-16 | 5 | -28/+37 |
|\ \ \ \ | |_|/ / |/| | | | [instant] Don't show errors from heartbeat buy quote calls | ||||
| * | | | Send in affiliate info as option | Steve Klebanoff | 2018-11-16 | 3 | -12/+7 |
| | | | | |||||
| * | | | Have heartbeat update not trigger errors | Steve Klebanoff | 2018-11-16 | 5 | -25/+39 |
| | | | | |||||
* | | | | Merge pull request #1266 from ↵ | Francesco Agosti | 2018-11-16 | 8 | -100/+73 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | 0xProject/feature/instant/fix-mobile-specific-content [instant] Fix mobile specific content | ||||
| * | | | Merge branch 'feature/instant/fix-mobile-specific-content' of ↵ | fragosti | 2018-11-16 | 0 | -0/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | https://github.com/0xProject/0x-monorepo into feature/instant/fix-mobile-specific-content | ||||
| | * | | | feat: make onUnlockWalletClick different based on ON | fragosti | 2018-11-15 | 3 | -35/+58 |
| | | | | | |||||
| | * | | | chore: remove wallet panel content for mobile | fragosti | 2018-11-15 | 1 | -51/+1 |
| | | | | | |||||
| | * | | | feat: use blue for wallet prompt on mobile | fragosti | 2018-11-15 | 4 | -8/+32 |
| | | | | | |||||
| | * | | | feat: use stable version of bowser | fragosti | 2018-11-15 | 2 | -9/+5 |
| | | | | | |||||
| * | | | | fix: remove redundant handler | fragosti | 2018-11-16 | 2 | -26/+6 |
| | | | | | |||||
| * | | | | feat: make onUnlockWalletClick different based on ON | fragosti | 2018-11-16 | 3 | -35/+58 |
| | | | | | |||||
| * | | | | chore: remove wallet panel content for mobile | fragosti | 2018-11-16 | 1 | -51/+1 |
| | | | | | |||||
| * | | | | feat: use blue for wallet prompt on mobile | fragosti | 2018-11-16 | 4 | -8/+32 |
| | | | | | |||||
| * | | | | feat: use stable version of bowser | fragosti | 2018-11-16 | 2 | -9/+5 |
|/ / / / | |||||
* | | | | Merge pull request #1265 from ↵ | Francesco Agosti | 2018-11-16 | 3 | -3/+19 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/instant/expose-webpack-dev-server [instant ] Expose webpack-dev-server content to local network | ||||
| * | | | | fix: add http to external url string | fragosti | 2018-11-16 | 1 | -1/+1 |
| |/ / / | |||||
| * | / | feat: expose webpack-dev-server content to local network | fragosti | 2018-11-15 | 3 | -3/+19 |
| | |/ | |/| | |||||
* | | | Merge pull request #1263 from 0xProject/fix/website/node-env | Brandon Millman | 2018-11-16 | 3 | -41/+3 |
|\ \ \ | |/ / |/| | | [website] Fix currentProvider called on undefined and NODE_ENV production warning | ||||
| * | | fix(website): remove node env definition from webpack | Brandon Millman | 2018-11-15 | 1 | -1/+0 |
| | | | |||||
| * | | fix(website): currentProvider called on undefined | Brandon Millman | 2018-11-15 | 1 | -1/+1 |
| | | | |||||
| * | | chore: update yarn lock | Brandon Millman | 2018-11-15 | 1 | -39/+2 |
|/ / | |||||
* | | Merge pull request #1257 from ↵ | Francesco Agosti | 2018-11-15 | 16 | -67/+369 |
|\ \ | | | | | | | | | | | | | 0xProject/feature/instant/different-install-wallet-copy-for-mobile [instant] Adapt content to operating system, browser and provider type | ||||
| * | | feat: use capital values for enums | fragosti | 2018-11-15 | 4 | -39/+81 |
| | | | |||||
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-11-15 | 100 | -348/+902 |
| |\ \ | | | | | | | | | | | | | feature/instant/different-install-wallet-copy-for-mobile | ||||
| * | | | fix: do not remove payment dropdown when confirmation pending | fragosti | 2018-11-14 | 1 | -2/+1 |
| | | | | |||||
| * | | | refactor: move wallet panel content os switching logic into two methods | fragosti | 2018-11-14 | 1 | -78/+79 |
| | | | | |||||
| * | | | feat: dont show payment dropdown content on mobile | fragosti | 2018-11-14 | 1 | -0/+4 |
| | | | | |||||
| * | | | feat: center title label with circle | fragosti | 2018-11-14 | 1 | -3/+3 |
| | | | | |||||
| * | | | chore: remove unused import | fragosti | 2018-11-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | feat: add coinbase wallet app logo to wallet prompt | fragosti | 2018-11-14 | 3 | -7/+24 |
| | | | | |||||
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-11-14 | 30 | -150/+364 |
| |\ \ \ | | | | | | | | | | | | | | | | feature/instant/different-install-wallet-copy-for-mobile | ||||
| * | | | | feat: display the correct provider type and change unlock / install prompt ↵ | fragosti | 2018-11-14 | 10 | -94/+110 |
| | | | | | | | | | | | | | | | | | | | | content | ||||
| * | | | | feat: change install wallet panel content based on browser and os | fragosti | 2018-11-14 | 8 | -28/+214 |
| | | | | | |||||
| * | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-11-14 | 23 | -75/+93 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | feature/instant/different-install-wallet-copy-for-mobile | ||||
* | \ \ \ \ | Merge pull request #1258 from 0xProject/fix/instant/contract-call | Brandon Millman | 2018-11-15 | 1 | -12/+17 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | [instant] Catch errors coming from calls to the orderValidator contract | ||||
| * | | | | | fix(instant): catch errors coming from calls to the orderValidator contract | Brandon Millman | 2018-11-14 | 1 | -12/+17 |
| | |_|/ / | |/| | | | |||||
* | | | | | fix(instant): fix tabIndex attribute error | Brandon Millman | 2018-11-15 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | fix(order_utils.py): lazy load contract artifacts (#1262) | F. Eugene Aumson | 2018-11-15 | 1 | -8/+21 |
| | | | | | |||||
* | | | | | Merge pull request #1261 from 0xProject/fix/instant/erc20-picker-list | Brandon Millman | 2018-11-15 | 5 | -11/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | [instant] Fix a bunch of low hanging bugs | ||||
| * | | | | | fix(instant): match token search on prefix | Brandon Millman | 2018-11-15 | 1 | -2/+4 |
| | | | | | | |||||
| * | | | | | fix(instant): border radius | Brandon Millman | 2018-11-15 | 3 | -9/+4 |
| | | | | | | |||||
| * | | | | | fix(instant): fix tabbing into erc20 token selector | Brandon Millman | 2018-11-15 | 2 | -0/+2 |
|/ / / / / | |||||
* | | | | | fix(order_utils.py): validate order w/json schema (#1260) | F. Eugene Aumson | 2018-11-15 | 9 | -61/+131 |
| | | | | | |||||
* | | | | | feat(order_utils.py): sign_hash() (#1254) | F. Eugene Aumson | 2018-11-14 | 14 | -110/+286 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moved is_valid_signature() into main package module, for simplicity. Also consolidated a handul of in-line pylint disable directives into the .pylintrc config file. | ||||
* | | | | | Publish | Leonid Logvinov | 2018-11-14 | 29 | -167/+167 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@2.0.4 - @0x/abi-gen@1.0.16 - @0x/abi-gen-wrappers@1.0.5 - @0x/assert@1.0.17 - @0x/asset-buyer@3.0.0 - @0x/base-contract@3.0.6 - @0x/connect@3.0.6 - @0x/contract-wrappers@4.0.2 - contracts@2.1.54 - @0x/dev-tools-pages@0.0.6 - @0x/dev-utils@1.0.17 - @0x/fill-scenarios@1.0.12 - @0x/instant@0.0.7 - @0x/json-schemas@2.1.1 - @0x/metacoin@0.0.28 - @0x/migrations@2.0.4 - @0x/order-utils@3.0.2 - @0x/order-watcher@2.2.4 - @0x/react-docs@1.0.18 - @0x/react-shared@1.0.21 - @0x/sol-compiler@1.1.12 - @0x/sol-cov@2.1.12 - @0x/sol-doc@1.0.7 - @0x/sra-spec@1.0.10 - @0x/subproviders@2.1.4 - @0x/testnet-faucets@1.0.56 - @0x/utils@2.0.5 - @0x/web3-wrapper@3.1.4 - @0x/website@0.0.59 | ||||
* | | | | | Updated CHANGELOGS | Leonid Logvinov | 2018-11-14 | 47 | -41/+287 |
| | | | | | |||||
* | | | | | Merge pull request #1259 from 0xProject/feature/ow-zrx-bug | Leonid Logvinov | 2018-11-14 | 2 | -1/+14 |
|\ \ \ \ \ | |/ / / / |/| | | | | [@0x/order-watcher] Fix a bug in an order removal when maker token is ZRX | ||||
| * | | | | Add a comment | Leonid Logvinov | 2018-11-14 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fix a bug in an order-watcher order removal when maker token is ZRX | Leonid Logvinov | 2018-11-14 | 2 | -1/+13 |
|/ / / / | |||||
* | | | | Merge pull request #1242 from 0xProject/feature/instant/metamask-connect-flow | Francesco Agosti | 2018-11-14 | 38 | -153/+644 |
|\ \ \ \ | | | | | | | | | | | [instant] Install/Unlock MetaMask, connect PaymentDropdown to redux state | ||||
| * \ \ \ | Merge branch 'feature/instant/metamask-connect-flow' of ↵ | fragosti | 2018-11-14 | 5 | -41/+44 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | https://github.com/0xProject/0x-monorepo into feature/instant/metamask-connect-flow | ||||
| | * \ \ \ | Merge pull request #1255 from ↵ | Steve Klebanoff | 2018-11-14 | 5 | -41/+44 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | 0xProject/feature/instant/metamask-connect-flow-input-fix [instant] Fix input bug | ||||
| | | * | | | linting | Steve Klebanoff | 2018-11-14 | 1 | -1/+2 |
| | | | | | | |||||
| | | * | | | Remove ConnectedZeroExInstantContainer, introduce ↵ | Steve Klebanoff | 2018-11-14 | 5 | -41/+43 |
| | |/ / / | | | | | | | | | | | | | | | | ConnectedBuyOrderProgressOrPaymentMethod |