aboutsummaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Expand)AuthorAgeFilesLines
* Introduce ethereum-types packageLeonid Logvinov2018-06-0181-361/+511
* Merge pull request #641 from 0xProject/feature/remove-typesLeonid Logvinov2018-06-0118-441/+21
|\
| * Add changelog entry for typescript-typingsLeonid Logvinov2018-06-011-8/+8
| * Remove some typesLeonid Logvinov2018-06-0114-421/+11
| * Remove published typesLeonid Logvinov2018-06-014-12/+2
* | Fix buildAmir Bandeali2018-06-011-1/+1
|/
* Merge pull request #640 from 0xProject/await-transaction-successAlex Browne2018-05-315-25/+64
|\
| * Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapperAlex Browne2018-05-312-5/+7
| * Add awaitTransactionSuccess where neededAlex Browne2018-05-314-22/+59
* | Check length before accessing indices, add awaitTransactionSuccess where need...Amir Bandeali2018-05-315-25/+43
* | Add back before/after snapshots for each testAmir Bandeali2018-05-3116-0/+97
* | Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMITAmir Bandeali2018-05-318-10/+10
* | Make preSigned and allowedValidators mappings publicAmir Bandeali2018-05-311-2/+2
* | Change names of signature typesAmir Bandeali2018-05-312-6/+6
* | Fix formatting and testsAmir Bandeali2018-05-3118-94/+16
* | Make AssetProxyId last byte of assetDataAmir Bandeali2018-05-3118-37/+74
* | Add signer to txHash, allow approveValidator to be used with executeTransactionAmir Bandeali2018-05-313-7/+10
* | Update WhitelistAmir Bandeali2018-05-317-24/+335
* | Fix Exchange interfaceAmir Bandeali2018-05-311-7/+5
* | Increase block gas limitAmir Bandeali2018-05-312-1/+2
* | Use last byte of signature as signature typeAmir Bandeali2018-05-318-106/+103
* | Remove TxOrigin signature type, modify whitelist to use Validator signature typeAmir Bandeali2018-05-317-35/+35
* | Update Whitelist contract with comments, also require maker to be whitelistedAmir Bandeali2018-05-315-16/+72
* | Fix buildAmir Bandeali2018-05-313-19/+24
* | Add example whitelist contract and minimum testsAmir Bandeali2018-05-313-11/+121
* | Add sample whitelist contractAmir Bandeali2018-05-313-1/+60
* | Add TxOrigin signature type and rearrange order of typesAmir Bandeali2018-05-313-63/+77
* | Add approveValidator functionAmir Bandeali2018-05-312-2/+17
* | Add Validator signature typeAmir Bandeali2018-05-314-3/+69
* | Add deepCopyBytes method to LibBytesAmir Bandeali2018-05-313-0/+92
* | Merge pull request #639 from 0xProject/fix/contracts/multisigWrapperAmir Bandeali2018-05-313-50/+62
|\ \
| * | Change logDecoder back into class, remove awaitTransactionMined from multiSig...Amir Bandeali2018-05-313-50/+62
| |/
* | Merge pull request #635 from 0xProject/feature/website/custom-onboarding-tooltipFrancesco Agosti2018-05-3122-197/+501
|\ \ | |/ |/|
| * Onboarding: implement add ETH step, and stub for add WETH stepfragosti2018-05-307-47/+121
| * Address PR feedbackfragosti2018-05-307-40/+41
| * Remove react-joyride from depsfragosti2018-05-301-1/+0
| * Add entry to CHANGELOG.jsonfragosti2018-05-301-0/+8
| * Remove blacklist conceptfragosti2018-05-304-66/+20
| * Some cleanupfragosti2018-05-302-11/+13
| * Improve tooltip lookfragosti2018-05-307-13/+69
| * Add types for react-popper, remove types for react-joyridefragosti2018-05-304-105/+62
| * Replace react-joyride with react-popperfragosti2018-05-305-53/+67
| * Write custom tooltip componentfragosti2018-05-263-7/+57
| * Run linterfragosti2018-05-262-2/+5
| * Add localstorage helperfragosti2018-05-261-0/+16
| * Add next buttonfragosti2018-05-263-2/+13
| * Auto-show onboarding flow on first page viewfragosti2018-05-265-7/+53
| * Add ability to blacklist onboarding stepsfragosti2018-05-263-34/+92
| * Fix PortalOnboardingFlowPropsfragosti2018-05-261-1/+0
| * Implement metamask installation flowfragosti2018-05-266-19/+75
* | Fix unselected relayer drawer itemBrandon Millman2018-05-301-1/+1
* | Add a CHANGELOG entryLeonid Logvinov2018-05-301-0/+4
* | Make opts param optional in CompilerLeonid Logvinov2018-05-301-6/+7
* | Throw if trying to schema-validate an undefinedLeonid Logvinov2018-05-301-0/+3
* | Add CHANGELOG entryLeonid Logvinov2018-05-302-1/+10
* | Add schema assertions on public methods of @0xproject/sol-compilerLeonid Logvinov2018-05-304-1/+33
* | Merge pull request #625 from 0xProject/feature/contracts-without-contract-wra...Fabio Berger2018-05-265-103/+86
|\ \
| * | Remove contracts -> @0xproject/order-utils dependencyLeonid Logvinov2018-05-265-103/+86
| |/
* / Hide wallet management option and expand component on small screensBrandon Millman2018-05-262-15/+23
|/
* Merge pull request #620 from 0xProject/feature/website/relayer-emptyBrandon Millman2018-05-253-9/+31
|\
| * Implement design for relayers with no volume or tokensBrandon Millman2018-05-253-9/+31
* | Fix imports in order_utilsLeonid Logvinov2018-05-251-1/+1
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-2523-397/+1421
|\ \
| * | Use web3-wrapper instead of 0x.js, update logDecoderAmir Bandeali2018-05-257-49/+48
| * | Cleanup testsAmir Bandeali2018-05-254-6/+12
| * | Add errMsg when throwing on unrecognized errorAmir Bandeali2018-05-251-1/+1
| * | Move readFirst4 to LibBytesAmir Bandeali2018-05-255-39/+53
| * | Add old MultiSig to previous contracts, cleanup file structureAmir Bandeali2018-05-257-16/+16
| * | Fix buildAmir Bandeali2018-05-256-13/+882
| * | Address feedback, rename contract to AssetProxyOwnerAmir Bandeali2018-05-256-33/+37
| * | Update multisig tests and utilsAmir Bandeali2018-05-254-253/+355
| * | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress to use a mappi...Amir Bandeali2018-05-251-18/+48
| |/
* | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hashFabio Berger2018-05-2536-124/+275
|\ \
| * \ Merge pull request #618 from 0xProject/feature/v2-migrationsLeonid Logvinov2018-05-2536-125/+276
| |\ \ | | |/ | |/|
| | * Pin connect in sra-reportLeonid Logvinov2018-05-251-1/+1
| | * Fix a typoLeonid Logvinov2018-05-251-2/+2
| | * Pin types in sra-reportLeonid Logvinov2018-05-251-1/+1
| | * Fix linter issuesLeonid Logvinov2018-05-253-3/+3
| | * Unpin types version in @0xproject/connectLeonid Logvinov2018-05-253-3/+3
| | * Pin types version in websiteLeonid Logvinov2018-05-251-0/+1
| | * Do a fake version bump on types so that yarn doesn't try to install updated v...Leonid Logvinov2018-05-252-1/+10
| | * Migrate migrations to v2Leonid Logvinov2018-05-2531-121/+262
* | | Use domain separator for exchange addressJacob Evans2018-05-256-2300/+2314
* | | publicGetOrderSchemaHash -> getOrderSchemaHashJacob Evans2018-05-252-2/+2
* | | Update order hash to match latest eip712Jacob Evans2018-05-254-34/+57
|/ /
* | Merge pull request #617 from 0xProject/feature/no-coverage-ci-contractsLeonid Logvinov2018-05-251-1/+1
|\ \
| * | Disable contracts coverage on CILeonid Logvinov2018-05-251-1/+1
| |/
* | Improve OnboardingFlow API and typescript typesfragosti2018-05-254-14/+27
* | Address PR feedbackfragosti2018-05-258-38/+54
* | Undo change to react-highlightfragosti2018-05-251-1/+0
* | Fix build errorsfragosti2018-05-253-13/+14
* | Fix issue where modal can be out of sync with app statefragosti2018-05-257-18/+56
* | Basic onboarding flow infrastructure set upfragosti2018-05-2516-37/+268
* | Merge pull request #612 from 0xProject/feature/website/add-redux-devtoolsFrancesco Agosti2018-05-252-1/+3
|\ \ | |/ |/|
| * Move to deps from devDeps and use in development onlyfragosti2018-05-232-2/+2
| * Add redux-devtools-extension to projectfragosti2018-05-232-2/+4
* | Merge pull request #615 from 0xProject/refactor/json-schemas/for-v2Fabio Berger2018-05-2514-106/+68
|\ \
| * | Have source-map-loader ignore node_modules packagesFabio Berger2018-05-241-1/+6
| * | Revert to an earlier version that worksFabio Berger2018-05-247-7/+7
| * | Force hex to have at least two hex values after the prefix, but it could be t...Fabio Berger2018-05-242-2/+2
| * | Fix Hex regex and testsFabio Berger2018-05-242-3/+4
| * | Remove the caret so it actually installs this versionFabio Berger2018-05-247-7/+7
| * | Add CHANGELOG entryFabio Berger2018-05-241-0/+10
| * | Updated Order, SignedOrder schemas, removed ECSignature schema types and adde...Fabio Berger2018-05-245-98/+44
| * | Bump all dependencies on json-schemas down a patch version so that they don't...Fabio Berger2018-05-247-7/+7
* | | Merge pull request #613 from 0xProject/check-tx-receipt-statusAlex Browne2018-05-2421-94/+144
|\ \ \
| * | | Change error message for awaitTransactionSuccessAsyncAlex Browne2018-05-241-1/+1
| * | | Check transaction receipt status codes where applicableAlex Browne2018-05-2421-94/+144
| |/ /
* | | Use visibility property instead of placeholder div in wrap ether itemBrandon Millman2018-05-241-7/+4
* | | Merge branch 'v2-prototype' into feature/website/wallet-flex-boxBrandon Millman2018-05-24231-1241/+2483
|\| |
| * | Add missing dep to websiteFabio Berger2018-05-241-0/+1
| * | Upgrade solidity parserLeonid Logvinov2018-05-241-1/+1
| * | Fix trace testLeonid Logvinov2018-05-241-1/+1
| * | Fix linter issuesLeonid Logvinov2018-05-242-4/+5
| * | Move contract utilsLeonid Logvinov2018-05-245-19/+19
| * | Merge branch 'v2-prototype' into feature/truffle-sol-covLeonid Logvinov2018-05-2455-424/+428
| |\ \
| | * | Fix prettierLeonid Logvinov2018-05-243-3/+9
| | * | Fix prettierLeonid Logvinov2018-05-242-6/+2
| | * | Remove 0x.js as a dependency from websiteLeonid Logvinov2018-05-2424-122/+137
| | * | Enable 0x.js testsFabio Berger2018-05-231-3/+1
| | * | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-232-2/+2
| | |\ \
| | | * | Fix small bug in order-utilsAlex Browne2018-05-231-1/+1
| | | * | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto...Fabio Berger2018-05-232-2/+2
| | | |\ \
| | | | * | Update dogfood urlBrandon Millman2018-05-232-2/+2
| | | * | | Fix Tslint error caused by "PromiseLike" valueFabio Berger2018-05-231-0/+6
| | | |/ /
| | * | | Fix Tslint error caused by "PromiseLike" valueFabio Berger2018-05-231-0/+6
| | * | | fix contract-wrappers versionFabio Berger2018-05-231-1/+1
| | * | | merge v2-prototypeFabio Berger2018-05-2381-262/+558
| | |\| |
| | | * | Fix TokenTransferProxy artifact name since it's now suffixed with _v1Fabio Berger2018-05-233-3/+3
| | | * | Remove 0x.js dependency from sra-reportLeonid Logvinov2018-05-232-3/+5
| | | * | Merge branch 'development' into v2-prototypeLeonid Logvinov2018-05-2380-260/+554
| | | |\ \
| | | | * | PublishLeonid Logvinov2018-05-2330-230/+230
| | | | * | Updated CHANGELOGSLeonid Logvinov2018-05-231-1/+1
| | | | * | Updated CHANGELOGSLeonid Logvinov2018-05-2350-30/+324
| | * | | | Fix signature verification testFabio Berger2018-05-231-1/+1
| | * | | | Fix TokenTransferProxy artifact name since it's now suffixed with _v1Fabio Berger2018-05-233-3/+3
| | * | | | Fix dep versionFabio Berger2018-05-231-1/+1
| | * | | | Fix importFabio Berger2018-05-231-1/+1
| | * | | | Fix await callsFabio Berger2018-05-231-12/+3
| | * | | | Refactor etherToken test to use contract-wrappersFabio Berger2018-05-231-22/+36
| | * | | | Fix ExchangeWrapperFabio Berger2018-05-236-14/+10
| | * | | | Fix importsFabio Berger2018-05-232-2/+1
| | * | | | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-2330-218/+497
| | |\| | |
| | * | | | Update artifactFabio Berger2018-05-231-14/+14
| | * | | | Remove 0x.js dep from contractsFabio Berger2018-05-2324-267/+236
| * | | | | Fix NameResolverLeonid Logvinov2018-05-241-4/+6
| * | | | | Address feedbackLeonid Logvinov2018-05-235-27/+39
| * | | | | Parse compiler.json in SolCompilerArtifactsAdapterLeonid Logvinov2018-05-232-6/+13
| * | | | | Add a more verbose comment for self-destructLeonid Logvinov2018-05-231-1/+5
| * | | | | Fix depth tracking in a tracerLeonid Logvinov2018-05-231-1/+16
| * | | | | Fix sol-compiler versionLeonid Logvinov2018-05-231-1/+1
| * | | | | Fix sol-cov testsLeonid Logvinov2018-05-232-2/+4
| * | | | | Fix a bug in CALL-like opcode handlingLeonid Logvinov2018-05-233-11/+22
| * | | | | Remove trace.jsonLeonid Logvinov2018-05-231-3227/+0
| * | | | | Suppport subcalls in constructorLeonid Logvinov2018-05-232-12/+28
| * | | | | Use BlockParamLiteral.LatestLeonid Logvinov2018-05-232-4/+8
| * | | | | Address feedbackLeonid Logvinov2018-05-238-35/+23
| * | | | | Use loglevel instead of verbose flagLeonid Logvinov2018-05-232-14/+12
| * | | | | PublishLeonid Logvinov2018-05-2330-230/+229
| * | | | | Updated CHANGELOGSLeonid Logvinov2018-05-231-0/+1
| * | | | | Updated CHANGELOGSLeonid Logvinov2018-05-2350-30/+324
| * | | | | Fix import pathsLeonid Logvinov2018-05-233-3/+3
| * | | | | Refactor ContractData lookupLeonid Logvinov2018-05-232-34/+33
| * | | | | Remove a commentLeonid Logvinov2018-05-231-1/+0
| * | | | | Use a hidden directory for temp artifactsLeonid Logvinov2018-05-232-2/+1
| * | | | | Match class names with file namesLeonid Logvinov2018-05-234-3/+3
| * | | | | Improve a CHANGELOG commentLeonid Logvinov2018-05-231-1/+1
| * | | | | Improve a CHANGELOG commentLeonid Logvinov2018-05-231-1/+1
| * | | | | Rename ZeroExArtifactAdapter to SolCompilerArtifactAdapterLeonid Logvinov2018-05-236-11/+11
| * | | | | Assign then passLeonid Logvinov2018-05-231-1/+2
| * | | | | Assign then returnLeonid Logvinov2018-05-231-1/+2
| * | | | | Introduce CONFIG_FILELeonid Logvinov2018-05-231-1/+2
| * | | | | Remove web3Factory.create and remove dev-tools dependency on sol-covLeonid Logvinov2018-05-2325-846/+3294
| * | | | | Add CHANGELOG entriesLeonid Logvinov2018-05-238-0/+836
| * | | | | Support all opcodes in a trace parserLeonid Logvinov2018-05-234-55/+45
| * | | | | Make sol-cov work with truffle and other artifact adaptersLeonid Logvinov2018-05-2314-89/+354
| * | | | | Only look at *.sol files in NameResolverLeonid Logvinov2018-05-231-2/+5
| * | | | | Fix a bug in FS resolver causing it to try reading directoriesLeonid Logvinov2018-05-231-1/+1
| * | | | | Add solcVersion to CompilerOptsLeonid Logvinov2018-05-233-4/+11
| | |/ / / | |/| | |
| * | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto...Fabio Berger2018-05-2316-175/+419
| |\ \ \ \
| | * \ \ \ Merge pull request #601 from 0xProject/contracts-test-fixesAlex Browne2018-05-2316-175/+419
| | |\ \ \ \
| | | * | | | Rename some variables in multi_sig_with_time_lock.tsAlex Browne2018-05-231-10/+10
| | | * | | | Remove extra awaitTransactionMinedAsync callsAlex Browne2018-05-231-4/+2
| | | * | | | Apply changes to test/exchange/match_orders.tsAlex Browne2018-05-221-6/+18
| | | * | | | Fix some unhandled promise rejectionsAlex Browne2018-05-222-4/+8
| | | * | | | Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-2210-155/+294
| | | * | | | Add missing blockchainLifecycle calls to contracts testsAlex Browne2018-05-2214-0/+91
| * | | | | | Fix tslint issuesFabio Berger2018-05-232-10/+13
| * | | | | | Add `are` to boolean naming conventionsFabio Berger2018-05-231-1/+1
| |/ / / / /
| * | | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto...Fabio Berger2018-05-2312-38/+58
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #605 from 0xProject/fix/multiple/build-errorsFabio Berger2018-05-2312-38/+58
| | |\ \ \ \ \
| | | * | | | | Update artifactsRemco Bloemen2018-05-221-14/+14
| | | * | | | | Fix warnings in MetacoinRemco Bloemen2018-05-221-3/+3
| | | * | | | | Upgrade UglifyJS to include ES6 supportRemco Bloemen2018-05-222-3/+10
| | | * | | | | Add CancelOrder and MatchOrder typesRemco Bloemen2018-05-222-3/+15
| | | * | | | | Add missing return typesRemco Bloemen2018-05-225-15/+15
| | | * | | | | Ignore classnames linter ruleRemco Bloemen2018-05-221-0/+1
| | | |/ / / /
| * | / / / / Fix tslintFabio Berger2018-05-232-4/+4
| |/ / / / /
| * | / / / Fix the tsutils version, fixing ts typings issueFabio Berger2018-05-231-1/+1
| | |/ / / | |/| | |
| * | | | merge developmentFabio Berger2018-05-2359-124/+418
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | remove generated contract_wrappers during cleanFabio Berger2018-05-231-1/+1
| | * | Merge pull request #594 from 0xProject/improvement/addCustomTslintRulesFabio Berger2018-05-2359-127/+421
| | |\ \
| | | * | Improve namingFabio Berger2018-05-172-5/+6
| | | * | Disable magic number rule in more places where it isn't helping code readabilityFabio Berger2018-05-172-14/+14
| | | * | Merge branch 'development' into improvement/addCustomTslintRulesFabio Berger2018-05-1710-54/+18
| | | |\ \
| | | * \ \ Merge branch 'development' into improvement/addCustomTslintRulesFabio Berger2018-05-1633-16/+109
| | | |\ \ \
| | | * | | | Fix commentsFabio Berger2018-05-161-2/+1
| | | * | | | Improve nameFabio Berger2018-05-161-2/+2
| | | * | | | Fix TSLint rulesFabio Berger2018-05-1655-133/+278
| | | * | | | Enforce new rules, including no-switch-case-fall-throughFabio Berger2018-05-161-0/+3
| | | * | | | Implement boolean variable naming custom TSLint ruleFabio Berger2018-05-161-0/+69
| | | * | | | Implement custom no-magic-numbers rule that doesn't include magic numbers pas...Fabio Berger2018-05-162-1/+78
* | | | | | | Add missing keyBrandon Millman2018-05-221-3/+6
* | | | | | | Use flexbox for wrapped ether itemBrandon Millman2018-05-221-21/+29
* | | | | | | Re add wrapped ether itemBrandon Millman2018-05-221-7/+24
* | | | | | | Rewrite balance rows using flex boxBrandon Millman2018-05-223-122/+129
|/ / / / / /
* | | | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatchingGreg Hysen2018-05-2279-532/+3138
|\ \ \ \ \ \
| * | | | | | 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-1964-206/+207
| * | | | | | 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-199-23/+1398
| * | | | | | Atomic Order Matching - Smart Contracts.Greg Hysen2018-05-1913-114/+957
| | |_|_|_|/ | |/| | | |
* | | | | | merge developmentFabio Berger2018-05-2286-45/+121
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge pull request #597 from 0xProject/make-promises-safeAlex Browne2018-05-1886-37/+122
| |\ \ \ \ | | |_|_|/ | |/| | |