aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add missing metacoin dependenciesF. Eugene Aumson2018-06-201-0/+4
* make metacoin tsconfig independentF. Eugene Aumson2018-06-201-2/+11
* Merge pull request #732 from 0xProject/feature/update-pr-templateBrandon Millman2018-06-201-16/+2
|\
| * Update PR templateBrandon Millman2018-06-201-16/+2
* | Merge pull request #723 from 0xProject/bug/website/drawer-addressBrandon Millman2018-06-206-48/+82
|\ \ | |/ |/|
| * Use Image component instead of img tagBrandon Millman2018-06-203-8/+9
| * Consolidate account state messaging logicBrandon Millman2018-06-195-47/+80
* | Merge pull request #706 from 0xProject/feature/website/portal-v2-analyticsFrancesco Agosti2018-06-208-15/+74
|\ \
| * \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-20166-1025/+3150
| |\ \ | |/ / |/| |
* | | Merge pull request #726 from 0xProject/bug/website/late-eth-balanceBrandon Millman2018-06-202-47/+48
|\ \ \
| * | | Check network state immediately instead of waiting for delayBrandon Millman2018-06-192-47/+48
* | | | Merge pull request #683 from 0xProject/fix/contracts/memcpyRemco Bloemen2018-06-191-10/+12
|\ \ \ \
| * | | | Simplified handling of source < 32 edge caseRemco Bloemen2018-06-111-10/+12
* | | | | Prettier fixFabio Berger2018-06-191-3/+5
* | | | | Merge pull request #701 from feuGeneA/v2-prototypeFabio Berger2018-06-193-5/+16
|\ \ \ \ \
| * | | | | change @0xproject/types to ethereum-typesF. Eugene Aumson2018-06-151-1/+1
| * | | | | remove mistaken commentF. Eugene Aumson2018-06-151-4/+0
| * | | | | workaround for TypeScript trailing comma bugF. Eugene Aumson2018-06-151-1/+1
| * | | | | Document contract_templatesF. Eugene Aumson2018-06-151-0/+15
* | | | | | Merge pull request #728 from 0xProject/fix/post-dev-publishFabio Berger2018-06-1985-443/+921
|\ \ \ \ \ \
| * | | | | | Fix missed merge conflictsFabio Berger2018-06-193-14/+0
| * | | | | | Fix additional versions and update yarn.lockFabio Berger2018-06-199-97/+75
| * | | | | | Add OrderWatcherConfig type to 0x.js docs pageFabio Berger2018-06-191-0/+1
| * | | | | | Export OrderWatcherConfig from 0x.jsFabio Berger2018-06-191-0/+2
| * | | | | | Update all package versions to match latest published to NPMFabio Berger2018-06-1931-234/+234
| * | | | | | Update CHANGELOG's with publishes performed on development branchFabio Berger2018-06-1950-111/+622
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #731 from avonian/v2-prototypeLeonid Logvinov2018-06-192-4/+9
|\ \ \ \ \ \
| * | | | | | Update default params in sendRawPaylodAsync for improved JSON-RPC compatibilityAra Kevonian2018-06-192-4/+9
|/ / / / / /
* | | | | | Merge pull request #659 from 0xProject/feature/contracts/split-proxy-internal...Jacob Evans2018-06-196-129/+206
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Rebase with latest removing PROXY_ID from transferJacob Evans2018-06-185-95/+111
| * | | | | Split transfer impl and AssetProxyMixinJacob Evans2018-06-184-95/+156
* | | | | | Increase number of columns in relayer grid for small screensBrandon Millman2018-06-191-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #716 from 0xProject/feature/contracts/publicSignatureValid...Amir Bandeali2018-06-199-53/+331
|\ \ \ \ \
| * | | | | Make isValidSignature publicAmir Bandeali2018-06-199-53/+331
|/ / / / /
* | | | | Merge pull request #713 from 0xProject/feature/contracts/batchFillReturnAmir Bandeali2018-06-192-10/+28
|\ \ \ \ \
| * | | | | Make batchFill methods return FIllResults structAmir Bandeali2018-06-192-10/+28
|/ / / / /
* | | | | Merge pull request #722 from 0xProject/improvement/publishing-v2Fabio Berger2018-06-199-116/+321
|\ \ \ \ \
| * | | | | Remove remove_tags scriptFabio Berger2018-06-191-57/+0
| * | | | | Small fixesFabio Berger2018-06-193-10/+4
| * | | | | Use semver package instead of getNextPatchVersionFabio Berger2018-06-192-7/+16
| * | | | | Use semver library instead of semverUtilsFabio Berger2018-06-196-73/+17
| * | | | | small fixesFabio Berger2018-06-191-2/+2
| * | | | | Show all errors of a given kind at once rather then throwing after the first ...Fabio Berger2018-06-191-10/+36
| * | | | | fix package.jsonFabio Berger2018-06-191-1/+1
| * | | | | Add more prepublish checksFabio Berger2018-06-198-39/+332
| * | | | | remove remove_tags scriptFabio Berger2018-06-192-4/+0
|/ / / / /
* | | | | Merge pull request #712 from 0xProject/feature/website/portal-faceliftBrandon Millman2018-06-196-42/+68
|\ \ \ \ \
| * | | | | Create a shared Image componentBrandon Millman2018-06-192-35/+48
| * | | | | Update RelayerGridTile render logic to incorportate colors and logosBrandon Millman2018-06-173-14/+24
| * | | | | Add max width to top barBrandon Millman2018-06-172-1/+3
| * | | | | Set max-width for LargeLayoutBrandon Millman2018-06-171-4/+5
| |/ / / /
* | | | | Merge pull request #704 from 0xProject/bug/website/fix-filling-orderFrancesco Agosti2018-06-198-4/+21
|\ \ \ \ \
| * | | | | Adjust version in changelogfragosti2018-06-191-1/+1
| * | | | | Prettierfragosti2018-06-151-1/+1
| * | | | | Add to changelog for contract-wrappersfragosti2018-06-151-0/+8
| * | | | | Fix typofragosti2018-06-151-1/+1
| * | | | | Fix filling orders on Portalfragosti2018-06-157-4/+13
| | |/ / / | |/| | |
* | | | | Merge pull request #711 from 0xProject/website/feature/prettier-onboarding-co...Francesco Agosti2018-06-1925-85/+801
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Finish last onboarding stepfragosti2018-06-167-2/+277
| * | | | Finish set allowance stepfragosti2018-06-162-5/+32
| * | | | Add onboarding assetsfragosti2018-06-167-0/+82
| * | | | Add all steps to their own filefragosti2018-06-1611-71/+196
| * | | | Prettify account setup and add eth steps of onboardingfragosti2018-06-163-3/+32
| * | | | Make metamask part of the fow prettyfragosti2018-06-163-7/+35
| * | | | Make start onboarding button prettyfragosti2018-06-161-2/+17
| * | | | Improve styles of onboarding tooltipfragosti2018-06-167-53/+117
| * | | | Add Pointer componentfragosti2018-06-152-16/+87
* | | | | Merge pull request #700 from 0xProject/fix/contracts/tokenbugsRemco Bloemen2018-06-161-1/+29
|\ \ \ \ \
| * | | | | Handle tokens that do not return boolRemco Bloemen2018-06-141-1/+29
| | |/ / / | |/| | |
* | | | | Merge pull request #705 from 0xProject/feature/revert-trace-subproviderAlex Browne2018-06-1514-103/+365
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Change wording of error message when you try to use more than one subproviderAlex Browne2018-06-151-1/+1
| * | | | Remove redundant check in trace.ts and revert_trace.tsAlex Browne2018-06-152-6/+1
| * | | | Fix linter errorsAlex Browne2018-06-151-0/+1
| * | | | De-duplicate code by refactoring subprovider classesAlex Browne2018-06-155-204/+89
| * | | | Fix linter errors and remove coverage.jsonAlex Browne2018-06-151-2/+1
| * | | | Remove unused variables and other small fixesAlex Browne2018-06-154-10/+11
| * | | | Reverse order of stack trace to match behavior of most other language stack t...Alex Browne2018-06-151-1/+1
| * | | | Fix a bug in revert_trace.tsAlex Browne2018-06-154-40/+55
| * | | | Introduce subprovider for printing revert stack tracesAlex Browne2018-06-1510-50/+416
| | | | * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-1536-61/+946
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #695 from 0xProject/feature/website/onboarding-flow-allowa...Francesco Agosti2018-06-158-23/+132
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Run prettifyfragosti2018-06-151-7/+8
| * | | | Implement allowance and final flow stepfragosti2018-06-136-21/+42
| * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-13230-1495/+4887
| |\ \ \ \
| * \ \ \ \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-07313-2491/+2811
| |\ \ \ \ \
| * | | | | | Render TokenAllowancefragosti2018-06-072-5/+20
| * | | | | | Add utilities for getting tokens from tokensByAddressfragosti2018-06-074-3/+20
| * | | | | | Wrap AllowanceToggle in redux containerfragosti2018-06-075-11/+66
* | | | | | | Merge pull request #685 from 0xProject/feature/website/jobs-pageBrandon Millman2018-06-1429-38/+814
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add back redirector behind feature flagBrandon Millman2018-06-143-1/+19
| * | | | | | Update minHeight in TextBrandon Millman2018-06-141-1/+1
| * | | | | | Use Text components in ValuesBrandon Millman2018-06-141-3/+7
| * | | | | | Use spread operator instead of React.createElementBrandon Millman2018-06-143-7/+7
| * | | | | | Fix issue with positions hashBrandon Millman2018-06-131-19/+21
| * | | | | | Revert localhost configBrandon Millman2018-06-131-1/+1
| * | | | | | Use Text in TeamsBrandon Millman2018-06-131-3/+7
| * | | | | | Use Text in OpenPositionsBrandon Millman2018-06-133-5/+8
| * | | | | | Use Text component for HeaderItemBrandon Millman2018-06-132-7/+11
| * | | | | | Remove FloatingImageBrandon Millman2018-06-133-12/+3
| * | | | | | Move FilledImage into components/uiBrandon Millman2018-06-133-2/+2
| * | | | | | Replace FlatButton with Button in RetryBrandon Millman2018-06-131-12/+12
| * | | | | | Fix incorrect colorsBrandon Millman2018-06-131-2/+2
| * | | | | | Add font family to Button component and use in Join0x componentBrandon Millman2018-06-132-13/+16
| * | | | | | Consolidate jobs page grey colors with shared colorsBrandon Millman2018-06-131-2/+2
| * | | | | | Fix lint errorsBrandon Millman2018-06-1310-15/+12
| * | | | | | Remove extra packagesBrandon Millman2018-06-132-2/+0
| * | | | | | Implement small open positionsBrandon Millman2018-06-138-120/+232
| * | | | | | Implement large screen open positionsBrandon Millman2018-06-139-104/+187
| * | | | | | Teams sectionBrandon Millman2018-06-136-75/+70
| * | | | | | Benefits sectionBrandon Millman2018-06-133-12/+75
| * | | | | | Refactor into BulletedItemList componentBrandon Millman2018-06-132-24/+33
| * | | | | | Rework values sectionBrandon Millman2018-06-132-44/+13
| * | | | | | Polish mission section and photo sectionBrandon Millman2018-06-137-40/+95
| * | | | | | Add link to open positions sectionBrandon Millman2018-06-133-6/+20
| * | | | | | Add scroll to top for jobs pageBrandon Millman2018-06-131-21/+28
| * | | | | | Skeleton for jobs page and initial implementationBrandon Millman2018-06-1322-12/+457
| | |_|/ / / | |/| | | |
| | | | | * Run linterfragosti2018-06-155-8/+21
| | | | | * Add Portal v2 loggingfragosti2018-06-158-15/+62
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #694 from 0xProject/refactor-sol-covAlex Browne2018-06-135-306/+264
|\ \ \ \ \
| * | | | | Rename _coverageCollector -> _profilerCollector in TraceCollectionSubproviderAlex Browne2018-06-131-4/+4
| * | | | | Refactor sol-cov to de-duplicate code for coverage and profilingAlex Browne2018-06-135-306/+264
* | | | | | Merge pull request #682 from 0xProject/feature/contracts/popProxyIdAmir Bandeali2018-06-1336-532/+710
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Rename popByte and popAddressAmir Bandeali2018-06-135-18/+18
| * | | | | Hard code test addresses/bytes32 instead of generating pseudorandom onesAmir Bandeali2018-06-131-19/+16
| * | | | | Update artifactsAmir Bandeali2018-06-139-188/+182
| * | | | | Unpop byte rather than making deep copyAmir Bandeali2018-06-134-90/+95
| * | | | | Pass gas in to marketBuyOrdersNoThrowAmir Bandeali2018-06-131-1/+1
| * | | | | Looks up the memory location of makerAssetData/takerAssetDataGreg Hysen2018-06-131-0/+2
| * | | | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATAAmir Bandeali2018-06-135-23/+13
| * | | | | Add tests for deepCopyBytes and missing write methods from LibBytesAmir Bandeali2018-06-133-70/+201
| * | | | | Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-1320-209/+268
| |/ / / /
* | | | | Merge pull request #691 from 0xProject/fix/sol-cov-memoryAlex Browne2018-06-136-213/+74
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename computeCoverageAsync -> computeSingleTraceCoverageAsyncAlex Browne2018-06-134-4/+4
| * | | | Fix linter errorsAlex Browne2018-06-133-10/+6
| * | | | Refactor sol-cov to avoid keeping traceInfo in memoryAlex Browne2018-06-136-211/+76
|/ / / /
* | | | Upgrade solidity-parser-entlr 0.2.11 => 0.2.12Leonid Logvinov2018-06-132-4/+4
* | | | Fix import orderLeonid Logvinov2018-06-121-1/+1
* | | | Merge pull request #689 from 0xProject/geth-increase-startup-tx-delayLeonid Logvinov2018-06-121-2/+2
|\ \ \ \
| * | | | Increase delay when sending transactions during devnet startupAlex Browne2018-06-121-2/+2
* | | | | Merge pull request #687 from 0xProject/feature/metacoin-docsLeonid Logvinov2018-06-126-13/+194
|\ \ \ \ \
| * | | | | Fix typosLeonid Logvinov2018-06-124-10/+11
| * | | | | Fix linter issuesLeonid Logvinov2018-06-122-2/+2
| * | | | | Add profiler and geth tests to metacoinLeonid Logvinov2018-06-126-14/+194
* | | | | | Merge pull request #688 from 0xProject/feature/await-transaction-speedupLeonid Logvinov2018-06-1219-150/+874
|\ \ \ \ \ \
| * | | | | | Add note to web3-wrapper CHANGELOG.jsonAlex Browne2018-06-121-0/+5
| * | | | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts t...Alex Browne2018-06-1218-150/+869
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #690 from 0xProject/feature/truffle-sol-cov-fixesLeonid Logvinov2018-06-124-7/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add CHANGELOGsLeonid Logvinov2018-06-121-0/+12
| * | | | | Speed-up sol-covLeonid Logvinov2018-06-121-2/+2
| * | | | | Don't throw when no config file is foundLeonid Logvinov2018-06-121-4/+6
| * | | | | Fix solidityVersion schema regexLeonid Logvinov2018-06-121-1/+1
| |/ / / /
* | | | | Merge pull request #684 from 0xProject/fix/contract-wrappers/exchangeTransfer...Fabio Berger2018-06-1288-155/+977
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Stop exporting ArtifactWriterFabio Berger2018-06-122-5/+0
| * | | | Fix no-unused-variable tslint rule to include parameters and fix issuesFabio Berger2018-06-1266-113/+104
| * | | | Fix linter exclude ruleFabio Berger2018-06-121-1/+1
| * | | | Validate all signature types rather then only ECSignaturesFabio Berger2018-06-121-4/+12
| * | | | Store the instantiated OrderValidationUtilsFabio Berger2018-06-121-2/+2
| * | | | Remove global hooks from tests and deploy contracts from within the specific ...Fabio Berger2018-06-122-54/+32
| * | | | Merge branch 'v2-prototype' into fix/contract-wrappers/exchangeTransferSimulatorFabio Berger2018-06-1244-481/+869
| |\ \ \ \
| * | | | | Fix tslint issuesFabio Berger2018-06-125-8/+5
| * | | | | Add back artifacts fileFabio Berger2018-06-121-0/+13
| * | | | | Move OrderValidationUtils (+ tests) and ExchangeTransferSimulator to order-utilsFabio Berger2018-06-1216-18/+786
| * | | | | export parseECSignature methodFabio Berger2018-06-122-0/+8
| * | | | | Export ArtifactWriter from migrations packageFabio Berger2018-06-122-0/+9
| * | | | | Remove unused artifact fileFabio Berger2018-06-121-13/+0
| * | | | | Pass in generated contract wrapper to orderValidationUtils at instantiationFabio Berger2018-06-111-10/+25
| * | | | | Refactor orderValidationUtils to use the generated contract wrapper instead o...Fabio Berger2018-06-111-7/+11
| * | | | | Refactor ExchangeTransferSimulator public interface to accet an AbstractBalan...Fabio Berger2018-06-116-19/+71
| | |_|_|/ | |/| | |
* | | | | Add EmitStatement to ASTVisitorLeonid Logvinov2018-06-121-0/+3
| |/ / / |/| | |
* | | | Merge pull request #675 from 0xProject/feature/sol-cov-gethLeonid Logvinov2018-06-1243-479/+870
|\ \ \ \ | |/ / / |/| | |
| * | | Fix a bug in SolCompilerArtifacts adapter config overridingLeonid Logvinov2018-06-121-2/+2
| * | | Increase timeout for contract migrationsLeonid Logvinov2018-06-092-2/+2
| * | | Remove some copy-paste codeLeonid Logvinov2018-06-091-36/+6
| * | | Await transactions in migrationsLeonid Logvinov2018-06-091-35/+46
| * | | Fix typosLeonid Logvinov2018-06-095-7/+23
| * | | Await transactions in migrationsLeonid Logvinov2018-06-091-4/+12
| * | | Await fake transactionsLeonid Logvinov2018-06-091-4/+4
| * | | Fix a typoLeonid Logvinov2018-06-091-1/+1
| * | | Implement SolidityProfiler & adapt sol-cov to work with GethLeonid Logvinov2018-06-0940-439/+825
|/ / /
* | | Merge pull request #627 from 0xProject/feature/contracts/erc721SafeTransferFromGreg Hysen2018-06-0945-429/+1641
|\ \ \
| * | | Linter changes to contractsGreg Hysen2018-06-094-21/+6
| * | | Fixed assetProxyUtils for linterGreg Hysen2018-06-091-2/+2
| * | | Updated LibBytes error messagesGreg Hysen2018-06-083-28/+36
| * | | Cleanup after last rebaseGreg Hysen2018-06-085-8/+7
| * | | Updated tests to use new revert handlerGreg Hysen2018-06-082-13/+13
| * | | Minor fixes after rebaseGreg Hysen2018-06-083-753/+11
| * | | Camelcase in memCopyGreg Hysen2018-06-085-25/+25
| * | | Moved some constants to global scope in assetProxyUtilsGreg Hysen2018-06-081-18/+26
| * | | Style updates to contractsGreg Hysen2018-06-087-28/+23
| * | | Union types for generalized decodeAssetDataGreg Hysen2018-06-083-21/+6
| * | | Fixed a styling throughout contracts. Moved closing parenthesis for long list...Greg Hysen2018-06-088-31/+62
| * | | Removed setting makerAssetData/takerAssetData from tests where values are sam...Greg Hysen2018-06-081-34/+0
| * | | Fixed merge error when rebasing wrt length variable in asset data decodersGreg Hysen2018-06-082-4/+4
| * | | Style updates to ERC721 onReceiverGreg Hysen2018-06-087-16/+27
| * | | Fixed after rebaseGreg Hysen2018-06-083-5/+5
| * | | Fixes after rebasingGreg Hysen2018-06-086-49/+54
| * | | updated migrations artifactsGreg Hysen2018-06-081-1/+735
| * | | Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-088-53/+34
| * | | Style audit for proxies + libmem + libbytesGreg Hysen2018-06-088-50/+72
| * | | Style audit proxiesGreg Hysen2018-06-083-20/+64
| * | | 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 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
|\ \ \ \
| * | | | Fix tslint failureFabio Berger2018-06-085-10/+11
| * | | | Pass in fee and assetAmount rather then the whole signedOrderFabio Berger2018-06-083-45/+26
| * | | | 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
* | | | | 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 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
| |\ \ \ \ \ | |/ / / / / |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 02:05:47 +0800