aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set max-width for LargeLayoutBrandon Millman2018-06-171-4/+5
|
* Merge pull request #700 from 0xProject/fix/contracts/tokenbugsRemco Bloemen2018-06-161-1/+29
|\ | | | | Handle tokens that do not return bool
| * 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
|\ \ | | | | | | Introduce subprovider for printing revert stack traces
| * | 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 ↵Alex Browne2018-06-151-1/+1
| | | | | | | | | | | | traces
| * | 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 pull request #695 from ↵Francesco Agosti2018-06-158-23/+132
|\ \ \ | |_|/ |/| | | | | | | | 0xProject/feature/website/onboarding-flow-allowances Implement allowances and final "congrats" onboarding flow step
| * | 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
| |\ \ | | | | | | | | | | | | feature/website/onboarding-flow-allowances
| * \ \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-07313-2491/+2811
| |\ \ \ | | | | | | | | | | | | | | | feature/website/onboarding-flow-allowances
| * | | | 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
|\ \ \ \ \ | |_|_|_|/ |/| | | | Jobs page
| * | | | 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
| | |_|/ | |/| |
* | | | Merge pull request #694 from 0xProject/refactor-sol-covAlex Browne2018-06-135-306/+264
|\ \ \ \ | | | | | | | | | | Refactor sol-cov to de-duplicate code for coverage and profiling
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | Remove proxyId checks in AssetProxies
| * | | | 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
|\ \ \ \ | |/ / / |/| | | Refactor sol-cov to avoid keeping traceInfo in memory
| * | | 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 startup
| * | | 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
|\ \ \ \ | | | | | | | | | | Add profiler and geth tests to metacoin
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts tests
| * | | | | Add note to web3-wrapper CHANGELOG.jsonAlex Browne2018-06-121-0/+5
| | | | | |
| * | | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts ↵Alex Browne2018-06-1218-150/+869
| | |/ / / | |/| | | | | | | | | | | | | tests
* | | | | Merge pull request #690 from 0xProject/feature/truffle-sol-cov-fixesLeonid Logvinov2018-06-124-7/+21
|\ \ \ \ \ | |/ / / / |/| | | | Sol-cov fixes
| * | | | 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 ↵Fabio Berger2018-06-1288-155/+977
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 0xProject/fix/contract-wrappers/exchangeTransferSimulator Move ExchangeTransferSimulator & OrderValidationUtils to Order-Utils
| * | | 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
| | | | | | | | | | | | | | | | tests
| * | | Merge branch 'v2-prototype' into fix/contract-wrappers/exchangeTransferSimulatorFabio Berger2018-06-1244-481/+869
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix a bug in SolCompilerArtifacts adapter config overriding Increase timeout for contract migrations Remove some copy-paste code Await transactions in migrations Fix typos Await transactions in migrations Await fake transactions Fix a typo Implement SolidityProfiler & adapt sol-cov to work with Geth # Conflicts: # packages/migrations/CHANGELOG.json
| * | | | 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 ↵Fabio Berger2018-06-111-7/+11
| | | | | | | | | | | | | | | | | | | | of the higher-level one
| * | | | Refactor ExchangeTransferSimulator public interface to accet an ↵Fabio Berger2018-06-116-19/+71
| | | | | | | | | | | | | | | | | | | | AbstractBalanceAndProxyAllowanceLazyStore so that this module could be re-used in different contexts.
* | | | | Add EmitStatement to ASTVisitorLeonid Logvinov2018-06-121-0/+3
| |/ / / |/| | |
* | | | Merge pull request #675 from 0xProject/feature/sol-cov-gethLeonid Logvinov2018-06-1243-479/+870
|\ \ \ \ | |/ / / |/| | | `ProfilerSubprovider` & Geth-related fixes for `sol-cov`
| * | | 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
|\ \ \ | | | | | | | | On-Chain AssetData Decoding Lib + safeTransferFrom for ERC721 + Memcpy
| * | | 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 ↵Greg Hysen2018-06-088-31/+62
| | | | | | | | | | | | | | | | list of function parameters to next line.
| * | | Removed setting makerAssetData/takerAssetData from tests where values are ↵Greg Hysen2018-06-081-34/+0
| | | | | | | | | | | | | | | | same as defaultOrderParams.
| * | | 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 ↵Greg Hysen2018-06-082-144/+154
| | | | | | | | | | | | | | | | "negative" and wrap around.
| * | | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵Greg Hysen2018-06-089-95/+64
| | | | | | | | | | | | | | | | This way they can still be used by the forwarding contract. TestAssetDataDecoders inherits them in the same way the forwarding contract would
| * | | Converged on naming scheme for asset data: renamed all instances of ↵Greg Hysen2018-06-0823-323/+290
| | | | | | | | | | | | | | | | assetMetadata, proxyData, proxyMetadata to assetData
| * | | 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 CI
| * | | 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 calls
| * | | 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
|\ \ \ | | | | | | | | Move spawnSwitchErr to @0xproject/utils
| * | | 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
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder Fix missing paths Revert to returning orderState on invalid order - Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary. Fixed path Use source-map-support package to include correct line numbers in mocha move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers
* | | | Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changesFabio Berger2018-06-087-206/+206
|\ \ \ \ | | | | | | | | | | Remaining Order-utils V2 Changes
| * | | | 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 ↵Fabio Berger2018-06-082-141/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | taker side - Moved the tests over from order-watcher - Did some token -> asset renaming
| * | | | Update naming in orderStateUtils to use asset over token, also removed ↵Fabio Berger2018-06-083-48/+40
| | | | | | | | | | | | | | | | | | | | cancelledAmount since in V2 it's binary.
* | | | | Merge pull request #670 from 0xProject/fix/generated-nestingFabio Berger2018-06-0827-66/+69
|\ \ \ \ \ | | | | | | | | | | | | Remove unnecessary folder nesting
| * | | | | 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 ↵Fabio Berger2018-06-0627-67/+70
| | | | | | | | | | | | | | | | | | | | | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
* | | | | | 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 mocha
| * | | | | 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
| | | |\ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (66 commits) Run prettier Remove unused variable Fix linting issues Change shouldRenderHeader prop to shouldHideHeader Get build and tests to pass typo Apply prettier Update contracts tests after rebase Apply various fixes based on PR feedback Document debug_increaseTime method and fix typo in devnet README Use an enum for ProviderType in contracts/src/utils/web3_wrapper Update contracts package README Update relevant changelogs Remove global gas estimate buffer Add Async suffix to relevant assertions Fix linter errors Update package.json and yarn.lock Update more things to work with both Geth and Ganache Small fixes and cleanup Add additional gas to calls to fillOrderNoThrow ... # Conflicts: # packages/order-watcher/src/order_watcher/order_watcher.ts # packages/react-docs/src/components/type.tsx # packages/website/ts/components/ui/lifecycle_raised_button.tsx # packages/website/ts/components/wallet/wallet.tsx
* | | | | | Merge pull request #673 from mohoff/patch-1Fabio Berger2018-06-071-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | typo
| * | | | | typomohoff2018-06-071-1/+1
| | | | | |
* | | | | | Merge pull request #662 from 0xProject/feature/improve-lintingFrancesco Agosti2018-06-07244-1464/+989
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Tried enabling no-unused-variable...
| * | | | | 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
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | feature/improve-linting
* | | | | | Merge pull request #672 from 0xProject/feature/website/account-management-polishBrandon Millman2018-06-079-39/+102
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Account management polish
| * | | | | 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
| | |\ \ \ \ | |_|/ / / / |/| | | | | | | | | | | feature/improve-linting
* | | | | | Merge pull request #622 from 0xProject/geth-devnet-rebase-on-v2Alex Browne2018-06-0746-872/+1402
|\ \ \ \ \ \ | | | | | | | | | | | | | | Run contract tests against private Geth network
| * | | | | | 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 ↵Alex Browne2018-06-0712-170/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction
| * | | | | | 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 logic
| * | | | | | 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 a documentation page for ethereum-types package
| * | | | | | 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
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | feature/improve-linting
* | | | | | | Merge pull request #657 from 0xProject/feature/build-speedLeonid Logvinov2018-06-0714-19/+29
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Speedup CI builds
| * | | | | | 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
| | | |\ \ \ | |_|_|/ / / |/| | | | | | | | | | | feature/improve-linting
| | | * | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 15:12:12 +0800