Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | | | * | | | | | | remove console.log | Fabio Berger | 2018-07-04 | 1 | -1/+0 | |
| | | | | | * | | | | | | Fix conditional | Fabio Berger | 2018-07-04 | 1 | -3/+4 | |
| | | | | | * | | | | | | Rename to InjectedProvider and make publicConfigStore optional | Fabio Berger | 2018-07-04 | 1 | -3/+3 | |
| | | | | | * | | | | | | Remove hack since latest web3-provider-engine fixed underlying issue | Fabio Berger | 2018-07-04 | 1 | -5/+0 | |
| | | | | | * | | | | | | Fix instance variable name | Fabio Berger | 2018-07-04 | 1 | -6/+6 | |
| | | | | | * | | | | | | Fix linter | Fabio Berger | 2018-07-04 | 1 | -1/+1 | |
| | | | | | * | | | | | | Fix type | Fabio Berger | 2018-07-04 | 1 | -1/+5 | |
| | | | | | * | | | | | | Fix package.json | Fabio Berger | 2018-07-04 | 1 | -1/+1 | |
| | | | | | * | | | | | | Rename subprovider in blockchain.ts | Fabio Berger | 2018-07-04 | 1 | -2/+2 | |
| | | | | | * | | | | | | Remove unused imported Web3.js | Fabio Berger | 2018-07-04 | 4 | -5/+1 | |
| | | | | | * | | | | | | Remove dep on Web3 in Website. Introduced InjectedWeb3 type. | Fabio Berger | 2018-07-04 | 4 | -13/+32 | |
| | | | | | * | | | | | | Fix import | Fabio Berger | 2018-07-04 | 1 | -1/+1 | |
| | | | | | * | | | | | | Refactor testnet-faucet to use web3Wrapper instead of web3 directly | Fabio Berger | 2018-07-04 | 3 | -19/+13 | |
| | | | | | * | | | | | | Replace use of web3 w/ web3wrapper in subproviders and rename injectedWeb3 to... | Fabio Berger | 2018-07-04 | 4 | -16/+36 | |
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #799 from 0xProject/feature/website/wallet-menu | Brandon Millman | 2018-07-04 | 9 | -199/+213 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Remove InstallPrompt | Brandon Millman | 2018-07-04 | 2 | -61/+0 | |
| * | | | | | | | | | | Implement clickaway for wallet menu on mobile | Brandon Millman | 2018-07-04 | 2 | -14/+24 | |
| * | | | | | | | | | | Add optional onClick to Link simple menu item | Brandon Millman | 2018-07-03 | 1 | -2/+7 | |
| * | | | | | | | | | | Lint fixes | Brandon Millman | 2018-07-02 | 4 | -17/+5 | |
| * | | | | | | | | | | More cleanup | Brandon Millman | 2018-07-02 | 2 | -31/+31 | |
| * | | | | | | | | | | Consolidate logic for common menu items | Brandon Millman | 2018-07-02 | 3 | -33/+74 | |
| * | | | | | | | | | | Give connected header accessory more padding | Brandon Millman | 2018-07-02 | 1 | -9/+13 | |
| * | | | | | | | | | | Implement correct behavior for menu in the wallet | Brandon Millman | 2018-07-02 | 6 | -31/+52 | |
| * | | | | | | | | | | Add menu to wallet | Brandon Millman | 2018-07-02 | 1 | -8/+32 | |
| * | | | | | | | | | | Implement simple menu | Brandon Millman | 2018-07-02 | 5 | -91/+50 | |
| * | | | | | | | | | | Clean up a bit of the provider display logic | Brandon Millman | 2018-07-02 | 3 | -73/+80 | |
| * | | | | | | | | | | Implement icon button | Brandon Millman | 2018-07-02 | 2 | -2/+18 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #815 from 0xProject/update-dependencies | Fabio Berger | 2018-07-04 | 10 | -73/+58 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix alignment | Fabio Berger | 2018-07-04 | 7 | -7/+7 | |
| * | | | | | | | | | | Update blockstream to latest version, propogate errors to top-level callers | Fabio Berger | 2018-07-04 | 4 | -66/+51 | |
| * | | | | | | | | | | Update web3-provider-engine version w/o caret | Fabio Berger | 2018-07-03 | 7 | -7/+7 | |
| * | | | | | | | | | | Update web3-provider-engine | Fabio Berger | 2018-07-03 | 7 | -7/+7 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #801 from feuGeneA/patch-3 | Fabio Berger | 2018-07-03 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | in subproviders, cite typescript-typings only once | F. Eugene Aumson | 2018-07-02 | 1 | -2/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #806 from 0xProject/feature/website/mobile-readable-web3-n... | Brandon Millman | 2018-07-03 | 4 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add human readable names for Toshi and Cipher | Brandon Millman | 2018-07-03 | 4 | -0/+11 | |
* | | | | | | | | | | Merge pull request #808 from 0xProject/feature/website/better-balance-formatting | Brandon Millman | 2018-07-03 | 5 | -18/+31 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add better balance formatting rules for balances and usd values | Brandon Millman | 2018-07-03 | 5 | -18/+31 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #810 from 0xProject/feature/wesbite/remove-add-balance | Brandon Millman | 2018-07-03 | 5 | -42/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove increase balance link from balance_bounded_input component | Brandon Millman | 2018-07-03 | 5 | -42/+2 | |
* | | | | | | | | | | | Use new lock svg | Brandon Millman | 2018-07-03 | 2 | -2/+5 | |
|/ / / / / / / / / / | ||||||
* | / / / / / / / / | Always show the wrap ether row in between ETH and WETH | Brandon Millman | 2018-07-03 | 2 | -18/+20 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Update start onboarding copy and relayer grid empty color | Brandon Millman | 2018-07-03 | 3 | -7/+10 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #805 from 0xProject/feature/website/add-alex-to-about | Francesco Agosti | 2018-07-03 | 2 | -10/+19 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add Alex Browne to about page | fragosti | 2018-07-03 | 2 | -10/+19 | |
|/ / / / / / / | ||||||
* | | | | | | | Add developer mailing list link to README | Amir Bandeali | 2018-07-03 | 1 | -0/+3 | |
* | | | | | | | Merge pull request #803 from 0xProject/fix/publishing/remote-tag-removal | Fabio Berger | 2018-07-02 | 28 | -55/+80 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update incorrect versions of deps | Fabio Berger | 2018-07-02 | 19 | -26/+19 | |
| * | | | | | | | Add new changelog entry | Fabio Berger | 2018-07-02 | 1 | -0/+9 | |
| * | | | | | | | fix prettier | Fabio Berger | 2018-07-02 | 1 | -4/+4 | |
| * | | | | | | | Git command outputs logs to stdErr so only way to check for errors if with tr... | Fabio Berger | 2018-07-02 | 1 | -6/+8 | |
| * | | | | | | | Remove remote tag before local one | Fabio Berger | 2018-07-02 | 1 | -6/+6 | |
| * | | | | | | | Add logs for when tags get removed | Fabio Berger | 2018-07-02 | 1 | -0/+2 | |
| * | | | | | | | combine changelog entries since we haven't published yet | Fabio Berger | 2018-07-02 | 2 | -10/+5 | |
| * | | | | | | | version outdated | Fabio Berger | 2018-07-02 | 1 | -1/+1 | |
| * | | | | | | | Throw if changelog version is below package.json version | Fabio Berger | 2018-07-02 | 1 | -0/+3 | |
| * | | | | | | | Update outdated changelogs | Fabio Berger | 2018-07-02 | 4 | -2/+23 | |
|/ / / / / / / | ||||||
* | | | | | | | Fix bug where 18 decimal tokens instead of 5 decimal tokens created | Fabio Berger | 2018-07-02 | 1 | -1/+1 | |
| | | * | | | | Pass 'from' param to estimateGas since it is required | Fabio Berger | 2018-07-05 | 1 | -1/+1 | |
| | | * | | | | Refactor Web3Wrapper to no longer use Web3.js & add more test coverage | Fabio Berger | 2018-07-05 | 8 | -68/+397 | |
| | | * | | | | Removee getContractFromAbi method since we no longer use it and do not recomm... | Fabio Berger | 2018-07-05 | 1 | -9/+0 | |
| | | * | | | | Add assert dep | Fabio Berger | 2018-07-04 | 1 | -0/+1 | |
| | | * | | | | Fix bug in string enum assertion so that we check enum values not keys | Fabio Berger | 2018-07-04 | 1 | -2/+2 | |
| | | * | | | | Add more assertions to Web3Wrapper public methods | Fabio Berger | 2018-07-04 | 2 | -3/+104 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #802 from 0xProject/fix/five_decimal_scenario | Fabio Berger | 2018-07-02 | 5 | -40/+119 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Disable custom-no-magic-number for block | Fabio Berger | 2018-07-02 | 1 | -0/+2 | |
| * | | | | | Remove unused variable | Fabio Berger | 2018-07-02 | 1 | -1/+0 | |
| * | | | | | Add .vscode from .gitignore | Fabio Berger | 2018-07-02 | 1 | -0/+3 | |
| * | | | | | Merge branch 'v2-prototype' into fix/five_decimal_scenario | Fabio Berger | 2018-07-02 | 205 | -2004/+5687 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
* | | | | | | Update relayer grid tiles to use Text | Brandon Millman | 2018-07-01 | 2 | -50/+17 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge pull request #781 from 0xProject/refactor/contracts/fileStructure | Amir Bandeali | 2018-06-30 | 129 | -260/+256 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix build | Amir Bandeali | 2018-06-30 | 8 | -32/+32 | |
| * | | | | | Update file structure | Amir Bandeali | 2018-06-30 | 126 | -200/+196 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #770 from 0xProject/feature/migrations/kovan-deploy | Amir Bandeali | 2018-06-30 | 28 | -236/+3815 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update 2.0.0 artifacts | Amir Bandeali | 2018-06-30 | 5 | -149/+99 | |
| * | | | | | Move ledgerhq module declarations to typescript-typings | Amir Bandeali | 2018-06-30 | 7 | -79/+59 | |
| * | | | | | Export LedgerEthereumClient type in subproviders | Amir Bandeali | 2018-06-30 | 4 | -49/+19 | |
| * | | | | | Update artifacts | Amir Bandeali | 2018-06-30 | 4 | -12/+26 | |
| * | | | | | Add logging and updated artifacts | Amir Bandeali | 2018-06-30 | 6 | -32/+46 | |
| * | | | | | Fix migrations | Amir Bandeali | 2018-06-30 | 8 | -3453/+3405 | |
| * | | | | | Run prettier | Amir Bandeali | 2018-06-30 | 4 | -3369/+3442 | |
| * | | | | | Add Kovan artifacts | Amir Bandeali | 2018-06-30 | 4 | -0/+3373 | |
| * | | | | | Use ledger subprovider | Amir Bandeali | 2018-06-30 | 15 | -52/+165 | |
| * | | | | | Add Kovan migrations | Amir Bandeali | 2018-06-30 | 11 | -15/+155 | |
* | | | | | | Merge pull request #787 from 0xProject/feature/website/portal-onboarding-polish | Francesco Agosti | 2018-06-30 | 19 | -360/+354 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Remove state variable from Link component in Portal | fragosti | 2018-06-30 | 1 | -4/+1 | |
| * | | | | | Remove extra call to scrollIntoView for wallet in onboarding | fragosti | 2018-06-30 | 1 | -4/+0 | |
| * | | | | | Bump automatic show onborading delay by 1000ms | fragosti | 2018-06-30 | 1 | -1/+1 | |
| * | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-30 | 61 | -5509/+1798 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Fix onboarding always starting | fragosti | 2018-06-30 | 1 | -1/+2 | |
| * | | | | | | Rename userHasAllowances bool to follow proper convention | fragosti | 2018-06-30 | 2 | -6/+6 | |
| * | | | | | | Allow you to continue the onboarding flow once youve installed metamask and r... | fragosti | 2018-06-30 | 5 | -17/+18 | |
| * | | | | | | Use Image component where relevant and add back tracked token timestamp logic | fragosti | 2018-06-30 | 3 | -8/+24 | |
| * | | | | | | Bold all balances in onboarding | fragosti | 2018-06-29 | 2 | -6/+8 | |
| * | | | | | | Customize allowance setting onboarding step if you have your allowances set | fragosti | 2018-06-29 | 2 | -0/+4 | |
| * | | | | | | Re-center react-popper on every step | fragosti | 2018-06-29 | 2 | -16/+4 | |
| * | | | | | | Fix button hover and active hover state | fragosti | 2018-06-29 | 1 | -1/+1 | |
| * | | | | | | Show eth balance in add eth balance onboarding step | fragosti | 2018-06-29 | 3 | -11/+16 | |
| * | | | | | | Change onboarding flow to communicate 3 steps | fragosti | 2018-06-29 | 2 | -6/+10 | |
| * | | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-29 | 49 | -1013/+2599 | |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||||
| * | | | | | | Scroll to top when going to relayers page from onboarding | fragosti | 2018-06-28 | 1 | -0/+1 | |
| * | | | | | | Bring you directly to relayers page once you finish onboarding | fragosti | 2018-06-28 | 3 | -1/+14 | |
| * | | | | | | Remove period in title from last step | fragosti | 2018-06-28 | 1 | -1/+1 | |
| * | | | | | | Always restart onboarding from 0 and other small improvements | fragosti | 2018-06-28 | 2 | -3/+5 | |
| * | | | | | | Customize flow depending on what steps you've completed | fragosti | 2018-06-28 | 4 | -20/+43 | |
| * | | | | | | Break wrapping ETH into a 3rd step | fragosti | 2018-06-28 | 2 | -5/+24 | |
| * | | | | | | Fix animation when coming from bottom | fragosti | 2018-06-28 | 1 | -0/+6 | |
| * | | | | | | Fix width issue with onboarding card on mobile | fragosti | 2018-06-28 | 2 | -1/+3 | |
| * | | | | | | Clicking overlay closes onboarding | fragosti | 2018-06-28 | 4 | -6/+12 | |
| * | | | | | | Fix z index issue with wrap buttons and onboarding cards | fragosti | 2018-06-28 | 2 | -1/+2 | |
| * | | | | | | Break wrath ETH step into 2 | fragosti | 2018-06-28 | 3 | -70/+72 | |
| * | | | | | | Fix skip button position on first step | fragosti | 2018-06-28 | 1 | -11/+15 | |
| * | | | | | | Make onboarding bounce around less | fragosti | 2018-06-28 | 2 | -13/+5 | |
| * | | | | | | Scroll to wallet when onboarding automatically starts as well | fragosti | 2018-06-28 | 1 | -1/+4 | |
| * | | | | | | Change asset for final onboarding step | fragosti | 2018-06-28 | 1 | -217/+122 | |
* | | | | | | | Merge pull request #797 from 0xProject/refactor/contracts/registerAssetProxy | Amir Bandeali | 2018-06-30 | 12 | -203/+68 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Make registerAssetProxy append only | Amir Bandeali | 2018-06-30 | 12 | -203/+68 | |
|/ / / / / / / | ||||||
* | | | | | | | Update staging api link | Brandon Millman | 2018-06-30 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #793 from 0xProject/feature/contracts/transferFromFallback | Amir Bandeali | 2018-06-30 | 12 | -383/+437 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Change getTransactionReceipt to awaitTransactionMined | Amir Bandeali | 2018-06-30 | 1 | -1/+1 | |
| * | | | | | | | Merge pull request #796 from 0xProject/fix/contracts/failingTransactionAssert... | Amir Bandeali | 2018-06-30 | 2 | -27/+38 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes | Alex Browne | 2018-06-30 | 2 | -27/+38 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Fix deployment to geth | Amir Bandeali | 2018-06-30 | 2 | -7/+6 | |
| * | | | | | | | Fix tests | Amir Bandeali | 2018-06-30 | 6 | -79/+146 | |
| * | | | | | | | Remove transferFrom, implement in fallback function | Amir Bandeali | 2018-06-30 | 6 | -290/+267 | |
| | |_|/ / / / | |/| | | | | | ||||||
* / | | | | | | Move /docs route to the end | Brandon Millman | 2018-06-30 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #792 from 0xProject/feature/website/wallet-polish | Brandon Millman | 2018-06-30 | 24 | -397/+585 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Change function to a const | Brandon Millman | 2018-06-30 | 1 | -2/+2 | |
| * | | | | | | Move wallet scrollIntoView into PortalOnboardingFlow | Brandon Millman | 2018-06-30 | 2 | -7/+7 | |
| * | | | | | | Add dollar sign to NullTokenRow | Brandon Millman | 2018-06-29 | 1 | -1/+1 | |
| * | | | | | | Remove unused imports and variables | Brandon Millman | 2018-06-29 | 5 | -20/+1 | |
| * | | | | | | Refactor inline styles out of Wallet | Brandon Millman | 2018-06-29 | 6 | -132/+139 | |
| * | | | | | | Remove some hardcoded MetaMask colors | Brandon Millman | 2018-06-29 | 2 | -3/+5 | |
| * | | | | | | Create AccountConnection component | Brandon Millman | 2018-06-29 | 3 | -31/+61 | |
| * | | | | | | Fix scrollbar bug | Brandon Millman | 2018-06-29 | 1 | -1/+1 | |
| * | | | | | | Start onboarding from relayer index | Brandon Millman | 2018-06-29 | 1 | -6/+20 | |
| * | | | | | | Fix learn how to set up account layout | Brandon Millman | 2018-06-29 | 2 | -11/+13 | |
| * | | | | | | Fix typo | Brandon Millman | 2018-06-29 | 1 | -1/+1 | |
| * | | | | | | Get rid of unused stuff in wallet | Brandon Millman | 2018-06-29 | 1 | -65/+1 | |
| * | | | | | | Fix body overlay on mobile | Brandon Millman | 2018-06-29 | 2 | -3/+3 | |
| * | | | | | | Change learn how to update your account styling | Brandon Millman | 2018-06-29 | 1 | -27/+17 | |
| * | | | | | | Fix key issue and remove WalletDisconnectedItem | Brandon Millman | 2018-06-29 | 2 | -112/+1 | |
| * | | | | | | Implement new locked and uninstalled states | Brandon Millman | 2018-06-29 | 7 | -7/+178 | |
| * | | | | | | Fix off center icon in wallet | Brandon Millman | 2018-06-29 | 1 | -4/+7 | |
| * | | | | | | Change wallet margin based on hover to prevent re-layout | Brandon Millman | 2018-06-29 | 1 | -0/+1 | |
| * | | | | | | Update ProviderDisplay with new design | Brandon Millman | 2018-06-29 | 5 | -37/+118 | |
| * | | | | | | Implement provider name in header | Brandon Millman | 2018-06-29 | 2 | -4/+18 | |
| * | | | | | | Implement loading body rows | Brandon Millman | 2018-06-29 | 4 | -28/+80 | |
| * | | | | | | Added Circle component | Brandon Millman | 2018-06-29 | 3 | -6/+21 | |
* | | | | | | | Merge pull request #774 from 0xProject/style/contracts/abiEncodeAsmComments | Amir Bandeali | 2018-06-30 | 2 | -0/+22 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Updated hashing comments as-per PR | Greg Hysen | 2018-06-29 | 1 | -9/+4 | |
| * | | | | | | | Comments for ASM hashing | Greg Hysen | 2018-06-26 | 2 | -0/+27 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #794 from 0xProject/fix/devnet-minimum-blocks | Alex Browne | 2018-06-30 | 4 | -24/+42 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | Add @0xproject/utils as dependency to dev-utils/package.json | Alex Browne | 2018-06-29 | 1 | -0/+1 | |
| * | | | | | | Improve reliability of the minimum block number hack for the devnet/geth | Alex Browne | 2018-06-29 | 3 | -24/+41 | |
| | |/ / / / | |/| | | | | ||||||
| | | | | * | Add commented out scenarios not run by default | Fabio Berger | 2018-07-02 | 1 | -16/+82 | |
| | | | | * | Fix comment | Fabio Berger | 2018-07-02 | 1 | -2/+1 | |
| | | | | * | Fix validation logic by checking for 0 maker/taker amount before 0 fillTakerA... | Fabio Berger | 2018-07-02 | 1 | -3/+3 | |
| | | | | * | Print out entire orderFill scenario | Fabio Berger | 2018-07-02 | 1 | -7/+1 | |
| | | | | * | Transfer ERC721 token instead of burning, so we can still set an allowance to... | Fabio Berger | 2018-07-02 | 1 | -1/+9 | |
| | | | | * | Fix bug where using nullAddress for order instead of actual taker address | Fabio Berger | 2018-07-02 | 1 | -11/+3 | |
| | | | | * | Add maker and taker balance/allowance scenarios to generateFillOrderCombination | Fabio Berger | 2018-07-02 | 1 | -8/+24 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge pull request #783 from 0xProject/miscenaleous-fixes | Fabio Berger | 2018-06-29 | 31 | -5088/+1148 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Fix merge | Fabio Berger | 2018-06-29 | 1 | -4/+0 | |
| * | | | | Merge v2-prototype | Fabio Berger | 2018-06-29 | 53 | -1014/+2688 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #791 from 0xProject/bug/website/broken-not-found | Brandon Millman | 2018-06-29 | 3 | -3/+5 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Fix NotFound component and render 0x.js docs for /docs | Brandon Millman | 2018-06-29 | 3 | -3/+5 | |
|/ / / / | ||||||
* | | | | Merge pull request #780 from 0xProject/feature/website/support-new-metamask | Francesco Agosti | 2018-06-29 | 11 | -265/+263 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-29 | 134 | -4139/+4913 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #762 from 0xProject/feature/website/scroll-to-token | Brandon Millman | 2018-06-29 | 12 | -35/+56 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove isTracked field on token in favor of trackedTimestamp | Brandon Millman | 2018-06-29 | 11 | -26/+31 | |
| * | | | | | Use moment and lodash | Brandon Millman | 2018-06-29 | 2 | -2/+3 | |
| * | | | | | Sort wallet tokens by timestamp added and scroll to newly added token | Brandon Millman | 2018-06-29 | 6 | -11/+26 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #707 from 0xProject/feature/combinatorial-testing | Fabio Berger | 2018-06-28 | 29 | -711/+2276 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Remove unused constants | Fabio Berger | 2018-06-28 | 1 | -2/+0 | |
| * | | | | Reduce the userAddresses to the individual addresses actually used by tests, ... | Fabio Berger | 2018-06-28 | 7 | -19/+32 | |
| * | | | | Add await time constant | Fabio Berger | 2018-06-28 | 1 | -0/+2 | |
| * | | | | Add missing awaitTransactionSuccessAsync calls | Fabio Berger | 2018-06-28 | 1 | -6/+10 | |
| * | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 63 | -3140/+1876 | |
| |\ \ \ \ | ||||||
| * | | | | | Move combinatorial fillOrder tests into the `fill_ordere` test file | Fabio Berger | 2018-06-27 | 2 | -48/+21 | |
| * | | | | | Fix tests | Fabio Berger | 2018-06-27 | 1 | -3/+6 | |
| * | | | | | Fix enum name | Fabio Berger | 2018-06-27 | 1 | -9/+9 | |
| * | | | | | Fix type issue | Fabio Berger | 2018-06-27 | 1 | -2/+2 | |
| * | | | | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 12 | -88/+92 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Update AbstractAssetWrapper | Fabio Berger | 2018-06-26 | 1 | -1/+1 | |
| * | | | | | | Rename to singular | Fabio Berger | 2018-06-26 | 1 | -9/+9 | |
| * | | | | | | Fix merge issues | Fabio Berger | 2018-06-26 | 5 | -17/+21 | |
| * | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-26 | 36 | -379/+532 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Fix inconsistency between contract and reference implementation of order vali... | Fabio Berger | 2018-06-26 | 2 | -0/+5 | |
| * | | | | | | | Prettier fixes | Fabio Berger | 2018-06-26 | 2 | -8/+2 | |
| * | | | | | | | Fix tslint issues | Fabio Berger | 2018-06-26 | 9 | -24/+4 | |
| * | | | | | | | Fix lint errors | Fabio Berger | 2018-06-26 | 3 | -5/+2 | |
| * | | | | | | | Fix revertReason | Fabio Berger | 2018-06-25 | 1 | -1/+1 | |
| * | | | | | | | Update yarn.lock | Fabio Berger | 2018-06-25 | 1 | -0/+43 | |
| * | | | | | | | Remove no longer used method | Fabio Berger | 2018-06-25 | 1 | -16/+0 | |
| * | | | | | | | Check revert reasons in declarative and combinatorial tests | Fabio Berger | 2018-06-25 | 2 | -61/+67 | |
| * | | | | | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 12 | -66/+58 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add missing import | Fabio Berger | 2018-06-25 | 1 | -1/+4 | |
| * | | | | | | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 16 | -129/+236 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-25 | 179 | -1859/+3476 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| * | | | | | | | | | Add support for approveAll in assetWrapper and fillOrderScenarios | Fabio Berger | 2018-06-21 | 4 | -5/+80 | |
| * | | | | | | | | | Fix orderValidationUtils where was confusing a makerAssetAmount as a takerAss... | Fabio Berger | 2018-06-21 | 3 | -11/+18 | |
| * | | | | | | | | | Improve verbose logging | Fabio Berger | 2018-06-21 | 1 | -2/+5 | |
| * | | | | | | | | | Fix merge variable name issue | Fabio Berger | 2018-06-20 | 1 | -1/+1 | |
| * | | | | | | | | | Add support for setting allowance to unlimited | Fabio Berger | 2018-06-20 | 2 | -7/+35 | |
| * | | | | | | | | | Add noop conditionals for clarity | Fabio Berger | 2018-06-20 | 1 | -0/+10 | |
| * | | | | | | | | | Rename for clarity | Fabio Berger | 2018-06-20 | 1 | -8/+8 | |
| * | | | | | | | | | Split balance and allowance amount types in prep of adding the "unlimited" al... | Fabio Berger | 2018-06-20 | 3 | -51/+59 | |
| * | | | | | | | | | Remove unneeded explicit type def | Fabio Berger | 2018-06-20 | 1 | -1/+1 | |
| * | | | | | | | | | Add TS 2.7 numeric separators to improve readability | Fabio Berger | 2018-06-20 | 1 | -6/+6 | |
| * | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-20 | 48 | -366/+1167 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add ability for verbose logging | Fabio Berger | 2018-06-20 | 1 | -2/+10 | |
| * | | | | | | | | | | Fix typo | Fabio Berger | 2018-06-19 | 1 | -2/+2 | |
| * | | | | | | | | | | Rename NewOrderFactory to OrderFactoryFromScenario for clarity | Fabio Berger | 2018-06-19 | 2 | -5/+5 | |
| * | | | | | | | | | | Remove hack in ERC20Wrapper | Fabio Berger | 2018-06-19 | 7 | -12/+30 | |
| * | | | | | | | | | | Cleanup coreCombinatorialUtils | Fabio Berger | 2018-06-19 | 1 | -220/+226 | |
| * | | | | | | | | | | Comments and cleanup | Fabio Berger | 2018-06-19 | 1 | -20/+8 | |
| * | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 95 | -581/+1154 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 73 | -415/+1965 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-15 | 8 | -23/+132 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Add ability to tweak the relevant balances/allowances for the maker and taker... | Fabio Berger | 2018-06-15 | 4 | -78/+380 | |
| * | | | | | | | | | | | | | - Refactor assetWrapper to contain more of the normalizing logic instead of e... | Fabio Berger | 2018-06-15 | 10 | -84/+341 | |
| * | | | | | | | | | | | | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert generateOr... | Fabio Berger | 2018-06-14 | 5 | -60/+59 | |
| * | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-14 | 29 | -38/+814 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Use a defaultFillScenario in fillOrder tests | Fabio Berger | 2018-06-14 | 1 | -36/+39 | |
| * | | | | | | | | | | | | | | Fix incorrect string values in enum | Fabio Berger | 2018-06-14 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | Fix calculation of expFilledTakerAmount and expected values in events emitted | Fabio Berger | 2018-06-14 | 1 | -4/+7 | |
| * | | | | | | | | | | | | | | Replace initial set of legacy manually written fillOrder tests with declarati... | Fabio Berger | 2018-06-14 | 2 | -434/+186 | |
| * | | | | | | | | | | | | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ... | Fabio Berger | 2018-06-14 | 4 | -35/+153 | |
| * | | | | | | | | | | | | | | Fix divide by zero bug | Fabio Berger | 2018-06-14 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | Move orderFill combinatorialTests to exchange folder | Fabio Berger | 2018-06-13 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-13 | 64 | -1015/+1931 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Implement initial set of orderFill combinatorial tests | Fabio Berger | 2018-06-13 | 13 | -490/+784 | |
| * | | | | | | | | | | | | | | | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper supe... | Fabio Berger | 2018-06-13 | 4 | -9/+95 | |
| * | | | | | | | | | | | | | | | Remaining refactors of order-utils components for V2 | Fabio Berger | 2018-06-13 | 5 | -46/+48 | |
| * | | | | | | | | | | | | | | | For some reason order-watcher tests were timeing out so I increased the timeo... | Fabio Berger | 2018-06-13 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | Remove comment since we have added the tests | Fabio Berger | 2018-06-13 | 1 | -5/+0 | |
| * | | | | | | | | | | | | | | | Variable rename for clarity | Fabio Berger | 2018-06-13 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-12 | 176 | -1101/+3564 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-08 | 45 | -84/+93 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria... | Fabio Berger | 2018-06-08 | 7 | -55/+37 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria... | Fabio Berger | 2018-06-08 | 5 | -183/+201 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | POC: Generates an order from spec, get's the amount fillable | Fabio Berger | 2018-06-08 | 7 | -32/+462 | |
| * | | | | | | | | | | | | | | | | | | | merge v2-prototype | Fabio Berger | 2018-06-07 | 291 | -2388/+2711 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Implement initial generateOrder function that given the scenario values for a... | Fabio Berger | 2018-06-07 | 2 | -0/+244 | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #766 from perissology/feature/solcov-ignore | Fabio Berger | 2018-06-28 | 4 | -2/+104 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | rename function | perissology | 2018-06-27 | 2 | -8/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | add /*solcov ignore next*/ tests | perissology | 2018-06-25 | 2 | -0/+52 | |
| * | | | | | | | | | | | | | | | | | | | | | support ignoring entire contracts | perissology | 2018-06-25 | 1 | -7/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | add ability to ignore covering specific code blocks | perissology | 2018-06-23 | 2 | -2/+48 |