| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | 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.4 | Leonid Logvinov | 2018-11-14 | 1 | -8/+8 |
* | Merge branch 'feature/instant/metamask-connect-flow' of https://github.com/0x... | fragosti | 2018-11-14 | 5 | -41/+44 |
|\ |
|
| * | linting | Steve Klebanoff | 2018-11-14 | 1 | -1/+2 |
| * | Remove ConnectedZeroExInstantContainer, introduce ConnectedBuyOrderProgressOr... | Steve Klebanoff | 2018-11-14 | 5 | -41/+43 |
* | | Merge https://github.com/0xProject/0x-monorepo into feature/instant/metamask-... | fragosti | 2018-11-14 | 13 | -58/+72 |
|\ \
| |/
|/| |
|
| * | chore(instant): fix prettier | Brandon Millman | 2018-11-14 | 2 | -2/+10 |
| * | Merge branch 'development' into fix/asset-buyer/price-per-token | Brandon Millman | 2018-11-14 | 2 | -27/+146 |
| |\ |
|
| * | | chore(instant): update selectedAssetAmount in the redux state to be named sel... | Brandon Millman | 2018-11-14 | 13 | -65/+68 |
| * | | feat(instant): calculate per unit eth amount to populate OrderDetails component | Brandon Millman | 2018-11-13 | 2 | -6/+15 |
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-14 | 1 | -5/+5 |
|\ \ \
| | |/
| |/| |
|
| * | | 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.3 | Leonid Logvinov | 2018-11-14 | 1 | -5/+5 |
| * | | Merge pull request #1251 from 0xProject/feature/instant/asset-data-map | Brandon Millman | 2018-11-13 | 1 | -22/+141 |
| |\ \
| | |/
| |/| |
|
* | | | chore: PR feedback | fragosti | 2018-11-14 | 2 | -6/+5 |
* | | | chore: run linter | fragosti | 2018-11-13 | 1 | -1/+1 |
* | | | feat: use Omit type to improve type defitions in some containers | fragosti | 2018-11-13 | 2 | -17/+6 |
* | | | chore: remove unused constant | fragosti | 2018-11-13 | 2 | -2/+0 |
* | | | fix: rename handler creator name | fragosti | 2018-11-13 | 3 | -3/+3 |
* | | | feat: make all button fontsizes 16px by default | fragosti | 2018-11-13 | 6 | -7/+3 |
* | | | fix: remove requirement of default case in all switch statements | fragosti | 2018-11-13 | 8 | -22/+12 |
* | | | feat: prevent eth balance blink | fragosti | 2018-11-13 | 2 | -6/+11 |
* | | | Merge branch 'feature/instant/asset-data-map' of https://github.com/0xProject... | fragosti | 2018-11-13 | 1 | -22/+141 |
|\ \ \
| | |/
| |/| |
|
| * | | feat(instant): add extra asset metadata | Brandon Millman | 2018-11-13 | 1 | -22/+141 |
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-13 | 1 | -7/+7 |
|\ \ \
| | |/
| |/| |
|
| * | | 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.2 | Leonid Logvinov | 2018-11-12 | 1 | -7/+7 |
| |/ |
|
* | | feat: integrate wallet flow with heartbeat and other branches | fragosti | 2018-11-13 | 6 | -48/+81 |
* | | fix: no longer refer to error account state | fragosti | 2018-11-10 | 1 | -1/+0 |
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-10 | 10 | -27/+115 |
|\| |
|
| * | feat(instant): handle privacy mode in wallets | Brandon Millman | 2018-11-10 | 6 | -16/+11 |
| * | Merge pull request #1237 from 0xProject/feature/instant/buy-quote-heartbeat | Steve Klebanoff | 2018-11-10 | 7 | -13/+106 |
| |\ |
|
| | * | linting | Steve Klebanoff | 2018-11-10 | 2 | -1/+2 |
| | * | Don't start heartbeat if no account | Steve Klebanoff | 2018-11-10 | 1 | -6/+8 |
| | * | Lodash noop | Steve Klebanoff | 2018-11-10 | 1 | -1/+1 |
| | * | Using built in intervalUtils instead of rolling own | Steve Klebanoff | 2018-11-10 | 1 | -20/+5 |
| | * | Update account more frequently | Steve Klebanoff | 2018-11-10 | 1 | -1/+1 |
| | * | Linting and renaming variables | Steve Klebanoff | 2018-11-10 | 5 | -21/+23 |
| | * | Use interface like named parameters here | Steve Klebanoff | 2018-11-10 | 2 | -3/+4 |
| | * | Emulate named parameters with interface | Steve Klebanoff | 2018-11-10 | 3 | -7/+17 |
| | * | Make sure we only update price when they are not in the middle of an order | Steve Klebanoff | 2018-11-10 | 1 | -2/+3 |
| | * | Use existing functions instead of writing our own | Steve Klebanoff | 2018-11-10 | 7 | -94/+28 |
| | * | Merge branch 'development' into feature/instant/buy-quote-heartbeat | Steve Klebanoff | 2018-11-10 | 43 | -312/+800 |
| | |\ |
|
| | * | | Variable name cleanup | Steve Klebanoff | 2018-11-09 | 1 | -9/+9 |
| | * | | Remove unneeded Promise.resolve | Steve Klebanoff | 2018-11-09 | 1 | -1/+0 |
| | * | | Remove old TODO | Steve Klebanoff | 2018-11-09 | 1 | -1/+0 |
| | * | | move files around and rename | Steve Klebanoff | 2018-11-09 | 3 | -24/+20 |
| | * | | wip: BuyQuote heartbeat | Steve Klebanoff | 2018-11-09 | 4 | -5/+45 |
| | * | | Make heartbeat more generic | Steve Klebanoff | 2018-11-09 | 2 | -23/+29 |
| | * | | wip: abstract out updating buy quote | Steve Klebanoff | 2018-11-09 | 2 | -39/+59 |
| | * | | linting | Steve Klebanoff | 2018-11-09 | 1 | -0/+1 |
| | * | | feat(instant): Heartbeat for updating account info | Steve Klebanoff | 2018-11-09 | 4 | -3/+62 |
* | | | | fix: set all button font sizes in buy flow to 16px | fragosti | 2018-11-10 | 1 | -2/+2 |
* | | | | fix: remove unused ProgressBar from BuyOrderProgress and fix issue where paym... | fragosti | 2018-11-10 | 2 | -17/+4 |
* | | | | fix: minimize height difference between different states | fragosti | 2018-11-10 | 1 | -2/+3 |
* | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-10 | 6 | -12/+50 |
|\| | | |
|
| * | | | feat(instant): Dismissible overlay error messages | Steve Klebanoff | 2018-11-10 | 6 | -12/+50 |
| | |/
| |/| |
|
* | | | feat: toggle wallet connection color | fragosti | 2018-11-10 | 2 | -10/+26 |
* | | | feat: refactor button styles and add href to Text | fragosti | 2018-11-10 | 5 | -20/+24 |
* | | | feat: add more info section to the metamask panel | fragosti | 2018-11-10 | 3 | -5/+10 |
* | | | feat: allow href prop on button | fragosti | 2018-11-10 | 4 | -8/+33 |
* | | | feat: implement basic StandardModalContent with accompanying InstallWalletPan... | fragosti | 2018-11-10 | 6 | -5/+88 |
* | | | feat: add padding to close icon to increase tap area | fragosti | 2018-11-10 | 1 | -1/+1 |
* | | | feat: open metamask sliding panel if locked on click | fragosti | 2018-11-10 | 2 | -23/+50 |
* | | | feat: create connect metamask | fragosti | 2018-11-10 | 1 | -2/+20 |
* | | | feat: connect payment method to state and display different content based on ... | fragosti | 2018-11-10 | 2 | -32/+78 |
* | | | feat: add account payment method container | fragosti | 2018-11-10 | 3 | -31/+57 |
* | | | feat: make zero ex instant container switch between progress and payment | fragosti | 2018-11-10 | 1 | -0/+21 |
* | | | feat: refactor progress bar code to expose static progress bar | fragosti | 2018-11-10 | 5 | -26/+73 |
* | | | feat: implement CurrentStandardSlidingPanel and put it in the main container | fragosti | 2018-11-10 | 10 | -8/+109 |
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-10 | 1 | -12/+12 |
|\| | |
|
| * | | 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.1 | Jacob Evans | 2018-11-09 | 1 | -12/+12 |
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-09 | 11 | -42/+148 |
|\| | |
|
| * | | Merge pull request #1232 from 0xProject/feature/instant/account-state-change | Brandon Millman | 2018-11-09 | 11 | -42/+148 |
| |\ \ |
|
| | * | | fix(instant): fix bug where we potentially fetch balance for the wrong account | Brandon Millman | 2018-11-09 | 4 | -9/+18 |
| | * | | Merge branch 'development' into feature/instant/account-state-change | Brandon Millman | 2018-11-09 | 31 | -286/+473 |
| | |\ \
| | | |/
| | |/| |
|
| | * | | chore(instant): fix lint errors | Brandon Millman | 2018-11-08 | 1 | -1/+1 |
| | * | | feat(instant): fetch balance at startup | Brandon Millman | 2018-11-08 | 7 | -20/+53 |
| | * | | feat(instant): fetch account address at startup and drive account state changes | Brandon Millman | 2018-11-08 | 9 | -25/+88 |
* | | | | feat: allow panel children to fill entire content / remove title from panel c... | fragosti | 2018-11-09 | 3 | -16/+10 |
* | | | | feat: add metamask logo | fragosti | 2018-11-09 | 1 | -0/+78 |
* | | | | feat: add lock icon | fragosti | 2018-11-09 | 1 | -0/+6 |
|/ / / |
|
* | | | fix: wrong prop names used | fragosti | 2018-11-09 | 1 | -2/+2 |
* | | | chore: PR feedback | fragosti | 2018-11-09 | 1 | -9/+9 |
* | | | fix: broken features because of merge | fragosti | 2018-11-09 | 3 | -1/+5 |
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-09 | 12 | -102/+201 |
|\ \ \
| | |/
| |/| |
|
| * | | [instant] Viewport specific errors (#1228) | Steve Klebanoff | 2018-11-09 | 8 | -49/+118 |
| * | | Merge pull request #1231 from 0xProject/fix/instant/default-amount-quote | Brandon Millman | 2018-11-09 | 4 | -53/+83 |
| |\ \ |
|
| | * | | chore(instant): fix linter | Brandon Millman | 2018-11-09 | 1 | -0/+1 |
| | * | | fix(instant): update buy quote at start up in the case of default amount | Brandon Millman | 2018-11-08 | 4 | -53/+82 |
| | |/ |
|
* | | | fix: remove default props, fix lint problems | fragosti | 2018-11-09 | 3 | -8/+7 |
* | | | chore: convert payment method to stateless component | fragosti | 2018-11-09 | 1 | -29/+25 |
* | | | feat: add boxShadow on dropdown hover | fragosti | 2018-11-09 | 2 | -0/+3 |
* | | | fix: various style issues | fragosti | 2018-11-09 | 3 | -18/+21 |
* | | | fix: remove all:initial rule from all div based ui compoennts | fragosti | 2018-11-09 | 3 | -3/+0 |
* | | | fix: token selector scrolling container height | fragosti | 2018-11-09 | 2 | -3/+5 |
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-09 | 34 | -450/+679 |
|\| | |
|
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-09 | 25 | -292/+494 |
| |\| |
|
| | * | Merge pull request #1221 from 0xProject/feature/instant/fallback-provider | Brandon Millman | 2018-11-08 | 18 | -276/+422 |
| | |\ |
|
| | | * | feat(instant): add Account to the ProviderState | Brandon Millman | 2018-11-08 | 3 | -39/+97 |
| | | * | feat(instant): fallback to an empty wallet provider when none is injected | Brandon Millman | 2018-11-08 | 14 | -243/+331 |
| | | * | chore(instant): update OrderState enum to follow capitalization conventions | Brandon Millman | 2018-11-07 | 8 | -43/+43 |
| * | | | fix: apply css reset to overlay as well | fragosti | 2018-11-08 | 5 | -35/+41 |
| * | | | chore: linter | fragosti | 2018-11-07 | 6 | -10/+6 |
| * | | | fix: progress bar | fragosti | 2018-11-07 | 2 | -7/+9 |
| * | | | fix: use fontSize prop in button | fragosti | 2018-11-07 | 1 | -2/+1 |
| * | | | feat: make instant resistant to external styles | fragosti | 2018-11-07 | 16 | -171/+233 |
| * | | | feat: add faux externall css file | fragosti | 2018-11-07 | 2 | -0/+22 |
| | |/
| |/| |
|
* | | | chore: cleanup | fragosti | 2018-11-08 | 1 | -2/+3 |
* | | | fix: restore button to previous state | fragosti | 2018-11-08 | 1 | -38/+24 |
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-08 | 7 | -16/+72 |
|\ \ \
| | |/
| |/| |
|
| * | | Small code review tweaks | Steve Klebanoff | 2018-11-08 | 2 | -2/+2 |
| * | | Take out unneeded conditionals | Steve Klebanoff | 2018-11-07 | 1 | -2/+2 |
| * | | remove unused dependecny | Steve Klebanoff | 2018-11-07 | 1 | -1/+0 |
| * | | remove unused import | Steve Klebanoff | 2018-11-07 | 1 | -2/+0 |
| * | | remove old comment | Steve Klebanoff | 2018-11-07 | 1 | -1/+0 |
| * | | Merge branch 'development' into feature/instant/mobile-full-bleed | Steve Klebanoff | 2018-11-07 | 25 | -38/+119 |
| |\| |
|
| * | | Hide X when small | Steve Klebanoff | 2018-11-07 | 2 | -3/+3 |
| * | | Fix mobile view of selecting assets | Steve Klebanoff | 2018-11-07 | 1 | -1/+1 |
| * | | Get rid of unused properties | Steve Klebanoff | 2018-11-07 | 2 | -4/+0 |
| * | | new MediaChoice approach for setting conditional css properties | Steve Klebanoff | 2018-11-07 | 6 | -61/+19 |
| * | | better function definiton | Steve Klebanoff | 2018-11-07 | 3 | -17/+11 |
| * | | proof of concept working | Steve Klebanoff | 2018-11-07 | 3 | -9/+22 |
| * | | wip: mediachoice experiment | Steve Klebanoff | 2018-11-07 | 3 | -0/+37 |
| * | | feat(instant): when on mobile, show mobile specific styling that takes up who... | Steve Klebanoff | 2018-11-07 | 5 | -4/+58 |
| * | | Putting back in old heights as not necessary for full bleed | Steve Klebanoff | 2018-11-07 | 2 | -2/+2 |
| * | | wip: height 100% | Steve Klebanoff | 2018-11-06 | 2 | -2/+4 |
| * | | wip: full display of mobile hard coded | Steve Klebanoff | 2018-11-06 | 6 | -6/+13 |
| * | | fix(instant): fix provided orders | Steve Klebanoff | 2018-11-06 | 1 | -1/+1 |
* | | | feat: implement copy-to-clipboard | fragosti | 2018-11-08 | 3 | -0/+24 |
* | | | feat: add MetaMask sign, refactor Circle | fragosti | 2018-11-08 | 4 | -18/+37 |
* | | | feat: create PaymentMethodDropdown | fragosti | 2018-11-08 | 9 | -43/+86 |
* | | | chore: remove unused props | fragosti | 2018-11-08 | 1 | -2/+2 |
* | | | fix: height of token selector overflow div | fragosti | 2018-11-08 | 2 | -7/+7 |
* | | | feat: refactor out overlay component and use it to implement click-outside | fragosti | 2018-11-08 | 5 | -68/+89 |
* | | | feat: implement basic dropdown component | fragosti | 2018-11-08 | 6 | -8/+169 |
| |/
|/| |
|
* | | Merge pull request #1210 from 0xProject/feature/instant/beta-bucket | Francesco Agosti | 2018-11-07 | 4 | -3/+25 |
|\ \ |
|
| * | | chore: move to underscores | fragosti | 2018-11-06 | 2 | -4/+4 |
| * | | chore: prettier and linter | fragosti | 2018-11-03 | 2 | -12/+11 |
| * | | fix: typo in README | fragosti | 2018-11-03 | 1 | -1/+1 |
| * | | feat: break up deploy into deploy-dogfood and deploy-staging | fragosti | 2018-11-03 | 4 | -3/+25 |
| |/ |
|
* | | Merge pull request #1213 from 0xProject/feature/instant/more-testnet-liquidity | Francesco Agosti | 2018-11-07 | 3 | -10/+46 |
|\ \ |
|
| * | | fix: remove unused import | fragosti | 2018-11-06 | 1 | -1/+0 |
| * | | chore: clarify a comment | fragosti | 2018-11-06 | 1 | -2/+2 |
| * | | feat: add GNT and MKR testnet orders, fix typo | fragosti | 2018-11-06 | 3 | -10/+46 |
| |/ |
|
* | | add extra space | Steve Klebanoff | 2018-11-06 | 1 | -0/+1 |
* | | remove unused import | Steve Klebanoff | 2018-11-06 | 1 | -1/+0 |
* | | chore(instant): import UI components directly | Steve Klebanoff | 2018-11-06 | 17 | -25/+49 |
|/ |
|
* | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-03 | 16 | -104/+132 |
|\ |
|
| * | linting | Steve Klebanoff | 2018-11-03 | 1 | -1/+0 |
| * | Merge branch 'development' into fix/instant/decimal-fields-scaling-amount-inp... | Steve Klebanoff | 2018-11-03 | 8 | -34/+46 |
| |\ |
|
| | * | Merge pull request #1209 from 0xProject/feature/instant/optional-provider | Brandon Millman | 2018-11-03 | 8 | -34/+46 |
| | |\ |
|
| | | * | feat(instant): pass in provider through props, fallback to injected provider | Brandon Millman | 2018-11-03 | 8 | -34/+46 |
| * | | | Use generic Maybe | Steve Klebanoff | 2018-11-03 | 3 | -8/+9 |
| * | | | linting | Steve Klebanoff | 2018-11-03 | 2 | -2/+2 |
| * | | | Merge branch 'development' into fix/instant/decimal-fields-scaling-amount-inp... | Steve Klebanoff | 2018-11-03 | 20 | -46/+483 |
| |\| | |
|
| * | | | onChange -> onAmountChange | Steve Klebanoff | 2018-11-03 | 2 | -5/+5 |
| * | | | Move MaybeBigNumber functions into helper | Steve Klebanoff | 2018-11-03 | 2 | -17/+29 |
| * | | | Have ScalingAmountInput trigger onChange with MaybeBigNumber and keep string ... | Steve Klebanoff | 2018-11-02 | 2 | -12/+54 |
| * | | | Getting rid of BigNumberInput in favor of BigNumber | Steve Klebanoff | 2018-11-02 | 7 | -56/+17 |
* | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-03 | 20 | -46/+483 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge pull request #1208 from 0xProject/fix/instant/zero-NaN | Steve Klebanoff | 2018-11-03 | 1 | -1/+1 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | fix(instant): dont get buy quote for zero value | Steve Klebanoff | 2018-11-03 | 1 | -1/+1 |
| * | | | feat(instant): add affiliateInfo overrides to dev url | Brandon Millman | 2018-11-03 | 1 | -0/+10 |
| * | | | feat(instant): implement affiliateFeeInfo prop | Brandon Millman | 2018-11-03 | 9 | -15/+61 |
| |/ / |
|
| * | | Merge branch 'development' into feature/instant/simulated-progress-bar | Steve Klebanoff | 2018-11-03 | 13 | -137/+367 |
| |\| |
|
| * | | Merge branch 'development' into feature/instant/simulated-progress-bar | Steve Klebanoff | 2018-11-02 | 22 | -162/+415 |
| |\ \ |
|
| * | | | linting: moving order of imports | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
| * | | | Better styling of estimated time | Steve Klebanoff | 2018-11-02 | 1 | -2/+15 |
| * | | | removing unused imports | Steve Klebanoff | 2018-11-02 | 2 | -2/+2 |
| * | | | Move file to new file to reflect the new export name | Steve Klebanoff | 2018-11-02 | 2 | -3/+1 |
| * | | | Rename export | Steve Klebanoff | 2018-11-02 | 2 | -3/+3 |
| * | | | Move BuyOrderProgress to its own component | Steve Klebanoff | 2018-11-02 | 2 | -38/+39 |
| * | | | Remove old TODO | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
| * | | | Use new constants | Steve Klebanoff | 2018-11-02 | 2 | -3/+6 |
| * | | | Use primary color instead of black | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
| * | | | maxWidth -> toWidth, and make from and to width consistent units | Steve Klebanoff | 2018-11-02 | 2 | -11/+11 |
| * | | | Getting rid of TimedProgress state | Steve Klebanoff | 2018-11-02 | 1 | -47/+23 |
| * | | | Minor cleanup | Steve Klebanoff | 2018-11-02 | 1 | -2/+2 |
| * | | | Take out old ended variable | Steve Klebanoff | 2018-11-02 | 1 | -14/+6 |
| * | | | Fix test name | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
| * | | | ended -> hasEnded | Steve Klebanoff | 2018-11-02 | 3 | -9/+9 |
| * | | | Rename to SelectedAssetProgress | Steve Klebanoff | 2018-11-01 | 2 | -4/+4 |
| * | | | Removing old extra param | Steve Klebanoff | 2018-11-01 | 1 | -1/+0 |
| * | | | Removing old simulated progress bar, and adding documentation to TimedProgres... | Steve Klebanoff | 2018-11-01 | 4 | -201/+5 |
| * | | | WIP of new timedprogressbar using CSS animations | Steve Klebanoff | 2018-11-01 | 5 | -7/+180 |
| * | | | Revert "Remove default in state reducer" | Steve Klebanoff | 2018-11-01 | 2 | -2/+3 |
| * | | | Remove default in state reducer | Steve Klebanoff | 2018-11-01 | 2 | -3/+2 |
| * | | | Explicit actions for setting different order states | Steve Klebanoff | 2018-11-01 | 6 | -51/+88 |
| * | | | Remove unused import | Steve Klebanoff | 2018-10-31 | 1 | -1/+0 |
| * | | | Tick less often, and let CSS style the transition | Steve Klebanoff | 2018-10-31 | 2 | -4/+24 |
| * | | | Nice formatting of displayed time | Steve Klebanoff | 2018-10-31 | 3 | -6/+90 |
| * | | | Takeout unneeded div | Steve Klebanoff | 2018-10-31 | 1 | -12/+10 |
| * | | | Get rid of old demo | Steve Klebanoff | 2018-10-31 | 5 | -45/+0 |
| * | | | Use simulated progress bar for txn | Steve Klebanoff | 2018-10-31 | 6 | -45/+108 |
| * | | | Always return estimated time, just use default if not known | Steve Klebanoff | 2018-10-31 | 1 | -3/+14 |
| * | | | Showing time | Steve Klebanoff | 2018-10-31 | 1 | -1/+9 |
| * | | | Show estimated time | Steve Klebanoff | 2018-10-31 | 1 | -0/+9 |
| * | | | Remove old files | Steve Klebanoff | 2018-10-31 | 7 | -200/+0 |
| * | | | Simulated Progress component working | Steve Klebanoff | 2018-10-31 | 6 | -6/+102 |
| * | | | WIP: beginning of simulated progress bar component | Steve Klebanoff | 2018-10-31 | 2 | -1/+137 |
| * | | | Placeholder for estimated time | Steve Klebanoff | 2018-10-31 | 2 | -2/+15 |
| * | | | Making prettier | Steve Klebanoff | 2018-10-31 | 1 | -4/+8 |
| * | | | Dispatching progress | Steve Klebanoff | 2018-10-31 | 7 | -4/+84 |
| * | | | Remove old TODO | Steve Klebanoff | 2018-10-31 | 1 | -1/+0 |
| * | | | Rename functions and get rid of old unused function | Steve Klebanoff | 2018-10-31 | 1 | -12/+4 |
| * | | | Stall at 95 percent | Steve Klebanoff | 2018-10-31 | 2 | -27/+46 |
| * | | | WIP: Progress ticker with finishing | Steve Klebanoff | 2018-10-31 | 2 | -0/+90 |
| * | | | store estimated time in Ms on state | Steve Klebanoff | 2018-10-30 | 2 | -5/+5 |
| * | | | return estimated state | Steve Klebanoff | 2018-10-30 | 4 | -9/+17 |
* | | | | chore: address PR comments | fragosti | 2018-11-03 | 5 | -18/+24 |
* | | | | fix: change assetdatas for OMG and REP to be all lower case, make MKR blue | fragosti | 2018-11-03 | 3 | -7/+10 |
* | | | | feat: reset input after token selection | fragosti | 2018-11-03 | 1 | -1/+2 |
* | | | | fix: dont include assetData in render options | fragosti | 2018-11-02 | 1 | -1/+0 |
* | | | | chore: prettier and linter | fragosti | 2018-11-02 | 2 | -2/+0 |
* | | | | feat: add basic token search functionality | fragosti | 2018-11-02 | 3 | -11/+75 |
* | | | | feat: improve position of close X in token selector | fragosti | 2018-11-02 | 1 | -1/+3 |
* | | | | feat: implement search bar UI | fragosti | 2018-11-02 | 5 | -5/+16 |
* | | | | feat: add name param to all ERC20AssetMetaData | fragosti | 2018-11-02 | 4 | -0/+17 |
* | | | | feat: implement basic token selection UI | fragosti | 2018-11-02 | 6 | -9/+69 |
* | | | | feat: implement panel title and close | fragosti | 2018-11-02 | 2 | -5/+16 |
* | | | | feat: use withTheme to use ColorOption to color Icon | fragosti | 2018-11-02 | 5 | -16/+14 |
* | | | | feat: use new Icon component functionality | fragosti | 2018-11-02 | 1 | -2/+2 |
* | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-02 | 13 | -170/+331 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Merge pull request #1205 from 0xProject/feature/instant/render-overlay | Brandon Millman | 2018-11-02 | 11 | -137/+268 |
| |\ \ \ |
|
| | * | | | Remove alternate hover styling from button and move into icon component | Brandon Millman | 2018-11-02 | 5 | -54/+54 |
| | * | | | feat(instant): add interactive overlay presentation to umd bundle | Brandon Millman | 2018-11-02 | 12 | -120/+251 |
| | | |/
| | |/| |
|
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-02 | 3 | -20/+48 |
| |\| | |
|
| | * | | Merge pull request #1201 from 0xProject/feature/instant/basic-token-modal | Francesco Agosti | 2018-11-02 | 19 | -142/+367 |
| | |\ \ |
|
| | * | | | chore: remove unused import | fragosti | 2018-11-01 | 1 | -1/+1 |
| | * | | | fix: address PR comments | fragosti | 2018-11-01 | 6 | -33/+90 |
| | |\ \ \
| | | | |/
| | | |/| |
|
| | * | | | feat: remove isValidProvided orders validation | fragosti | 2018-10-30 | 1 | -17/+35 |
| | * | | | chore: remove console log | fragosti | 2018-10-30 | 1 | -1/+0 |
| | * | | | feat(instant): add default gasPrice of 6 gwei to transactions | Brandon Millman | 2018-10-30 | 2 | -2/+5 |
| | * | | | feat: add augur provided order | fragosti | 2018-10-30 | 4 | -18/+26 |
* | | | | | fix: remove assetData from default params | fragosti | 2018-11-02 | 1 | -1/+0 |
* | | | | | feat: better handle errors in async fetches | fragosti | 2018-11-02 | 1 | -6/+10 |
* | | | | | chore: remove unneeded optional syntax | fragosti | 2018-11-02 | 1 | -2/+2 |
* | | | | | chore: add clarification to _generateSelectAssetClickHandler | fragosti | 2018-11-02 | 1 | -9/+10 |
* | | | | | fix: better name method | fragosti | 2018-11-02 | 1 | -4/+4 |
* | | | | | feat: add asserts for new API additions | fragosti | 2018-11-02 | 2 | -0/+6 |
* | | | | | feat: auto-close panel when a token is selected | fragosti | 2018-11-02 | 2 | -3/+11 |
* | | | | | feat: add states to the erc20 input for no assets or only 1 asset | fragosti | 2018-11-02 | 7 | -24/+50 |
* | | | | | feat: implement basic erc20 token selector | fragosti | 2018-11-01 | 6 | -13/+81 |
* | | | | | feat: modify public API to allow for passing in available assets, or fetch as... | fragosti | 2018-11-01 | 8 | -29/+100 |
|/ / / / |
|
* | | / | feat: add more asestMetaDatas | fragosti | 2018-11-01 | 2 | -0/+98 |
| |_|/
|/| | |
|
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-01 | 5 | -6/+61 |
|\ \ \
| | |/
| |/| |
|
| * | | Move tslint disable line | Steve Klebanoff | 2018-10-30 | 1 | -1/+3 |
| * | | Add comment and use constant | Steve Klebanoff | 2018-10-30 | 1 | -2/+3 |
| * | | Use polyfilled fetch from utils | Steve Klebanoff | 2018-10-30 | 1 | -2/+2 |
| * | | async suffix and use polyfill fetch util | Steve Klebanoff | 2018-10-30 | 1 | -4/+4 |