aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Give connected header accessory more paddingBrandon Millman2018-07-021-9/+13
* Implement correct behavior for menu in the walletBrandon Millman2018-07-026-31/+52
* Add menu to walletBrandon Millman2018-07-021-8/+32
* Implement simple menuBrandon Millman2018-07-025-91/+50
* Clean up a bit of the provider display logicBrandon Millman2018-07-023-73/+80
* Implement icon buttonBrandon Millman2018-07-022-2/+18
* Update relayer grid tiles to use TextBrandon Millman2018-07-012-50/+17
* Merge pull request #781 from 0xProject/refactor/contracts/fileStructureAmir Bandeali2018-06-30129-260/+256
|\
| * Fix buildAmir Bandeali2018-06-308-32/+32
| * Update file structureAmir Bandeali2018-06-30126-200/+196
|/
* Merge pull request #770 from 0xProject/feature/migrations/kovan-deployAmir Bandeali2018-06-3028-236/+3815
|\
| * Update 2.0.0 artifactsAmir Bandeali2018-06-305-149/+99
| * Move ledgerhq module declarations to typescript-typingsAmir Bandeali2018-06-307-79/+59
| * Export LedgerEthereumClient type in subprovidersAmir Bandeali2018-06-304-49/+19
| * Update artifactsAmir Bandeali2018-06-304-12/+26
| * Add logging and updated artifactsAmir Bandeali2018-06-306-32/+46
| * Fix migrationsAmir Bandeali2018-06-308-3453/+3405
| * Run prettierAmir Bandeali2018-06-304-3369/+3442
| * Add Kovan artifactsAmir Bandeali2018-06-304-0/+3373
| * Use ledger subproviderAmir Bandeali2018-06-3015-52/+165
| * Add Kovan migrationsAmir Bandeali2018-06-3011-15/+155
* | Merge pull request #787 from 0xProject/feature/website/portal-onboarding-polishFrancesco Agosti2018-06-3019-360/+354
|\ \ | |/ |/|
| * Remove state variable from Link component in Portalfragosti2018-06-301-4/+1
| * Remove extra call to scrollIntoView for wallet in onboardingfragosti2018-06-301-4/+0
| * Bump automatic show onborading delay by 1000msfragosti2018-06-301-1/+1
| * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-3061-5509/+1798
| |\
| * | Fix onboarding always startingfragosti2018-06-301-1/+2
| * | Rename userHasAllowances bool to follow proper conventionfragosti2018-06-302-6/+6
| * | Allow you to continue the onboarding flow once youve installed metamask and r...fragosti2018-06-305-17/+18
| * | Use Image component where relevant and add back tracked token timestamp logicfragosti2018-06-303-8/+24
| * | Bold all balances in onboardingfragosti2018-06-292-6/+8
| * | Customize allowance setting onboarding step if you have your allowances setfragosti2018-06-292-0/+4
| * | Re-center react-popper on every stepfragosti2018-06-292-16/+4
| * | Fix button hover and active hover statefragosti2018-06-291-1/+1
| * | Show eth balance in add eth balance onboarding stepfragosti2018-06-293-11/+16
| * | Change onboarding flow to communicate 3 stepsfragosti2018-06-292-6/+10
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-2949-1013/+2599
| |\ \
| * | | Scroll to top when going to relayers page from onboardingfragosti2018-06-281-0/+1
| * | | Bring you directly to relayers page once you finish onboardingfragosti2018-06-283-1/+14
| * | | Remove period in title from last stepfragosti2018-06-281-1/+1
| * | | Always restart onboarding from 0 and other small improvementsfragosti2018-06-282-3/+5
| * | | Customize flow depending on what steps you've completedfragosti2018-06-284-20/+43
| * | | Break wrapping ETH into a 3rd stepfragosti2018-06-282-5/+24
| * | | Fix animation when coming from bottomfragosti2018-06-281-0/+6
| * | | Fix width issue with onboarding card on mobilefragosti2018-06-282-1/+3
| * | | Clicking overlay closes onboardingfragosti2018-06-284-6/+12
| * | | Fix z index issue with wrap buttons and onboarding cardsfragosti2018-06-282-1/+2
| * | | Break wrath ETH step into 2fragosti2018-06-283-70/+72
| * | | Fix skip button position on first stepfragosti2018-06-281-11/+15
| * | | Make onboarding bounce around lessfragosti2018-06-282-13/+5
| * | | Scroll to wallet when onboarding automatically starts as wellfragosti2018-06-281-1/+4
| * | | Change asset for final onboarding stepfragosti2018-06-281-217/+122
* | | | Merge pull request #797 from 0xProject/refactor/contracts/registerAssetProxyAmir Bandeali2018-06-3012-203/+68
|\ \ \ \
| * | | | Make registerAssetProxy append onlyAmir Bandeali2018-06-3012-203/+68
|/ / / /
* | | | Update staging api linkBrandon Millman2018-06-301-1/+1
* | | | Merge pull request #793 from 0xProject/feature/contracts/transferFromFallbackAmir Bandeali2018-06-3012-383/+437
|\ \ \ \
| * | | | Change getTransactionReceipt to awaitTransactionMinedAmir Bandeali2018-06-301-1/+1
| * | | | Merge pull request #796 from 0xProject/fix/contracts/failingTransactionAssert...Amir Bandeali2018-06-302-27/+38
| |\ \ \ \
| | * | | | Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codesAlex Browne2018-06-302-27/+38
| |/ / / /
| * | | | Fix deployment to gethAmir Bandeali2018-06-302-7/+6
| * | | | Fix testsAmir Bandeali2018-06-306-79/+146
| * | | | Remove transferFrom, implement in fallback functionAmir Bandeali2018-06-306-290/+267
| | |_|/ | |/| |
* / | | Move /docs route to the endBrandon Millman2018-06-301-1/+1
|/ / /
* | | Merge pull request #792 from 0xProject/feature/website/wallet-polishBrandon Millman2018-06-3024-397/+585
|\ \ \
| * | | Change function to a constBrandon Millman2018-06-301-2/+2
| * | | Move wallet scrollIntoView into PortalOnboardingFlowBrandon Millman2018-06-302-7/+7
| * | | Add dollar sign to NullTokenRowBrandon Millman2018-06-291-1/+1
| * | | Remove unused imports and variablesBrandon Millman2018-06-295-20/+1
| * | | Refactor inline styles out of WalletBrandon Millman2018-06-296-132/+139
| * | | Remove some hardcoded MetaMask colorsBrandon Millman2018-06-292-3/+5
| * | | Create AccountConnection componentBrandon Millman2018-06-293-31/+61
| * | | Fix scrollbar bugBrandon Millman2018-06-291-1/+1
| * | | Start onboarding from relayer indexBrandon Millman2018-06-291-6/+20
| * | | Fix learn how to set up account layoutBrandon Millman2018-06-292-11/+13
| * | | Fix typoBrandon Millman2018-06-291-1/+1
| * | | Get rid of unused stuff in walletBrandon Millman2018-06-291-65/+1
| * | | Fix body overlay on mobileBrandon Millman2018-06-292-3/+3
| * | | Change learn how to update your account stylingBrandon Millman2018-06-291-27/+17
| * | | Fix key issue and remove WalletDisconnectedItemBrandon Millman2018-06-292-112/+1
| * | | Implement new locked and uninstalled statesBrandon Millman2018-06-297-7/+178
| * | | Fix off center icon in walletBrandon Millman2018-06-291-4/+7
| * | | Change wallet margin based on hover to prevent re-layoutBrandon Millman2018-06-291-0/+1
| * | | Update ProviderDisplay with new designBrandon Millman2018-06-295-37/+118
| * | | Implement provider name in headerBrandon Millman2018-06-292-4/+18
| * | | Implement loading body rowsBrandon Millman2018-06-294-28/+80
| * | | Added Circle componentBrandon Millman2018-06-293-6/+21
* | | | Merge pull request #774 from 0xProject/style/contracts/abiEncodeAsmCommentsAmir Bandeali2018-06-302-0/+22
|\ \ \ \
| * | | | Updated hashing comments as-per PRGreg Hysen2018-06-291-9/+4
| * | | | Comments for ASM hashingGreg Hysen2018-06-262-0/+27
* | | | | Merge pull request #794 from 0xProject/fix/devnet-minimum-blocksAlex Browne2018-06-304-24/+42
|\ \ \ \ \
| * | | | | Add @0xproject/utils as dependency to dev-utils/package.jsonAlex Browne2018-06-291-0/+1
| * | | | | Improve reliability of the minimum block number hack for the devnet/gethAlex Browne2018-06-293-24/+41
| | |/ / / | |/| | |
* | | | | Merge pull request #783 from 0xProject/miscenaleous-fixesFabio Berger2018-06-2931-5088/+1148
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix mergeFabio Berger2018-06-291-4/+0
| * | | | Merge v2-prototypeFabio Berger2018-06-2953-1014/+2688
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #791 from 0xProject/bug/website/broken-not-foundBrandon Millman2018-06-293-3/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix NotFound component and render 0x.js docs for /docsBrandon Millman2018-06-293-3/+5
|/ / / /
* | | | Merge pull request #780 from 0xProject/feature/website/support-new-metamaskFrancesco Agosti2018-06-2911-265/+263
|\ \ \ \
| * \ \ \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-29134-4139/+4913
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #762 from 0xProject/feature/website/scroll-to-tokenBrandon Millman2018-06-2912-35/+56
|\ \ \ \ \
| * | | | | Remove isTracked field on token in favor of trackedTimestampBrandon Millman2018-06-2911-26/+31
| * | | | | Use moment and lodashBrandon Millman2018-06-292-2/+3
| * | | | | Sort wallet tokens by timestamp added and scroll to newly added tokenBrandon Millman2018-06-296-11/+26
|/ / / / /
* | | | | Merge pull request #707 from 0xProject/feature/combinatorial-testingFabio Berger2018-06-2829-711/+2276
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove unused constantsFabio Berger2018-06-281-2/+0
| * | | | Reduce the userAddresses to the individual addresses actually used by tests, ...Fabio Berger2018-06-287-19/+32
| * | | | Add await time constantFabio Berger2018-06-281-0/+2
| * | | | Add missing awaitTransactionSuccessAsync callsFabio Berger2018-06-281-6/+10
| * | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2763-3140/+1876
| |\ \ \ \
| * | | | | Move combinatorial fillOrder tests into the `fill_ordere` test fileFabio Berger2018-06-272-48/+21
| * | | | | Fix testsFabio Berger2018-06-271-3/+6
| * | | | | Fix enum nameFabio Berger2018-06-271-9/+9
| * | | | | Fix type issueFabio Berger2018-06-271-2/+2
| * | | | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testingFabio Berger2018-06-2712-88/+92
| |\ \ \ \ \
| * | | | | | Update AbstractAssetWrapperFabio Berger2018-06-261-1/+1
| * | | | | | Rename to singularFabio Berger2018-06-261-9/+9
| * | | | | | Fix merge issuesFabio Berger2018-06-265-17/+21
| * | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2636-379/+532
| |\ \ \ \ \ \
| * | | | | | | Fix inconsistency between contract and reference implementation of order vali...Fabio Berger2018-06-262-0/+5
| * | | | | | | Prettier fixesFabio Berger2018-06-262-8/+2
| * | | | | | | Fix tslint issuesFabio Berger2018-06-269-24/+4
| * | | | | | | Fix lint errorsFabio Berger2018-06-263-5/+2
| * | | | | | | Fix revertReasonFabio Berger2018-06-251-1/+1
| * | | | | | | Update yarn.lockFabio Berger2018-06-251-0/+43
| * | | | | | | Remove no longer used methodFabio Berger2018-06-251-16/+0
| * | | | | | | Check revert reasons in declarative and combinatorial testsFabio Berger2018-06-252-61/+67
| * | | | | | | merge check-revert-reasonsFabio Berger2018-06-2512-66/+58
| |\ \ \ \ \ \ \
| * | | | | | | | Add missing importFabio Berger2018-06-251-1/+4
| * | | | | | | | merge check-revert-reasonsFabio Berger2018-06-2516-129/+236
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-25179-1859/+3476
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Add support for approveAll in assetWrapper and fillOrderScenariosFabio Berger2018-06-214-5/+80
| * | | | | | | | | Fix orderValidationUtils where was confusing a makerAssetAmount as a takerAss...Fabio Berger2018-06-213-11/+18
| * | | | | | | | | Improve verbose loggingFabio Berger2018-06-211-2/+5
| * | | | | | | | | Fix merge variable name issueFabio Berger2018-06-201-1/+1
| * | | | | | | | | Add support for setting allowance to unlimitedFabio Berger2018-06-202-7/+35
| * | | | | | | | | Add noop conditionals for clarityFabio Berger2018-06-201-0/+10
| * | | | | | | | | Rename for clarityFabio Berger2018-06-201-8/+8
| * | | | | | | | | Split balance and allowance amount types in prep of adding the "unlimited" al...Fabio Berger2018-06-203-51/+59
| * | | | | | | | | Remove unneeded explicit type defFabio Berger2018-06-201-1/+1
| * | | | | | | | | Add TS 2.7 numeric separators to improve readabilityFabio Berger2018-06-201-6/+6
| * | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2048-366/+1167
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add ability for verbose loggingFabio Berger2018-06-201-2/+10
| * | | | | | | | | | Fix typoFabio Berger2018-06-191-2/+2
| * | | | | | | | | | Rename NewOrderFactory to OrderFactoryFromScenario for clarityFabio Berger2018-06-192-5/+5
| * | | | | | | | | | Remove hack in ERC20WrapperFabio Berger2018-06-197-12/+30
| * | | | | | | | | | Cleanup coreCombinatorialUtilsFabio Berger2018-06-191-220/+226
| * | | | | | | | | | Comments and cleanupFabio Berger2018-06-191-20/+8
| * | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1995-581/+1154
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1973-415/+1965
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-158-23/+132
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add ability to tweak the relevant balances/allowances for the maker and taker...Fabio Berger2018-06-154-78/+380
| * | | | | | | | | | | | | - Refactor assetWrapper to contain more of the normalizing logic instead of e...Fabio Berger2018-06-1510-84/+341
| * | | | | | | | | | | | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert generateOr...Fabio Berger2018-06-145-60/+59
| * | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1429-38/+814
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use a defaultFillScenario in fillOrder testsFabio Berger2018-06-141-36/+39
| * | | | | | | | | | | | | | Fix incorrect string values in enumFabio Berger2018-06-141-2/+2
| * | | | | | | | | | | | | | Fix calculation of expFilledTakerAmount and expected values in events emittedFabio Berger2018-06-141-4/+7
| * | | | | | | | | | | | | | Replace initial set of legacy manually written fillOrder tests with declarati...Fabio Berger2018-06-142-434/+186
| * | | | | | | | | | | | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ...Fabio Berger2018-06-144-35/+153
| * | | | | | | | | | | | | | Fix divide by zero bugFabio Berger2018-06-141-3/+3
| * | | | | | | | | | | | | | Move orderFill combinatorialTests to exchange folderFabio Berger2018-06-131-4/+4
| * | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1364-1015/+1931
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Implement initial set of orderFill combinatorial testsFabio Berger2018-06-1313-490/+784
| * | | | | | | | | | | | | | | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper supe...Fabio Berger2018-06-134-9/+95
| * | | | | | | | | | | | | | | Remaining refactors of order-utils components for V2Fabio Berger2018-06-135-46/+48
| * | | | | | | | | | | | | | | For some reason order-watcher tests were timeing out so I increased the timeo...Fabio Berger2018-06-131-1/+1
| * | | | | | | | | | | | | | | Remove comment since we have added the testsFabio Berger2018-06-131-5/+0
| * | | | | | | | | | | | | | | Variable rename for clarityFabio Berger2018-06-131-2/+2
| * | | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-12176-1101/+3564
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-0845-84/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria...Fabio Berger2018-06-087-55/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria...Fabio Berger2018-06-085-183/+201
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | POC: Generates an order from spec, get's the amount fillableFabio Berger2018-06-087-32/+462
| * | | | | | | | | | | | | | | | | | | merge v2-prototypeFabio Berger2018-06-07291-2388/+2711
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Implement initial generateOrder function that given the scenario values for a...Fabio Berger2018-06-072-0/+244
* | | | | | | | | | | | | | | | | | | | | Merge pull request #766 from perissology/feature/solcov-ignoreFabio Berger2018-06-284-2/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | rename functionperissology2018-06-272-8/+8
| * | | | | | | | | | | | | | | | | | | | | add /*solcov ignore next*/ testsperissology2018-06-252-0/+52
| * | | | | | | | | | | | | | | | | | | | | support ignoring entire contractsperissology2018-06-251-7/+11
| * | | | | | | | | | | | | | | | | | | | | add ability to ignore covering specific code blocksperissology2018-06-232-2/+48
| | | | | | | | | | | | | | | | | | | | * | Changing provider to ledger more consistent with previous experiencefragosti2018-06-282-5/+5
| | | | | | | | | | | | | | | | | | | | * | Fix convention stufffragosti2018-06-282-20/+20
| | | | | | | | | | | | | | | | | | | | * | Remove IS_MAINNET_ENABLED configfragosti2018-06-284-74/+49
| | | | | | | | | | | | | | | | | | | | * | Rename all corresponding bools to shouldUseLedgerProviderfragosti2018-06-281-13/+13
| | | | | | | | | | | | | | | | | | | | * | Never use trackedTokenState when fetching new token statefragosti2018-06-271-6/+5
| | | | | | | | | | | | | | | | | | | | * | Fix bug where we are requesting tokens on a different networkfragosti2018-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | * | Remove unused variablesfragosti2018-06-274-24/+9
| | | | | | | | | | | | | | | | | | | | * | Make unsubscribing workfragosti2018-06-271-1/+5
| | | | | | | | | | | | | | | | | | | | * | Fix stateful ledger dialog edge statefragosti2018-06-272-2/+2
| | | | | | | | | | | | | | | | | | | | * | Get things working with legacy portalfragosti2018-06-271-10/+8
| | | | | | | | | | | | | | | | | | | | * | Fix subtle issues with ledger config dialogfragosti2018-06-273-11/+13
| | | | | | | | | | | | | | | | | | | | * | Ledger to metamask to ledger workingfragosti2018-06-273-42/+35
| | | | | | | | | | | | | | | | | | | | * | Have basic network switching workingfragosti2018-06-266-120/+158
| | | | | | | | | | | | | | | | | | | | * | Remove existing networkId watching logic from BlockchainWatcherfragosti2018-06-262-28/+15
| | | | | | | | | | | | | | | | | | | | | * Merge pull request #795 from 0xProject/miscellaneous-fixes/v2-exchange-regist...Jacob Evans2018-06-291-5/+26
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * Register the asset proxies to exchangeJacob Evans2018-06-291-5/+26
| | | | | | | | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | | | | | | | | * Remove network 50 detailsFabio Berger2018-06-286-48/+12
| | | | | | | | | | | | | | | | | | | | | * Re-generate and clean up artifacts for 2.0.0Fabio Berger2018-06-2823-5076/+1144
| | | | | | | | | | | | | | | | | | | | | * Add missing `AssetProxyOwner` from `compile:v2` commandFabio Berger2018-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | * Improve `ganache-core`'s `GanacheOpts` type and require it instead of `any`Fabio Berger2018-06-282-1/+3
| | | | | | | | | | | | | | | | | | | | | * Encode ZRX address as needed.Fabio Berger2018-06-283-2/+3
| | | | | | | | | | | | | | | | | | | | | * Add optimizer settings to `migrations` `compiler.json`Fabio Berger2018-06-281-0/+4
| | | | | | | | | | | | | | | | | | | | | * Update ganache-cli to latestFabio Berger2018-06-282-5/+23
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #763 from prettymuchbryce/invalid-argument-errorFabio Berger2018-06-279-7/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix tslintFabio Berger2018-06-271-2/+2
| * | | | | | | | | | | | | | | | | | | | Merge branch 'v2-prototype' into invalid-argument-errorFabio Berger2018-06-27115-4256/+3591
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Improve 'web3-provider-engine' typingsNikita Galkin2018-06-272-1/+18
* | | | | | | | | | | | | | | | | | | | | Merge pull request #773 from 0xProject/feature/contracts/abi-calldata-proxyAmir Bandeali2018-06-2750-3094/+1785
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix buildAmir Bandeali2018-06-275-3/+392
| * | | | | | | | | | | | | | | | | | | | | Update artifactsAmir Bandeali2018-06-2730-2689/+1363
| * | | | | | | | | | | | | | | | | | | | | Add more revert reasons to testsAmir Bandeali2018-06-274-19/+44
| * | | | | | | | | | | | | | | | | | | | | Make dispatchTransferFrom revert with reason from AssetProxy on failureAmir Bandeali2018-06-272-7/+6
| * | | | | | | | | | | | | | | | | | | | | Remove redundant files, hard code function selector in dispatchTransferFrom, ...Amir Bandeali2018-06-2717-896/+201
| * | | | | | | | | | | | | | | | | | | | | Updated offset of receiverData length to reflect new assetData encoding.Greg Hysen2018-06-271-2/+2
| * | | | | | | | | | | | | | | | | | | | | ERC20 Custom storage layoutRemco Bloemen2018-06-272-3/+5
| * | | | | | | | | | | | | | | | | | | | | Golf the authorization checkRemco Bloemen2018-06-272-122/+132
| * | | | | | | | | | | | | | | | | | | | | ERC20 manual memory layoutRemco Bloemen2018-06-271-11/+6
| * | | | | | | | | | | | | | | | | | | | | ERC20 inline returnRemco Bloemen2018-06-271-6/+11
| * | | | | | | | | | | | | | | | | | | | | ERC721 inline returnRemco Bloemen2018-06-271-8/+9
| * | | | | | | | | | | | | | | | | | | | | Golf ERC721 transferFromRemco Bloemen2018-06-272-3/+166
| * | | | | | | | | | | | | | | | | | | | | Inline ERC20 tranferFrom selector constantRemco Bloemen2018-06-271-4/+3
| * | | | | | | | | | | | | | | | | | | | | Optimize ERC20 transferFromRemco Bloemen2018-06-271-2/+126
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Polish asset picker layoutBrandon Millman2018-06-271-4/+4
* | | | | | | | | | | | | | | | | | | | | Update relayer grid fallback iconBrandon Millman2018-06-272-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge pull request #777 from 0xProject/feature/website/browser-detectionBrandon Millman2018-06-276-18/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Change metamask install link based on browserBrandon Millman2018-06-266-18/+104
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #776 from 0xProject/ethereum-js-tx-1.3.5Alex Browne2018-06-274-5/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Use ethereumjs-tx@1.3.5 instead of our forkAlex Browne2018-06-264-5/+54
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #760 from 0xProject/refactor/check-revert-reasonsFabio Berger2018-06-2716-140/+255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmou...Fabio Berger2018-06-271-2/+2
| * | | | | | | | | | | | | | | | | | | Expect RevertReason be passed in, not stringFabio Berger2018-06-261-1/+5
| * | | | | | | | | | | | | | | | | | | Rename RevertReasons to RevertReason since singular enum names are more commonFabio Berger2018-06-2611-96/+96
| * | | | | | | | | | | | | | | | | | | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2636-364/+521
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #743 from 0xProject/feature/contracts/abi-encodedAmir Bandeali2018-06-2635-361/+478
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Don't use variables for revert reasonsAmir Bandeali2018-06-2614-86/+86
| * | | | | | | | | | | | | | | | | | Add comments to dispatchTransferFromAmir Bandeali2018-06-261-30/+56
| * | | | | | | | | | | | | | | | | | Document IAssetDataRemco Bloemen2018-06-261-0/+3
| * | | | | | | | | | | | | | | | | | Compute bytes4 proxyid constantsRemco Bloemen2018-06-262-2/+2
| * | | | | | | | | | | | | | | | | | Return inplace bytes in LibBytes.readBytesWithLengthRemco Bloemen2018-06-261-9/+7
| * | | | | | | | | | | | | | | | | | Add Greg's documentation to MixinErc721TransferRemco Bloemen2018-06-261-33/+44
| * | | | | | | | | | | | | | | | | | Add Greg's documentation to MixinErc20TransferRemco Bloemen2018-06-261-13/+35
| * | | | | | | | | | | | | | | | | | Gas golf the transfer success logicRemco Bloemen2018-06-261-11/+10
| * | | | | | | | | | | | | | | | | | Optimize like in PR #767Remco Bloemen2018-06-263-34/+157
| * | | | | | | | | | | | | | | | | | Run prettier and fix linting errorsAmir Bandeali2018-06-263-55/+54
| * | | | | | | | | | | | | | | | | | Fix testsAmir Bandeali2018-06-265-21/+4
| * | | | | | | | | | | | | | | | | | Update testsRemco Bloemen2018-06-261-2/+2
| * | | | | | | | | | | | | | | | | | Fix AssetProxyUtilsRemco Bloemen2018-06-261-1/+1
| * | | | | | | | | | | | | | | | | | Update testsRemco Bloemen2018-06-262-33/+20
| * | | | | | | | | | | | | | | | | | Fix ERC721Proxy TokenIdRemco Bloemen2018-06-261-1/+1
| * | | | | | | | | | | | | | | | | | Update AssetProxyUtilsRemco Bloemen2018-06-261-90/+41
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 05:07:38 +0800