aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't wait con contract tests to submit coverageLeonid Logvinov2018-06-011-1/+0
* Keep node versions consistentLeonid Logvinov2018-06-011-5/+5
* Split tests into two bucketsLeonid Logvinov2018-06-011-25/+23
* Use a newer version of node/yarn to speed-up deps instaationLeonid Logvinov2018-06-013-77/+167
* Try to cache dependenciesLeonid Logvinov2018-06-011-15/+12
* Combine lint and pretttier tests togetherLeonid Logvinov2018-06-011-17/+3
* Rebalance testsLeonid Logvinov2018-06-011-25/+10
* Merge pull request #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
* | Merge pull request #561 from 0xProject/feature/contracts/txoriginAmir Bandeali2018-05-3146-154/+955
|\ \
| * | 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-3123-277/+530
|\ \ | |/ |/|
| * Merge pull request #638 from 0xProject/feature/website/onboarding-eth-flowFrancesco Agosti2018-05-317-47/+121
| |\
| | * 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-302-80/+2
| * 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-306-56/+96
| * 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
* | Merge pull request #621 from 0xProject/feature/compiler-assertionsLeonid Logvinov2018-05-306-7/+56
|\ \
| * | 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 registry overrideLeonid Logvinov2018-05-261-3/+0
| * | Revert "Change the registry in yarn.lock"Leonid Logvinov2018-05-261-1995/+1995
| * | Change the registry in yarn.lockLeonid Logvinov2018-05-261-1995/+1995
| * | Remove contracts -> @0xproject/order-utils dependencyLeonid Logvinov2018-05-266-103/+89
| |/
* / 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-252-1/+22
* | 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 pull request #575 from 0xProject/feature/contracts/eip712-order-hashFabio Berger2018-05-256-2331/+2368
|\ \
| * \ Merge branch 'v2-prototype' into feature/contracts/eip712-order-hashFabio Berger2018-05-2539-128/+287
| |\ \ | |/ / |/| |
* | | Merge pull request #618 from 0xProject/feature/v2-migrationsLeonid Logvinov2018-05-2538-126/+285
|\ \ \
| * | | 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-253-4/+13
| * | | Migrate migrations to v2Leonid Logvinov2018-05-2533-122/+271
* | | | Temporarily disable installation testsLeonid Logvinov2018-05-251-3/+3
| |_|/ |/| |
| | * 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-252-9/+1
|\ \
| * | Disable contracts coverage on CILeonid Logvinov2018-05-252-9/+1
| |/
* | Merge pull request #607 from 0xProject/feature/website/onboarding-setupFrancesco Agosti2018-05-2517-41/+420
|\ \
| * | 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-2517-38/+350
|/ /
* | Merge pull request #612 from 0xProject/feature/website/add-redux-devtoolsFrancesco Agosti2018-05-253-1/+7
|\ \ | |/ |/|
| * Move to deps from devDeps and use in development onlyfragosti2018-05-232-2/+2
| * Add redux-devtools-extension to projectfragosti2018-05-233-2/+8
* | Merge pull request #615 from 0xProject/refactor/json-schemas/for-v2Fabio Berger2018-05-2516-112/+83
|\ \
| * | Change all `wsrun` commands so that they fast-exit (e.g any one failing stops...Fabio Berger2018-05-241-6/+6
| * | Have source-map-loader ignore node_modules packagesFabio Berger2018-05-241-1/+6
| * | Revert to an earlier version that worksFabio Berger2018-05-248-11/+11
| * | 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-248-7/+16
| * | Merge branch 'v2-prototype' into refactor/json-schemas/for-v2Fabio Berger2018-05-241-0/+1
| |\ \
| * | | 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
| |/ / /
* | | | Merge pull request #603 from 0xProject/feature/website/wallet-flex-boxBrandon Millman2018-05-244-129/+161
|\ \ \ \ | |_|/ / |/| | |
| * | | 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-24233-1250/+2528
| |\| |
| * | | 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 #614 from 0xProject/bug/prettier/ignore-v2-artifactsFabio Berger2018-05-241-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Ignore v2 artifactsJacob Evans2018-05-241-0/+1
|/ / /
* | | Add missing dep to websiteFabio Berger2018-05-241-0/+1
* | | Merge pull request #589 from 0xProject/feature/truffle-sol-covFabio Berger2018-05-2455-229/+615
|\ \ \
| * | | Upgrade solidity parserLeonid Logvinov2018-05-242-4/+4
| * | | 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
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #611 from 0xProject/feature/remove-0x-from=-websiteLeonid Logvinov2018-05-2424-119/+136
|\ \ \ \
| * | | | 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
|/ / / /
* | | | Merge pull request #609 from 0xProject/refactor/contracts/remove0xjsDepFabio Berger2018-05-2424-296/+275
|\ \ \ \
| * | | | 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-2382-264/+560
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Fix TokenTransferProxy artifact name since it's now suffixed with _v1Fabio Berger2018-05-233-3/+3
* | | | | Merge pull request #610 from 0xProject/feature/sra-report-without-0xLeonid Logvinov2018-05-232-3/+5
|\ \ \ \ \
| * | | | | Remove 0x.js dependency from sra-reportLeonid Logvinov2018-05-232-3/+5
|/ / / / /
| * | | | Update yarn.lockFabio Berger2018-05-231-117/+0
| * | | | 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-2331-221/+526
| |\ \ \ \
| * | | | | Update artifactFabio Berger2018-05-231-14/+14
| * | | | | Fix tsutils versionFabio Berger2018-05-231-0/+6
| * | | | | Remove 0x.js dep from contractsFabio Berger2018-05-2325-267/+353
| | | * | | 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
| | | * | | Merge branch 'v2-prototype' into feature/truffle-sol-covLeonid Logvinov2018-05-230-0/+0
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'development' into v2-prototypeLeonid Logvinov2018-05-2381-262/+556
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | PublishLeonid Logvinov2018-05-2330-230/+230
| * | | | | Updated CHANGELOGSLeonid Logvinov2018-05-231-1/+1
| * | | | | Updated CHANGELOGSLeonid Logvinov2018-05-2350-30/+324
| * | | | | Change publish command nameLeonid Logvinov2018-05-231-2/+2
| | | * | | 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-233-15/+17
| | | * | | PublishLeonid Logvinov2018-05-2330-230/+229
| | | * | | Updated CHANGELOGSLeonid Logvinov2018-05-231-0/+1
| | | * | | Updated CHANGELOGSLeonid Logvinov2018-05-2350-30/+324
| | | * | | Change publish command nameLeonid Logvinov2018-05-231-2/+2
| | | * | | 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-2313-41/+87
|\ \ \ \ \
| * \ \ \ \ Merge pull request #605 from 0xProject/fix/multiple/build-errorsFabio Berger2018-05-2313-41/+87
| |\ \ \ \ \
| | * | | | | Update artifactsRemco Bloemen2018-05-221-14/+14
| | * | | | | Update yarn.lockRemco Bloemen2018-05-221-3/+29
| | * | | | | 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-232-1/+7
| |_|/ / |/| | |
* | | | 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
| |\ \
| | * | Make lint run in parallelFabio Berger2018-05-221-1/+1
| | * | 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-1635-16/+114
| | |\ \ \
| | * | | | 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
| | * | | | Run linter sequentiallyFabio Berger2018-05-161-1/+1
* | | | | | 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