aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #572 from 0xProject/feature/contracts/atomicMatchingGreg Hysen2018-05-2280-538/+3162
|\
| * Removed debug line from chai_setup. Its failing linter and does not appear to...Greg Hysen2018-05-221-8/+0
| * Ran prettierGreg Hysen2018-05-2216-7692/+7892
| * Added getNullFillResultsGreg Hysen2018-05-194-15/+30
| * orderFilledAmount -> orderTakerAssetFilledAmountGreg Hysen2018-05-199-61/+61
| * Style improvements to order matchingGreg Hysen2018-05-195-38/+27
| * Upgraded to Solidity 0.4.24Greg Hysen2018-05-1965-206/+221
| * Rebased against v2-prototypeGreg Hysen2018-05-1922-7557/+7708
| * Changed calculateFillResults to public visibility so that it can be used by t...Greg Hysen2018-05-193-131/+131
| * Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ...Greg Hysen2018-05-192-138/+126
| * Wording of calculateMatchedFillResultsGreg Hysen2018-05-191-9/+11
| * Cleaned up interface for decoding proxy data. Added a general decoder, which ...Greg Hysen2018-05-193-17/+63
| * Style improvements to the match orders typescript test classGreg Hysen2018-05-191-18/+14
| * Removed redundant log decode callGreg Hysen2018-05-191-2/+0
| * The OrderInfo struct is now returned by the getOrderInfo functionGreg Hysen2018-05-198-141/+98
| * Updated order of settleMatchedOrders to align with settleOrderGreg Hysen2018-05-193-8/+8
| * IExchange inherits from all other interfaces (in the same order as Exchange i...Greg Hysen2018-05-191-6/+10
| * Renamed takerAssetFilledAmount to orderFilledAmount to more easily distinguis...Greg Hysen2018-05-193-37/+37
| * Comments for readability in exchange core and mixin match ordersGreg Hysen2018-05-195-4/+11
| * Renamed "validate" functions to "assert" in mixin match.Greg Hysen2018-05-195-21/+21
| * Throw if the left or right orders do not compute the correct fill results. I ...Greg Hysen2018-05-195-37/+27
| * Removed redundant status checks in matchOrders. Saves gas, plus follows patte...Greg Hysen2018-05-191-8/+0
| * Token -> Asset in fillOrder specGreg Hysen2018-05-191-1/+1
| * Reordered functions in mixin exchange core -- getOrderInfo is at the bottomGreg Hysen2018-05-192-77/+77
| * Changes based on style guidelines put out by AmirGreg Hysen2018-05-199-172/+210
| * Reordered fund transfers for matched orders, plus added an extra sanity check...Greg Hysen2018-05-193-35/+49
| * Style changes to atomic order matchingGreg Hysen2018-05-1911-306/+288
| * Added require reasons to MixinMatchOrders and cleaned up some comments.Greg Hysen2018-05-196-40/+75
| * Updated remaining contracts to v0.4.23Greg Hysen2018-05-194-4/+4
| * Removed isRoundingError from mixin headerGreg Hysen2018-05-191-10/+1
| * Atomic Order Matching - TestsGreg Hysen2018-05-1910-33/+1412
| * Atomic Order Matching - Smart Contracts.Greg Hysen2018-05-1913-114/+957
* | merge developmentFabio Berger2018-05-2287-45/+125
|\ \ | |/ |/|
| * Merge pull request #597 from 0xProject/make-promises-safeAlex Browne2018-05-1887-37/+126
| |\
| | * Use make-promises-safe to catch unhandled rejections in testsAlex Browne2018-05-1787-37/+126
| * | Remove "Order utils" from menu for nowFabio Berger2018-05-171-6/+0
| * | Fix top tokens keyBrandon Millman2018-05-171-2/+8
| |/
| * Improve about page descriptionsfragosti2018-05-177-45/+9
* | Merge pull request #598 from 0xProject/feature/website/mobile-optimizeBrandon Millman2018-05-1919-94/+297
|\ \
| * | PrettierBrandon Millman2018-05-191-1/+3
| * | Change number of columns in relayer index for small screensBrandon Millman2018-05-191-1/+1
| * | Wallet instead of balances for small screensBrandon Millman2018-05-191-23/+21
| * | Close drawer when new path is chosenBrandon Millman2018-05-191-0/+7
| * | Fix styling of portal menuBrandon Millman2018-05-194-20/+37
| * | Refactor portal specific colors out of react-sharedBrandon Millman2018-05-1912-25/+46
| * | Add custom styling for drawerBrandon Millman2018-05-193-16/+106
| * | Fix key issue for portal routesBrandon Millman2018-05-191-1/+7
| * | Fix responsiveness broken in rebaseBrandon Millman2018-05-191-13/+33
| * | Set up scaffolding for new drawerBrandon Millman2018-05-193-9/+28
| * | Hide wallet component for small screensBrandon Millman2018-05-191-0/+2
| * | Fix token link keyBrandon Millman2018-05-191-2/+8
| * | Modulate number of columns based on screenwidthBrandon Millman2018-05-192-4/+19
|/ /
* | Fix prettierBrandon Millman2018-05-1919-7366/+7564
* | Merge pull request #583 from 0xProject/bug/contracts/erc721-encoded-padJacob Evans2018-05-181-1/+2
|\ \
| * | Pad to 32 if asset ids are smallJacob Evans2018-05-101-1/+2
* | | Change my title to clarifyfragosti2018-05-181-1/+1
* | | Merge pull request #596 from 0xProject/feature/website/weth-eth-conversion-er...Francesco Agosti2018-05-186-43/+104
|\ \ \
| * | | Center all the thingsfragosti2018-05-184-11/+46
| * | | Refactor code in response to CR feedbackfragosti2018-05-185-15/+12
| * | | Remove duplicate function call to validatefragosti2018-05-181-1/+1
| * | | Show error messages in the wrapped ether itemfragosti2018-05-186-23/+52
| * | | Improve about page descriptionsfragosti2018-05-181-3/+3
|/ / /
* | | Merge pull request #586 from 0xProject/feature/website/manage-wallet-2Brandon Millman2018-05-1811-114/+502
|\ \ \
| * | | Fix tslint false positiveBrandon Millman2018-05-181-2/+9
| * | | Fix spreadBrandon Millman2018-05-181-1/+1
| * | | Refactor account management itmesBrandon Millman2018-05-181-74/+70
| * | | Add loading componentBrandon Millman2018-05-183-50/+77
| * | | Refactor a bunch of layouts into their own filesBrandon Millman2018-05-186-139/+176
| * | | Add portal layout componentBrandon Millman2018-05-181-31/+36
| * | | Get rid of extra curly bracketsBrandon Millman2018-05-181-9/+9
| * | | Fix lint errorBrandon Millman2018-05-181-2/+1
| * | | Fix commentsBrandon Millman2018-05-183-4/+10
| * | | Wait for blockchain to display the account management routesBrandon Millman2018-05-184-47/+78
| * | | Fix linter errors and relayer index reloadingBrandon Millman2018-05-183-14/+17
| * | | Trade direct routeBrandon Millman2018-05-182-44/+37
| * | | Add manage you wallet footerBrandon Millman2018-05-181-24/+41
| * | | Add props to back buttonBrandon Millman2018-05-181-9/+13
| * | | Back button and title componentsBrandon Millman2018-05-183-64/+112
| * | | Implement new menu stylingBrandon Millman2018-05-182-4/+95
| * | | Add menuBrandon Millman2018-05-182-20/+41
| * | | Add routesBrandon Millman2018-05-181-2/+105
|/ / /
* | | Update yarn.lockFabio Berger2018-05-171-15/+3
* | | Merge branch 'development' into v2-prototypeFabio Berger2018-05-16236-1184/+2191
|\ \ \ | | |/ | |/|
| * | Do not remove artifacts when running `clean`Fabio Berger2018-05-161-1/+1
| * | Merge pull request #593 from 0xProject/bug/website/fix-cirular-dependencyFrancesco Agosti2018-05-163-11/+13
| |\ \
| | * | fix style errorsfragosti2018-05-162-2/+2
| | * | Fix circular dependencyfragosti2018-05-163-11/+13
| * | | Merge pull request #592 from 0xProject/feature/website/add-francesco-aboutFrancesco Agosti2018-05-162-3/+11
| |\ \ \ | | |/ / | |/| |
| | * | Add my profile image to imagesfragosti2018-05-161-0/+0
| | * | Add myself to about pagefragosti2018-05-161-3/+11
| * | | Add dogfood configs to websiteBrandon Millman2018-05-164-2/+10
| |/ /
| * | Merge pull request #578 from 0xProject/document-node-versionAlex Browne2018-05-1629-6/+86
| |\ \
| | * | Change minimum Node version to 6.12Alex Browne2018-05-1530-38/+38
| | * | Document Node.js version requirement and add it to package.jsonAlex Browne2018-05-1530-15/+95
| * | | Merge pull request #588 from 0xProject/improvement/use-wsrunFabio Berger2018-05-1573-469/+367
| |\ \ \
| | * | | Revert to lerna:run lintFabio Berger2018-05-152-1/+2
| | * | | Do lint sequentiallyFabio Berger2018-05-151-1/+1
| | * | | Exclude monorepo-scripts from tslint as testFabio Berger2018-05-151-1/+1
| | * | | Fix prettierFabio Berger2018-05-152-2/+14
| | * | | Merge developmentFabio Berger2018-05-155-16/+54
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Add hover state to top tokensBrandon Millman2018-05-151-10/+43
| * | | | Change to weekly txn volumeBrandon Millman2018-05-152-4/+4
| | |/ / | |/| |
| * | | Merge pull request #590 from 0xProject/fix-prettierAlex Browne2018-05-152-2/+7
| |\ \ \
| | * | | Apply prettier to some files which were not formatted correctlyAlex Browne2018-05-152-2/+7
| |/ / /
| * | | Fix TSLint issuesFabio Berger2018-05-159-19/+28
| | * | Merge branch 'development' into improvement/use-wsrunFabio Berger2018-05-152-54/+986
| | |\ \ | | |/ / | |/| |
| * | | Update ethereeumjs-testrpc to ganache-cliLeonid Logvinov2018-05-152-63/+986
| | * | Fix TSLint issuesFabio Berger2018-05-159-19/+28
| | * | Fix infinite loopFabio Berger2018-05-151-3/+3
| | * | Add changelog entries for packages where executable binary exporting fixedFabio Berger2018-05-153-0/+27
| | * | Rename bin to server in testnet-faucets since bin is no longer gitignoredFabio Berger2018-05-154-6/+8
| | * | Fix sra-report binaryFabio Berger2018-05-152-1/+3
| | * | rename build:watch to watch and remove build from docs:stageFabio Berger2018-05-151-2/+2
| | * | Fix sol-compiler binary so it can be called directly from packagesFabio Berger2018-05-155-4/+6
| | * | Fix abi-gen binary so it can be called directly from packagesFabio Berger2018-05-1510-11/+17
| | * | Remove build from docs:stage commandsFabio Berger2018-05-157-7/+7
| | * | Move from using lerna multi-package commands to wsrun, update README's accord...Fabio Berger2018-05-1563-449/+286
| |/ /
| * | Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2018-05-14153-600/+655
| |\ \
| | * \ Merge pull request #585 from 0xProject/feature/typedefLeonid Logvinov2018-05-14153-600/+655
| | |\ \
| | | * | Add missing type definitionsLeonid Logvinov2018-05-14153-600/+655
| | |/ /
| * / / Remove tslint-config as dep to monorepo-scripts to avoid circular dependency....Fabio Berger2018-05-142-2/+1
| |/ /
* | | Do not remove artifacts when running `clean`Fabio Berger2018-05-161-1/+1
* | | Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-16418-9053/+26371
|\| | | |/ |/|
| * Merge pull request #579 from 0xProject/breakUp0xjsFabio Berger2018-05-12172-1420/+16417
| |\
| | * Add missing .gitkeepsFabio Berger2018-05-122-0/+0
| | * Revert "Remove gitkeeps"Fabio Berger2018-05-1213-0/+0
| | * improve wordingFabio Berger2018-05-121-1/+1
| | * Remove gitkeepsFabio Berger2018-05-1113-0/+0
| | * Create coverage dir if doesn't existFabio Berger2018-05-112-0/+8
| | * Add compilerSettings to compiler.jsonFabio Berger2018-05-111-1/+14
| | * Add deployedBytecode to artifacts since it is needed by sol-covFabio Berger2018-05-1114-56/+140
| | * Revert throw conditions since it messes with the expected test timingFabio Berger2018-05-111-15/+3
| | * Revert back to hack, we need the configured web3WrapperFabio Berger2018-05-111-6/+7
| | * Add comment to TransactionReceiptWithDecodedLogs explaining that it doesn't a...Fabio Berger2018-05-111-0/+5
| | * Get rid of hackFabio Berger2018-05-111-7/+6
| | * Get networkId from web3WrapperFabio Berger2018-05-112-3/+3
| | * Throw if tx revertsFabio Berger2018-05-111-3/+15
| | * Remove unused methods and importsFabio Berger2018-05-112-31/+1
| | * Prettier ignore artifact filesFabio Berger2018-05-111-0/+2
| | * Add compiler depFabio Berger2018-05-111-0/+1
| | * Update yarn.lockFabio Berger2018-05-111-22/+0
| | * Fix versionFabio Berger2018-05-112-2/+2
| | * remove unused modulesFabio Berger2018-05-112-36/+0
| | * Fix depsFabio Berger2018-05-112-2/+2
| | * Fix prettierFabio Berger2018-05-114-10/+8
| | * Update artifactsFabio Berger2018-05-1124-7657/+5961
| | * Update yarn.lockFabio Berger2018-05-111-0/+22
| | * Update global_hooksFabio Berger2018-05-112-6/+28
| | * Remove legacy testFabio Berger2018-05-111-75/+0
| | * Merge branch 'development' into breakUp0xjsFabio Berger2018-05-11119-1108/+923
| | |\ | | |/ | |/|
| * | Merge pull request #574 from 0xProject/feature/rm-rf-deployerLeonid Logvinov2018-05-11129-1206/+890
| |\ \
| | * | Fix ganache subprovider configLeonid Logvinov2018-05-113-2/+5
| | * | Fix a bug in compiler config precedenceLeonid Logvinov2018-05-111-2/+4
| | * | Fix linter errorsLeonid Logvinov2018-05-1112-12/+12
| | * | Fix templatesLeonid Logvinov2018-05-107-7/+8
| | * | Remove unused deployer docs configsLeonid Logvinov2018-05-1030-130/+120
| | * | Add a legacy endpoint for the deployerLeonid Logvinov2018-05-102-0/+5
| | * | Add a check for compiler outputLeonid Logvinov2018-05-103-2/+4
| | * | Add a commentLeonid Logvinov2018-05-101-0/+2
| | * | Put ARTIFACTS_VERSION in a configLeonid Logvinov2018-05-102-1/+2
| | * | Improve a commentLeonid Logvinov2018-05-101-21/+21
| | * | Remove _applyDefaultsToDeployTxDataAsyncLeonid Logvinov2018-05-104-25/+13
| | * | Add a HACK commentLeonid Logvinov2018-05-101-0/+2
| | * | Fix linter issuesLeonid Logvinov2018-05-1049-183/+119
| | * | Rename deployer to sol-compilerLeonid Logvinov2018-05-1066-179/+142
| | * | Remove deployerLeonid Logvinov2018-05-1010-549/+16
| | * | Remove deployer from 0x.js and migrationsLeonid Logvinov2018-05-1011-58/+161
| | * | Configure migrations with a compiler.jsonLeonid Logvinov2018-05-103-6/+23
| | * | Remove deployer from metacoin and contract testsLeonid Logvinov2018-05-1028-204/+406
| * | | Merge pull request #580 from 0xProject/feature/website/remove-tokensBrandon Millman2018-05-112-12/+69
| |\ \ \ | | |/ / | |/| |
| | * | Update wallet footer and add remove token functionalityBrandon Millman2018-05-102-12/+69
| | | * Add missing version directory to pathFabio Berger2018-05-112-2/+2
| | | * Add artifacts to clean commandFabio Berger2018-05-118-8/+8
| | | * Remove unnecessary compile commandFabio Berger2018-05-111-1/+0
| | | * Standardize gitignores and remove `migrations/artifacts`Fabio Berger2018-05-111-7/+6
| | | * Commit v1 artifacts to migrations package and remove compile step from prebuildFabio Berger2018-05-1126-1/+7686
| | | * Replace mkdir with mkdirp so it also created any missing intermediate directo...Fabio Berger2018-05-114-3/+6
| | | * Fix path to artifactsFabio Berger2018-05-112-2/+2
| | | * Fix tslint errorsFabio Berger2018-05-102-2/+2
| | | * Add missing DummyTokenFabio Berger2018-05-101-1/+1
| | | * Merge branch 'development' into breakUp0xjsFabio Berger2018-05-1046-509/+983
| | | |\ | | |_|/ | |/| |
| * | | Add fallback image support to relayer grid tileBrandon Millman2018-05-101-2/+36
| * | | Clear relayer grid state when fetchingBrandon Millman2018-05-101-0/+6
| |/ /
| * | Configure the compiler to generate artifacts with deployedBytecodeLeonid Logvinov2018-05-102-1/+19
| * | Implement loading and error state for relayer gridBrandon Millman2018-05-101-10/+50
| * | Fallback image for relayer grid tileBrandon Millman2018-05-102-2/+3
| * | Change relayer grid tile to link on headerBrandon Millman2018-05-101-17/+17
| * | Merge pull request #576 from 0xProject/feature/website/top-tokensBrandon Millman2018-05-093-41/+17
| |\ \
| | * | Display top tokens from backendBrandon Millman2018-05-093-41/+17
| * | | Merge pull request #557 from 0xProject/feature/website/top-bar-redesignBrandon Millman2018-05-094-56/+57
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'development' into feature/website/top-bar-redesignBrandon Millman2018-05-094-79/+92
| | |\ \ | | |/ / | |/| |
| * | | Remove overflowZ property from portalBrandon Millman2018-05-091-1/+0
| * | | Merge pull request #570 from 0xProject/feature/website/wallet-add-tokensBrandon Millman2018-05-094-79/+92
| |\ \ \
| | * | | Fix typoBrandon Millman2018-05-091-1/+1
| | * | | Only show untracked tokensBrandon Millman2018-05-091-1/+1
| | * | | Make wallet scrollableBrandon Millman2018-05-091-9/+48
| | * | | Add token flowBrandon Millman2018-05-094-69/+43
| |/ / /
| | * | Suggestions and fix bad mergeBrandon Millman2018-05-092-21/+6
| | * | Merge branch 'development' into feature/website/top-bar-redesignBrandon Millman2018-05-09171-6159/+2597
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #556 from 0xProject/feature/website/portal-v2Brandon Millman2018-05-093-3/+326
| |\ \ \
| | * | | Add headers to wallet and relayer indexBrandon Millman2018-05-052-2/+12
| | * | | Add scrolling to relayer indexBrandon Millman2018-05-052-2/+8
| | * | | Lay out wallet and relayersBrandon Millman2018-05-053-3/+310
| * | | | Update The Ocean logoFabio Berger2018-05-081-0/+0
| * | | | Merge pull request #537 from 0xProject/feature/artifacts-v2Leonid Logvinov2018-05-0731-305/+368
| |\ \ \ \
| | * | | | Fix artifacts pathsLeonid Logvinov2018-05-074-5/+5
| | * | | | Create an artifacts folderLeonid Logvinov2018-05-071-0/+0
| | * | | | Introduce a varLeonid Logvinov2018-05-071-2/+4
| | * | | | Add removeHexPrefix util methodLeonid Logvinov2018-05-072-6/+6
| | * | | | CHeck if ABI existsLeonid Logvinov2018-05-071-0/+6
| | * | | | Improve the readability of the check for should compileLeonid Logvinov2018-05-073-6/+7
| | * | | | Use named constantsLeonid Logvinov2018-05-071-3/+6
| | * | | | Add a commentLeonid Logvinov2018-05-071-0/+3
| | * | | | Fix commentsLeonid Logvinov2018-05-071-2/+2
| | * | | | Rename args to constructor-argsLeonid Logvinov2018-05-071-2/+2
| | * | | | Fix a typoLeonid Logvinov2018-05-071-1/+1
| | * | | | Define a separator constLeonid Logvinov2018-05-072-4/+5
| | * | | | Move artifacts from src/artifacts to artifacts/v1Leonid Logvinov2018-05-072-2/+2
| | * | | | Fix sol-cov to work with the new artifacts formatLeonid Logvinov2018-05-072-25/+30
| | * | | | Implement new artifacts formatLeonid Logvinov2018-05-0724-271/+313
| |/ / / /
| | | * | ProviderDisplay changesBrandon Millman2018-04-242-37/+28
| | | * | Top bar expanded display typeBrandon Millman2018-04-242-17/+33
| | | * | Relayer grid spacing tweaksBrandon Millman2018-04-241-2/+2
| | | * | Add headers to wallet and relayer indexBrandon Millman2018-04-242-2/+12
| | | * | Add scrolling to relayer indexBrandon Millman2018-04-242-2/+8
| | | * | Lay out wallet and relayersBrandon Millman2018-04-243-3/+310
| | | | * Add missing uuid typesFabio Berger2018-05-101-0/+1
| | | | * Fix type error for latched on propertyFabio Berger2018-05-101-1/+1
| | | | * Add generated contracts in contract-wrappers to gitignoreFabio Berger2018-05-101-0/+1
| | | | * Rename zeroExContract... to contractWrappers...Fabio Berger2018-05-108-17/+17
| | | | * Update yarn.lockFabio Berger2018-05-101-24/+1
| | | | * Add missing quoteFabio Berger2018-05-109-9/+9
| | | | * Add PR numberFabio Berger2018-05-102-2/+4
| | | | * Remove provider instance variableFabio Berger2018-05-101-10/+7
| | | | * Add var returnsFabio Berger2018-05-103-8/+14
| | | | * Remove unneeded tslint disableFabio Berger2018-05-102-3/+0
| | | | * Remove uneeded tslint configFabio Berger2018-05-109-9/+9
| | | | * Remove generated contract wrappersFabio Berger2018-05-106-3842/+0
| | | | * Remove extra tslint configFabio Berger2018-05-102-2/+2
| | | | * Improve createOrderWatcherAsyncFabio Berger2018-05-101-4/+5
| | | | * Fix no-any-propagationFabio Berger2018-05-102-3/+4
| | | | * Remove unnecessary tslint configFabio Berger2018-05-107-7/+7
| | | | * Add pr number to changelogsFabio Berger2018-05-104-5/+12
| | | | * Fix website and 0x.js docsFabio Berger2018-05-104-40/+41
| | | | * Remove last artifactFabio Berger2018-05-101-39/+0
| | | | * Remove artifactsFabio Berger2018-05-1013-5490/+0
| | | | * Fix package.jsonFabio Berger2018-05-101-1/+1
| | | | * Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a unifyin...Fabio Berger2018-05-10168-1350/+19671
| | |_|/ | |/| |
| * | | Publishcontracts@2.1.28@0xproject/website@0.0.32@0xproject/testnet-faucets@1.0.29@0xproject/sra-report@0.0.14@0xproject/sol-resolver@0.0.4@0xproject/react-docs-example@0.0.11@0xproject/migrations@0.0.5@0xproject/metacoin@0.0.6@0xproject/dev-utils@0.4.1@0xproject/base-contract@0.3.1Leonid Logvinov2018-05-0525-130/+130
| * | | Updated CHANGELOGSLeonid Logvinov2018-05-0540-0/+260
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 07:29:40 +0800