aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | Call safeTransferFrom only when there is receiver data presentGreg Hysen2018-06-083-13/+20
| | * | | | Fixed formatting in memory layoutGreg Hysen2018-06-081-6/+6
| | * | | | Resolved edge case in Memcpy where where send would eventually turn "negative...Greg Hysen2018-06-082-144/+154
| | * | | | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. T...Greg Hysen2018-06-089-95/+64
| | * | | | Converged on naming scheme for asset data: renamed all instances of assetMeta...Greg Hysen2018-06-0823-323/+290
| | * | | | proxyData -> assetDataGreg Hysen2018-06-082-12/+12
| | * | | | Implement memcpy using masking and end-aligned wordsRemco Bloemen2018-06-081-59/+85
| | * | | | Add tests for word loop iterationRemco Bloemen2018-06-081-2/+6
| | * | | | Add test for zero-size overlapRemco Bloemen2018-06-081-1/+3
| | * | | | Add test casesRemco Bloemen2018-06-081-17/+133
| | * | | | Cleanup test scriptRemco Bloemen2018-06-081-16/+1
| | * | | | Convert Solidity tests to vectorsRemco Bloemen2018-06-082-232/+6
| | * | | | Generate tests from vectorsRemco Bloemen2018-06-082-5/+64
| | * | | | Tests for writing bytes to nested bytesGreg Hysen2018-06-081-9/+91
| | * | | | Fixed up wording in memcpyGreg Hysen2018-06-081-3/+3
| | * | | | Tons of tests around nested byte arrays and ERC721 receiverGreg Hysen2018-06-086-32/+223
| | * | | | Test for onReceived erc721 callbackGreg Hysen2018-06-086-5/+126
| | * | | | LibAssetProxyDecoder testsGreg Hysen2018-06-083-35/+70
| | * | | | Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-088-2/+216
| | * | | | Tests for libMemGreg Hysen2018-06-085-16/+80
| | * | | | LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721ReceiverGreg Hysen2018-06-088-27/+581
| * | | | | Merge pull request #674 from 0xProject/feature/geth-test-ciAlex Browne2018-06-092-19/+24
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Run contracts tests against Geth in CIAlex Browne2018-06-082-19/+24
| |/ / / /
| * | | | Merge pull request #679 from 0xProject/fix/await-transactionsLeonid Logvinov2018-06-082-23/+53
| |\ \ \ \
| | * | | | Add missing awaitTransactionSuccessAsync callsAlex Browne2018-06-082-23/+53
| |/ / / /
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-0845-84/+93
|\| | | |
| * | | | Merge pull request #671 from 0xProject/refactor/move-spawn-switch-to-utilsFabio Berger2018-06-0813-25/+24
| |\ \ \ \
| | * | | | Fix linter issueFabio Berger2018-06-081-1/+0
| | * | | | Fix linter issueFabio Berger2018-06-081-1/+0
| | * | | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utilsFabio Berger2018-06-0849-290/+301
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changesFabio Berger2018-06-087-206/+206
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #670 from 0xProject/fix/generated-nestingFabio Berger2018-06-0827-66/+69
| |\ \ \ \ \ \
| | * | | | | | Fix tslint issuesFabio Berger2018-06-082-2/+2
| | * | | | | | Fix missing pathsFabio Berger2018-06-083-7/+7
| | * | | | | | Fixed pathFabio Berger2018-06-074-12/+12
| | * | | | | | merge v2-prototypeFabio Berger2018-06-07292-2404/+2725
| | |\ \ \ \ \ \
| | * | | | | | | move generated contract wrappers from `contract_wrappers/generated/` to `gene...Fabio Berger2018-06-0627-67/+70
| * | | | | | | | Merge pull request #676 from 0xProject/feature/mocha-source-mapsAlex Browne2018-06-0818-18/+26
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Use source-map-support package to include correct line numbers in mochaAlex Browne2018-06-0718-18/+26
| | | | | * | | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utilsFabio Berger2018-06-07291-2388/+2711
| | | | | |\ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria...Fabio Berger2018-06-087-55/+37
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Fix tslint failureFabio Berger2018-06-085-10/+11
| * | | | | | | | Pass in fee and assetAmount rather then the whole signedOrderFabio Berger2018-06-083-45/+26
* | | | | | | | | Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria...Fabio Berger2018-06-085-183/+201
|\| | | | | | | |
| * | | | | | | | Revert to returning orderState on invalid orderFabio Berger2018-06-081-1/+6
| * | | | | | | | - Refactor remainingFillableCalculator so it can be used for the maker and ta...Fabio Berger2018-06-082-141/+162
| * | | | | | | | Update naming in orderStateUtils to use asset over token, also removed cancel...Fabio Berger2018-06-083-48/+40
| |/ / / / / / /
* | | | | | | | POC: Generates an order from spec, get's the amount fillableFabio Berger2018-06-087-32/+462
* | | | | | | | merge v2-prototypeFabio Berger2018-06-07291-2388/+2711
|\| | | | | | |
| * | | | | | | Merge pull request #673 from mohoff/patch-1Fabio Berger2018-06-071-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | typomohoff2018-06-071-1/+1
| * | | | | | | Merge pull request #662 from 0xProject/feature/improve-lintingFrancesco Agosti2018-06-07244-1464/+989
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Run prettierfragosti2018-06-078-27/+13
| | * | | | | | Remove unused variablefragosti2018-06-071-1/+0
| | * | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-079-39/+102
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #672 from 0xProject/feature/website/account-management-polishBrandon Millman2018-06-079-39/+102
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Change shouldRenderHeader prop to shouldHideHeaderBrandon Millman2018-06-075-13/+13
| | * | | | | | Fix undefined ether balanceBrandon Millman2018-06-063-9/+13
| | * | | | | | Make scrollability a prop on TradeHistoryBrandon Millman2018-06-062-3/+10
| | * | | | | | Fix EthWrappers background colorBrandon Millman2018-06-061-2/+2
| | * | | | | | Update GenerateOrderForm and FillOrder componentsBrandon Millman2018-06-064-6/+34
| | * | | | | | Update EthWrappers componentBrandon Millman2018-06-062-1/+7
| | * | | | | | Update TradeHistory componentBrandon Millman2018-06-062-3/+16
| | * | | | | | Hide action column on mainnetBrandon Millman2018-06-061-13/+14
| | * | | | | | Fix TokenBalances background colorBrandon Millman2018-06-061-1/+1
| | * | | | | | Add isFullWidth prop to TokenBalances componentBrandon Millman2018-06-062-1/+5
| | | * | | | | Fix linting issuesfragosti2018-06-074-6/+3
| | | * | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-0761-293/+1024
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #622 from 0xProject/geth-devnet-rebase-on-v2Alex Browne2018-06-0746-872/+1402
| |\ \ \ \ \ \ \
| | * | | | | | | Apply prettierAlex Browne2018-06-072-3/+10
| | * | | | | | | Update contracts tests after rebaseAlex Browne2018-06-072-14/+14
| | * | | | | | | Apply various fixes based on PR feedbackAlex Browne2018-06-075-20/+79
| | * | | | | | | Document debug_increaseTime method and fix typo in devnet READMEAlex Browne2018-06-071-1/+36
| | * | | | | | | Use an enum for ProviderType in contracts/src/utils/web3_wrapperAlex Browne2018-06-071-4/+21
| | * | | | | | | Update contracts package READMEAlex Browne2018-06-071-0/+9
| | * | | | | | | Update relevant changelogsAlex Browne2018-06-072-0/+30
| | * | | | | | | Remove global gas estimate bufferAlex Browne2018-06-071-5/+1
| | * | | | | | | Add Async suffix to relevant assertionsAlex Browne2018-06-0714-112/+112
| | * | | | | | | Fix linter errorsAlex Browne2018-06-073-8/+38
| | * | | | | | | Update package.json and yarn.lockAlex Browne2018-06-072-7/+77
| | * | | | | | | Update more things to work with both Geth and GanacheAlex Browne2018-06-076-50/+64
| | * | | | | | | Small fixes and cleanupAlex Browne2018-06-076-55/+5
| | * | | | | | | Add additional gas to calls to fillOrderNoThrowAlex Browne2018-06-073-152/+55
| | * | | | | | | Remove extra logs and other small fixesAlex Browne2018-06-074-19/+14
| | * | | | | | | Throw in web3-wrapper when rawCallResult is '0x'Alex Browne2018-06-074-6/+20
| | * | | | | | | Remove outdated todoAlex Browne2018-06-071-4/+0
| | * | | | | | | Fix some more test cases, especially those that call increaseTimeAlex Browne2018-06-074-55/+84
| | * | | | | | | Add support for TEST_PROVIDER env varAlex Browne2018-06-072-5/+6
| | * | | | | | | Update more tests to pass on GethAlex Browne2018-06-074-21/+29
| | * | | | | | | Get LibBytes tests working on both Ganache and GethAlex Browne2018-06-075-135/+43
| | * | | | | | | Add ability to quickly switch between Geth and Ganache by changing a constAlex Browne2018-06-072-4/+23
| | * | | | | | | Update exchange/transactions tests for Geth error messagesAlex Browne2018-06-071-4/+4
| | * | | | | | | Fix ethers.js version override (the package is just called 'ethers')Alex Browne2018-06-072-17/+2
| | * | | | | | | Use our fork of ethers.jsAlex Browne2018-06-072-1/+17
| | * | | | | | | Update some tests after rebaseAlex Browne2018-06-073-20/+29
| | * | | | | | | Add more transactions to Geth on init. Skip tests that are failing.Alex Browne2018-06-0716-645/+771
| | * | | | | | | Increase gas limit to account for bigger ExchangeContractAlex Browne2018-06-072-2/+2
| | * | | | | | | Replace constant.REVERT test assertions with expectRevertOrAlwaysFailingTrans...Alex Browne2018-06-0712-170/+143
| | * | | | | | | Update code after rebaseAlex Browne2018-06-073-3/+8
| | * | | | | | | Use Geth for contract testsAlex Browne2018-06-0722-11/+337
| |/ / / / / / /
| * | | | | | | Merge pull request #669 from 0xProject/bug/website/fix-balance-renderingBrandon Millman2018-06-071-9/+14
| |\ \ \ \ \ \ \
| | * | | | | | | Update balance amount rendering logicBrandon Millman2018-06-061-9/+14
| | |/ / / / / /
| * | | | | | | Merge pull request #653 from 0xProject/feature/ethereum-types-docsLeonid Logvinov2018-06-0715-2/+190
| |\ \ \ \ \ \ \
| | * | | | | | | Add EthereumTypes to _renderDrawerLeonid Logvinov2018-06-071-0/+11
| | * | | | | | | Add a TODO comment on StructLog type in the docsLeonid Logvinov2018-06-051-1/+1
| | * | | | | | | Add a documentation page for ethereum typesLeonid Logvinov2018-06-0515-2/+179
| | | | * | | | | Get build and tests to passfragosti2018-06-0733-1524/+1440
| | | | * | | | | Fix merge conflictfragosti2018-06-071-14/+0
| | | | * | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-0714-18/+28
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #657 from 0xProject/feature/build-speedLeonid Logvinov2018-06-0714-19/+29
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Don't build website if no changes were made to itLeonid Logvinov2018-06-071-1/+6
| | * | | | | | | Remove lerna bootstrapLeonid Logvinov2018-06-071-1/+0
| | * | | | | | | Fix linter issues in generated contract wrappersLeonid Logvinov2018-06-073-4/+4
| | * | | | | | | Add generated contract artifacts to prettierignoreLeonid Logvinov2018-06-071-0/+9
| | * | | | | | | Stop running prettier on generated filesLeonid Logvinov2018-06-078-13/+9
| | * | | | | | | Enable skipLibCheck flag in tsLeonid Logvinov2018-06-071-0/+1
| |/ / / / / / /
| | | | * | | | Use CLI for excludefragosti2018-06-076-14/+5
| | | | * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-0732-53/+63
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | | | * | | | Add missing importFabio Berger2018-06-061-1/+1
| | | | * | | | Fix remaining tslint issuesFabio Berger2018-06-065-26/+2
| | | | * | | | merge v2-prototypeFabio Berger2018-06-0671-3864/+1258
| | | | |\ \ \ \
| | | | * | | | | Exclude generate contract wrappers from tslintFabio Berger2018-06-066-6/+6
| | | | * | | | | remove unused imports from 0x.js testFabio Berger2018-06-061-1/+1
| | | | * | | | | Remove unused imports from contract handlebar templateFabio Berger2018-06-061-2/+2
| | | | * | | | | Some cleanupfragosti2018-06-061-11/+3
| | | | * | | | | Linter now passesfragosti2018-06-0637-110/+48
| | | | * | | | | Try enabling no-unused-variable...fragosti2018-06-05180-420/+110
| | | | | |_|_|/ | | | | |/| | |
* | | | | | | | Implement initial generateOrder function that given the scenario values for a...Fabio Berger2018-06-072-0/+244
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Move spawnSwitchErr to @0xproject/utilsFabio Berger2018-06-0615-25/+24
|/ / / / / /
* | | | | | Merge pull request #665 from 0xProject/fix/fix-build-watchFabio Berger2018-06-0632-54/+63
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add missing `yarn`Fabio Berger2018-06-061-1/+1
| * | | | | Add missing build:all commandFabio Berger2018-06-061-0/+1
| * | | | | Merge v2-prototypeFabio Berger2018-06-0649-129/+502
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #664 from 0xProject/fixes/misc-small-fixesFabio Berger2018-06-0619-18/+21
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge branch 'v2-prototype' into fixes/misc-small-fixesFabio Berger2018-06-0632-111/+481
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Remove TranslatedTextfragosti2018-06-061-15/+0
* | | | | | Fix prettierBrandon Millman2018-06-061-1/+1
* | | | | | Merge pull request #668 from 0xProject/feature/website/move-disclaimerBrandon Millman2018-06-061-16/+18
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Move portal disclaimer to the account management sectionBrandon Millman2018-06-061-16/+18
* | | | | | Add back UMD bundles for 0x.jsLeonid Logvinov2018-06-061-1/+3
* | | | | | Merge pull request #666 from 0xProject/bug/website/fix-missing-pricesBrandon Millman2018-06-062-30/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Move prices into portalBrandon Millman2018-06-062-30/+32
|/ / / / /
* | | | | Merge pull request #652 from 0xProject/feature/website/landing-subscribe-butt...Francesco Agosti2018-06-0630-64/+443
|\ \ \ \ \
| * | | | | Use stricter check for subscribe input textfragosti2018-06-061-1/+2
| * | | | | Make buttons stack on mobilefragosti2018-06-052-5/+6
| * | | | | Do not show subscribe form if language is not englishfragosti2018-06-051-1/+1
| * | | | | Address PR feedbackfragosti2018-06-058-40/+46
| * | | | | Lint and cleanupfragosti2018-06-025-8/+8
| * | | | | Merge branch 'feature/website/landing-subscribe-button' into feature/website/...fragosti2018-06-0230-53/+424
| |\ \ \ \ \
| | * | | | | Implement subscription formfragosti2018-06-027-68/+288
| | * | | | | Add styled-components and polishedfragosti2018-06-0221-22/+82
| | * | | | | Have basic newsletter subscribe form workingfragosti2018-06-026-2/+93
| | | * | | | Mention the gasLimit until in the doc commentFabio Berger2018-06-051-1/+1
| | | * | | | Merge branch 'v2-prototype' into fixes/misc-small-fixesFabio Berger2018-06-051-2/+2
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
| | | * | | | Replace `-` with `_` in yarn script name so that we are consistent across yar...Fabio Berger2018-06-0515-15/+15
| | | * | | | Add `switch-default` tslint rule and add missing default statementFabio Berger2018-06-052-0/+4
| | | * | | | Remove outdated link in ABI-gen READMEFabio Berger2018-06-051-2/+1
| | | | * | | - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ...Fabio Berger2018-06-0532-54/+62
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #661 from feuGeneA/patch-1Fabio Berger2018-06-051-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix broken link to `contract_templates`F. Eugene Aumson2018-06-051-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #656 from 0xProject/refactor/fill-scenarios/for-v2Fabio Berger2018-06-0524-3766/+730
|\ \ \ \ \
| * | | | | Use _.omit for concisenessFabio Berger2018-06-051-15/+5
| * | | | | revert multisig changeFabio Berger2018-06-051-1/+1
| * | | | | reset multisignFabio Berger2018-06-051-1/+1
| * | | | | Add PR to changelogFabio Berger2018-06-051-1/+2
| * | | | | Update fill-scenarios for V2 and add CHANGELOG entryFabio Berger2018-06-052-64/+91
| * | | | | Remove unused compact artifacts from order-utilsFabio Berger2018-06-057-1845/+0
| * | | | | Add missing exports to order-utils and add CHANGELOG entryFabio Berger2018-06-052-1/+18
| * | | | | Add new 2.0 artifacts to migrationsFabio Berger2018-06-052-0/+601
| * | | | | Remove compact_artifacts and replace with updated artifactsFabio Berger2018-06-059-1852/+12
| * | | | | Update fill-scenarios to depend on v2 updated order-utils and types. Needed t...Fabio Berger2018-06-053-4/+17
* | | | | | Merge pull request #658 from 0xProject/dont-automatically-rebuild-for-testsAlex Browne2018-06-0515-19/+31
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove duplicate cleans in package.json when clean is called in prebuildAlex Browne2018-06-054-4/+4
| * | | | | Remove common-js/umd differentiation from 0x.js/package.jsonAlex Browne2018-06-051-6/+3
| * | | | | Don't automatically rebuild when running yarn testAlex Browne2018-06-0515-15/+30
* | | | | | Merge pull request #633 from 0xProject/feature/contracts/errorsJacob Evans2018-06-0530-737/+490
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | rename GT to GREATER_THANJacob Evans2018-06-053-3/+3
| * | | | | Rebase from v2-prototypeJacob Evans2018-06-052-38/+2
| * | | | | Update Exchange statuses, revert instead of emmitting event on fill/cancel fa...Amir Bandeali2018-06-0530-702/+491
|/ / / / /
* | | | | Merge pull request #655 from 0xProject/update-migrationsAlex Browne2018-06-058-51/+79
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update artifacts in migrationsAlex Browne2018-06-058-51/+79
|/ / / /
* | | | Merge pull request #644 from 0xProject/feature/website/refactor-token-state-f...Francesco Agosti2018-06-055-97/+127
|\ \ \ \ | |_|_|/ |/| | |
| * | | Address feedbackfragosti2018-06-054-14/+20
| * | | Implement WETH step logic for continuefragosti2018-06-053-7/+14
| * | | Move trackedTokenStateByAddress logic into portalfragosti2018-06-052-83/+100
|/ / /
* | | Merge pull request #636 from 0xProject/refactor/order-utils/for-v2Fabio Berger2018-06-0253-518/+828
|\ \ \ | |/ / |/| |
| * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-0216-177/+219
| |\ \ | |/ / |/| |
* | | Merge pull request #651 from 0xProject/serial-contract-wrappersAlex Browne2018-06-023-55/+52
|\ \ \
| * | | Set contract expiration time to a constant 10 minutesAlex Browne2018-06-021-1/+2
| * | | Remove unused promises arrayAlex Browne2018-06-022-6/+0
| * | | Make erc20_wrapper and erc721_wrapper serialAlex Browne2018-06-022-48/+50
|/ / /
* | | Merge pull request #650 from 0xProject/feature/publishingLeonid Logvinov2018-06-0213-122/+167
|\ \ \
| * | | Rename changelogs to changelogLeonid Logvinov2018-06-021-8/+8
| * | | Add CHANGELOG entryLeonid Logvinov2018-06-021-0/+9
| * | | Check that git branch is up to date before publishingLeonid Logvinov2018-06-021-1/+17
| * | | Move prepublish checks before building packages for publishingLeonid Logvinov2018-06-024-55/+60
| * | | Refactor changelog utils to a separate moduleLeonid Logvinov2018-06-029-63/+78
| | * | Improve comments and remove unused importsFabio Berger2018-06-024-4/+7
| | * | Fix tslint issuesFabio Berger2018-06-023-5/+3
| | * | Add comment to exported methodFabio Berger2018-06-021-0/+7
| | * | Add missing depFabio Berger2018-06-021-0/+1
| | * | Fix types versionFabio Berger2018-06-021-1/+1
| | * | Also manually symlink types package in contractsFabio Berger2018-06-021-1/+1
| | * | Remove usage of `prebuild` since it doesn't run on `watch`Fabio Berger2018-06-021-2/+3
| | * | remove artifactsDir and contracts from compiler.jsonFabio Berger2018-06-021-13/+0
| | * | Add postinstall hack to get around `yarn` not setting up symlinks properly. T...Fabio Berger2018-06-021-1/+3
| | * | Fix type importsFabio Berger2018-06-025-5/+8
| | * | Remove ISigner artifactFabio Berger2018-06-021-76/+0
| | * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-023-17/+18
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #649 from 0xProject/addArtifactsFabio Berger2018-06-0218-4497/+4732
|\ \ \ \
| * | | | Update v2 artifactsFabio Berger2018-06-0217-4493/+4727
| * | | | Add IWallet and IValidator to compiled contractsFabio Berger2018-06-021-2/+2
| * | | | Split migrations compile command into one for V1 and another for V2Fabio Berger2018-06-021-3/+4
|/ / / /
| | * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-02130-1126/+1223
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #648 from 0xProject/feature/website/fill-orderBrandon Millman2018-06-024-34/+75
|\ \ \ \
| * | | | Remove old parse codeBrandon Millman2018-06-021-26/+0
| * | | | Refactor order parser and add shared order support to new portalBrandon Millman2018-06-023-3/+43
| * | | | Add generate and fill order routesBrandon Millman2018-06-022-7/+34
* | | | | Only show ProviderDisplay in portalBrandon Millman2018-06-021-12/+14
| |/ / / |/| | |
* | | | Improve sol-cov docsLeonid Logvinov2018-06-022-6/+78
|/ / /
* | | Merge pull request #642 from 0xProject/feature/ethereum-typesLeonid Logvinov2018-06-0190-366/+538
|\ \ \
| * | | Address feedbackLeonid Logvinov2018-06-012-2/+3
| * | | Fix linter errorsLeonid Logvinov2018-06-0120-23/+20
| * | | Fix linter errorsLeonid Logvinov2018-06-015-3/+5
| * | | Add ethereum-types to extraFileIncludesLeonid Logvinov2018-06-018-8/+22
| * | | Introduce ethereum-types packageLeonid Logvinov2018-06-0181-361/+511
* | | | Merge pull request #643 from 0xProject/feature/website/wallet-loadingBrandon Millman2018-06-0116-94/+195
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix missing keyBrandon Millman2018-06-011-1/+2
| * | | Update placeholder param orderingBrandon Millman2018-06-011-10/+21
| * | | Change userEtherBalanceInWei to optional so we can know if its loadingBrandon Millman2018-06-0113-22/+26
| * | | Add loading state to ProviderDisplayBrandon Millman2018-06-012-22/+39
| * | | TweaksBrandon Millman2018-06-012-8/+29
| * | | Add Placeholder componentBrandon Millman2018-06-011-14/+48
| * | | Add StandardIconRowBrandon Millman2018-06-011-34/+41
| * | | Split render into loading and loaadedBrandon Millman2018-06-011-5/+11
| |/ /
* | | Merge pull request #647 from 0xProject/override-ethereumjs-tx-versionAlex Browne2018-06-012-11/+6
|\ \ \ | |/ / |/| |
| * | Override ethereumjs-tx versionAlex Browne2018-06-012-11/+6
|/ /
* | Merge pull request #624 from 0xProject/feature/fast-ci2Leonid Logvinov2018-06-013-168/+210
|\ \
| * | Remove merge conflicts from yarn.lockLeonid Logvinov2018-06-011-13/+0
| * | Don't wait con contract tests to submit coverageLeonid Logvinov2018-06-011-1/+0
| * | Keep node versions consistentLeonid Logvinov2018-06-011-5/+5
| * | Split tests into two bucketsLeonid Logvinov2018-06-011-25/+23
| * | Use a newer version of node/yarn to speed-up deps instaationLeonid Logvinov2018-06-013-77/+167
| * | Try to cache dependenciesLeonid Logvinov2018-06-011-15/+12
| * | Combine lint and pretttier tests togetherLeonid Logvinov2018-06-011-17/+3
| * | Rebalance testsLeonid Logvinov2018-06-011-25/+10
* | | Merge pull request #641 from 0xProject/feature/remove-typesLeonid Logvinov2018-06-0119-444/+76
|\ \ \
| * | | Add changelog entry for typescript-typingsLeonid Logvinov2018-06-011-8/+8
| * | | Remove some typesLeonid Logvinov2018-06-0115-421/+63
| * | | Remove published typesLeonid Logvinov2018-06-015-15/+5
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 12:33:26 +0800