aboutsummaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Expand)AuthorAgeFilesLines
* Move json_schemas to its own package (#1435)F. Eugene Aumson2019-01-0912-17/+17
|\
| * Correct inconsistencies in JSON schema namesF. Eugene Aumson2018-12-2912-17/+17
* | Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2019-01-091-2/+0
|\ \
| * | Remove beta note from asset-buyerSteve Klebanoff2019-01-091-2/+0
* | | Fix typoFabio Berger2019-01-095-5/+5
|/ /
* | Fixed merge conflict from developmentGreg Hysen2019-01-083-4/+6
* | Ran prettierGreg Hysen2019-01-081-1/+9
* | Doc generation working for changes by dutch auction wrapperGreg Hysen2019-01-081-1/+1
* | added changelog entry for monorepo-scriptsGreg Hysen2019-01-081-0/+4
* | Hide dutch auction wrapper from docs -- hopefully this will prevent the "must...Greg Hysen2019-01-081-0/+1
* | Added NetworkID 50 address for dutch auction wrapperGreg Hysen2019-01-081-2/+1
* | removed manual updte of package.json versionGreg Hysen2019-01-085-5/+5
* | export dutch auction wrapper types from 0x.jsGreg Hysen2019-01-082-0/+3
* | Export dutch auction wrapper in 0x.jsGreg Hysen2019-01-081-0/+1
* | ran prettierGreg Hysen2019-01-083-4/+6
* | Minor documentation updates to dutch auction wrapperGreg Hysen2019-01-084-27/+35
* | `afterAuctionDetails` -> `auctionDetails`Greg Hysen2019-01-081-2/+2
* | Added @todo for including dutch auction addresses once deployedGreg Hysen2019-01-081-2/+6
* | Ran prettier & linterGreg Hysen2019-01-086-83/+86
* | Removed redundant assignmentGreg Hysen2019-01-081-1/+1
* | removed needless newline on contract-wrappers changelogGreg Hysen2019-01-081-2/+1
* | removed timestamp from changelog for abi-gen-wrappersGreg Hysen2019-01-081-2/+1
* | added dutch auction address for testnetsGreg Hysen2019-01-081-3/+3
* | removed .onlyGreg Hysen2019-01-081-1/+1
* | updated relevant changelogsGreg Hysen2019-01-0810-5/+51
* | Added dutch auction utils to contract-wrappersGreg Hysen2019-01-081-0/+144
* | ran prettier + added changelog entry for contract wrappersGreg Hysen2019-01-082-6/+12
* | ran prettierGreg Hysen2019-01-082-37/+35
* | dutch wrapper tests workingGreg Hysen2019-01-083-52/+27
* | all dutchie wrapper tests passingGreg Hysen2019-01-082-108/+76
* | Progress on dutch auction wrapper. Need to add auction data decoding to it.Greg Hysen2019-01-083-23/+99
* | Removed unnecessary fields from dutch auction artifactsGreg Hysen2019-01-081-84/+2
* | Dutch wrapperGreg Hysen2019-01-0813-21/+1052
* | Dutch Auction Contract WrapperGreg Hysen2019-01-082-0/+29
* | Optimize SQL queries in pull_missing_blocks (#1458)Alex Browne2019-01-081-19/+20
* | chore(website): update copy on market making pageBrandon Millman2019-01-081-1/+1
* | fix(website): fix some copy on the market maker pageBrandon Millman2019-01-081-1/+1
* | Merge pull request #1487 from 0xProject/feature/website/market-maker-pageBrandon Millman2019-01-086-112/+282
|\ \
| * | chore(website): fix linterBrandon Millman2019-01-081-1/+1
| * | chore(website): update market making page copyBrandon Millman2019-01-071-5/+5
| * | feat(website): add contact us hero action to market maker pageBrandon Millman2019-01-072-15/+30
| * | feat(website): implement market maker formBrandon Millman2019-01-072-63/+184
| * | feat(website): Add support for copper forms in the offersBrandon Millman2019-01-052-29/+50
| * | feat(website): add link underneath the first feature in market maker pageBrandon Millman2019-01-051-0/+7
| * | feat(website): update market maker page copy and linksBrandon Millman2019-01-051-14/+10
| * | feat(website): add market making section to developers dropdownBrandon Millman2019-01-051-0/+4
| * | feature(website): add market making pageBrandon Millman2019-01-041-0/+6
* | | Use enums in pipelineAmir Bandeali2019-01-0819-59/+75
* | | Minimize unnecessary type assertionsAmir Bandeali2019-01-0811-328/+247
* | | Fix linting errorsAmir Bandeali2019-01-084-0/+4
* | | Add tests for MAP in order watcherAmir Bandeali2019-01-082-1/+209
* | | Do not export AssetData in 0x.jsAmir Bandeali2019-01-082-3/+2
* | | Add tests for recursive MAP decodingAmir Bandeali2019-01-084-10/+68
* | | Update CHANGELOGsAmir Bandeali2019-01-085-4/+14
* | | FIx linting errorsAmir Bandeali2019-01-083-0/+8
* | | Add recursive MultiAsset decoding, store first address in pipelineAmir Bandeali2019-01-088-21/+62
* | | feat: Add balance and allowance checks for MultiAssetProxyAmir Bandeali2019-01-081-45/+87
* | | feat: Add fields to OrderRelevantState and change AssetData to SingleAssetDataAmir Bandeali2019-01-082-2/+4
* | | Add individual balances and allowances to OrderRelevantStateAmir Bandeali2019-01-083-3/+74
* | | Do not attempt to parse tokenAddress if decoding data from multiAssetProxyAmir Bandeali2019-01-085-23/+58
* | | Fix transferFrom to work with MAPAmir Bandeali2019-01-083-21/+48
* | | Rename functionsAmir Bandeali2019-01-082-18/+16
* | | Add prefix to names of properties in EncodingRules and DecodingRulesAmir Bandeali2019-01-089-21/+32
* | | feat: Export MultiAssetData in typesAmir Bandeali2019-01-083-0/+11
* | | Fix decoding and add testsAmir Bandeali2019-01-082-34/+55
* | | Run linterAmir Bandeali2019-01-082-1/+5
* | | Add support for MAP in fill-scenariosAmir Bandeali2019-01-082-40/+45
* | | Update CHANGELOGAmir Bandeali2019-01-081-0/+9
* | | feat: Add support for MultiAssetProxyAmir Bandeali2019-01-082-55/+131
* | | fix: Add error message if assetProxyId is not ERC20 or ERC721Amir Bandeali2019-01-082-7/+27
* | | Add length check to MultiAsset encodingAmir Bandeali2019-01-082-1/+8
* | | Update CHANGELOGsAmir Bandeali2019-01-082-0/+13
* | | Use new AbiEncoder, add logic for encoding/decoding MultiAsset assetDataAmir Bandeali2019-01-084-72/+217
* | | feat: Add MultiAsset typesAmir Bandeali2019-01-081-1/+8
* | | fix(sra-spec): Add title tagSteve Klebanoff2019-01-041-2/+2
|/ /
* | Merge pull request #1481 from 0xProject/fix/instant/dropdown-colorSteve Klebanoff2019-01-042-17/+24
|\ \
| * | fix(instant): Dropdown hover should be 10% of primary colorSteve Klebanoff2019-01-032-17/+24
* | | feat: unmount the token selector when its not displayingfragosti2019-01-034-54/+75
* | | feat: dont re-render the token selector on every input changefragosti2019-01-021-8/+31
* | | feat: give all stateless components a displayName or make them privatefragosti2019-01-0215-2/+32
* | | feat: use PureComponent instead of Componentfragosti2019-01-0216-18/+18
|/ /
* | Merge pull request #1470 from 0xProject/feature/website/0x-org-cleanupFrancesco Agosti2019-01-02269-4062/+645
|\ \
| * \ fix: merge conflictfragosti2018-12-271-10/+15
| |\ \
| * | | fix: remove --json flag from buildfragosti2018-12-211-1/+1
| * | | feat: move over @next images as well, selectively deletefragosti2018-12-21121-364/+0
| * | | feat: remove unused filesfragosti2018-12-2129-2818/+1
| * | | feat: make project build by adding back old footer componentfragosti2018-12-2110-12/+240
| * | | feat: remove @next directory from all importsfragosti2018-12-2140-204/+204
| * | | feat: move all @next files to non @next directoryfragosti2018-12-21119-676/+212
* | | | feat: use kovan.0xproject.com instead of kovan.0x.orgfragosti2018-12-271-2/+2
| |/ / |/| |
* | | fix(website): Fix bad mergeSteve Klebanoff2018-12-251-1/+0
* | | Merge pull request #1469 from 0xProject/fix/website/job-openingsSteve Klebanoff2018-12-222-10/+16
|\ \ \ | |/ / |/| |
| * | fix(website): Cleanup jobs sectionSteve Klebanoff2018-12-212-8/+13
| * | make percentage 100%Steve Klebanoff2018-12-211-1/+1
| * | give more space to job title and change apply linkSteve Klebanoff2018-12-212-4/+6
* | | Merge pull request #1434 from 0xProject/fix/instant/signature-deniedBrandon Millman2018-12-219-6/+38
|\ \ \
| * \ \ Merge branch 'development' into fix/instant/signature-deniedBrandon Millman2018-12-21288-481/+9901
| |\ \ \
| * | | | feat(instant): add new event for unknown buy errorsBrandon Millman2018-12-212-1/+7
| * | | | feature(contract-wrappers): add support for Trust Wallet signature denial err...Brandon Millman2018-12-213-2/+14
| * | | | fix(instant): add analytics to unknown error on executeBuyAsyncBrandon Millman2018-12-211-0/+1
| * | | | fix(instant): catch unknown errors from executeBuyAsync, report them and show...Brandon Millman2018-12-213-4/+9
| * | | | fix(instant): use isTrust property to determine if provider is trust walletBrandon Millman2018-12-211-1/+1
| * | | | feature(instant): add trust wallet detectionBrandon Millman2018-12-153-0/+4
| * | | | fix(instant): treat executeBuyQuote errors as signature denialsBrandon Millman2018-12-151-5/+9
* | | | | Merge pull request #1467 from 0xProject/fix/website/remove-placeholdersSteve Klebanoff2018-12-211-1/+1
|\ \ \ \ \
| * | | | | Remove using label as placeholderSteve Klebanoff2018-12-211-1/+1
* | | | | | Merge pull request #1466 from 0xProject/feature/website/remove-ts-warningsSteve Klebanoff2018-12-2120-959/+26
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Don't allow compiling with errorsSteve Klebanoff2018-12-211-1/+0
| * | | | | Declare imported package which doesn't have typesSteve Klebanoff2018-12-211-0/+1
| * | | | | Fix typesSteve Klebanoff2018-12-213-3/+4
| * | | | | Fix typesSteve Klebanoff2018-12-214-3/+8
| * | | | | Fix TS error w/ children on portalSteve Klebanoff2018-12-211-0/+1
| * | | | | Rename props and fix router typesSteve Klebanoff2018-12-211-4/+8
| * | | | | Fix StyledCommunityLink propsSteve Klebanoff2018-12-211-2/+4
| * | | | | remove unused fileSteve Klebanoff2018-12-201-170/+0
| * | | | | remove unused instant pagesSteve Klebanoff2018-12-207-776/+0
| |/ / / /
* | | | | Merge pull request #1463 from 0xProject/feature/website/new-logosSteve Klebanoff2018-12-216-4/+101
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'development' into feature/website/new-logosSteve Klebanoff2018-12-2134-220/+1146
| |\| | |
| * | | | New relayersSteve Klebanoff2018-12-206-4/+101
* | | | | Reapply prettierFred Carlsen2018-12-202-6/+8
* | | | | Disable fee slider when no address is put inFred Carlsen2018-12-202-1/+2
* | | | | Fix page titlesFred Carlsen2018-12-209-6/+25
* | | | | Merge remote-tracking branch 'upstream/feature/website/0x-org' into feature/w...Fred Carlsen2018-12-2076-617/+1641
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'development' into feature/website/0x-orgSteve Klebanoff2018-12-2034-220/+1146
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update packages/sol-compiler/src/compiler.tsFabio B2018-12-191-1/+2
| | * | | Update packages/sol-compiler/src/utils/compiler.tsFabio B2018-12-191-1/+1
| | * | | Run prettierLeonid Logvinov2018-12-191-1/+3
| | * | | Describe regexesLeonid Logvinov2018-12-191-1/+4
| | * | | Add a NOTE commentLeonid Logvinov2018-12-191-0/+3
| | * | | Add a comment for SpyResolverLeonid Logvinov2018-12-191-0/+4
| | * | | Move logWithTime to logUtilsLeonid Logvinov2018-12-195-11/+20
| | * | | Update packages/sol-compiler/src/compiler.tsFabio B2018-12-191-1/+1
| | * | | Disable linter no a hanging promise with a commentLeonid Logvinov2018-12-191-2/+3
| | * | | Mark the field as readonlyLeonid Logvinov2018-12-191-1/+1
| | * | | Remove unused variablesLeonid Logvinov2018-12-191-2/+0
| | * | | Move logWithTime function to utilsLeonid Logvinov2018-12-192-10/+11
| | * | | Add PR numbersLeonid Logvinov2018-12-192-4/+4
| | * | | Add sol-compiler watch modeLeonid Logvinov2018-12-197-7/+88
| | * | | Add SpyResolverLeonid Logvinov2018-12-192-0/+24
| | * | | Add to type in sol-resolverLeonid Logvinov2018-12-197-25/+21
| | * | | Add includes section to typescript-typings package.jsonLeonid Logvinov2018-12-191-1/+2
| | * | | Refactor most of the sol-compiler methods into helper functions in utils and ...Leonid Logvinov2018-12-193-187/+237
| | * | | fix prettierFabio Berger2018-12-191-2/+1
| | * | | Merge branch 'development' into website/addPySRAFabio Berger2018-12-19134-508/+1869
| | |\ \ \
| | | * \ \ Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2018-12-1910-2/+732
| | | |\ \ \
| | | | * \ \ Merge branch 'development' into features/orderwatcher_wsFabio Berger2018-12-191-0/+4
| | | | |\ \ \
| | | | * | | | Move onMessageAsync outside of tests and add commentsFabio Berger2018-12-191-23/+30
| | | | * | | | Fix WS tests to remove race-condition and be more specific about the message ...Fabio Berger2018-12-191-23/+34
| | | | * | | | Add temporary console.log to test failing on CIFabio Berger2018-12-191-0/+1
| | | | * | | | Merge branch 'development' into features/orderwatcher_wsFabio Berger2018-12-19176-805/+2943
| | | | |\ \ \ \
| | | | * | | | | Remove unused fileFabio Berger2018-12-191-2/+0
| | | | * | | | | Fix file nameFabio Berger2018-12-173-2/+2
| | | | * | | | | Consolidate use of isVerbose in orderWatcherConfigFabio Berger2018-12-172-19/+14
| | | | * | | | | Add isVerbose option to enable/disable loggingFabio Berger2018-12-172-6/+23
| | | | * | | | | Fix schemas and testsFabio Berger2018-12-174-29/+32
| | | | * | | | | Move OrderWatcher Websocket schemas to json-schemas and convert to JSON so th...Fabio Berger2018-12-176-64/+71
| | | | * | | | | Improve our compliance to the JSON RPC specFabio Berger2018-12-175-33/+37
| | | | * | | | | remove unused instance variableFabio Berger2018-12-161-2/+0
| | | | * | | | | Ensure fileName matches class name, fix broadcastFabio Berger2018-12-164-21/+32
| | | | * | | | | Respond to CRkao2018-12-155-101/+209
| | | | * | | | | Respond to CRkao2018-12-156-144/+295
| | | | * | | | | WIP: OrderWatcher WebSocketkao2018-12-134-1/+420
| | | * | | | | | Add missing CHANGELOG entry for OrderWatcher WS interfaceFabio Berger2018-12-191-0/+10
| | | | |_|/ / / | | | |/| | | |
| | | * | | | | Less Assembly. More Solidity. Less Efficiency. More Readability.Greg Hysen2018-12-191-151/+0
| | | * | | | | Removed deprecated README + commentsGreg Hysen2018-12-191-2/+0
| | | * | | | | Prettier / Linter fixes for TSGreg Hysen2018-12-191-1/+1
| | | * | | | | Ported Balance Threshold Filter to new contract directory structureGreg Hysen2018-12-196-2242/+0
| | | * | | | | Test for ERC20 balance thresholdGreg Hysen2018-12-191-114/+146
| | | * | | | | Exchange Selectors - sortedGreg Hysen2018-12-191-107/+96
| | | * | | | | Removed Yes Token - its no longer needed to test Balance Threshold FilterGreg Hysen2018-12-197-1453/+12
| | | * | | | | Tests finished for balance threshold wrapperGreg Hysen2018-12-191-31/+189
| | | * | | | | matchOrders test cases for balance threshold filter contractGreg Hysen2018-12-192-3/+45
| | | * | | | | Tests for MatchOrdersGreg Hysen2018-12-193-7/+111
| | | * | | | | Tests for marketBuy invariantsGreg Hysen2018-12-191-10/+185
| | | * | | | | marketSellNoThrow testsGreg Hysen2018-12-191-0/+91
| | | * | | | | tests for marketSellOrdersGreg Hysen2018-12-191-9/+99
| | | * | | | | All tests running so farGreg Hysen2018-12-193-166/+9
| | | * | | | | Tests for batchFill variantsGreg Hysen2018-12-191-11/+203
| | | * | | | | tests for batchFillOrdesGreg Hysen2018-12-191-39/+287
| | | * | | | | tests for fillOrder variantsGreg Hysen2018-12-191-24/+131
| | | * | | | | fillOrder tests with new wrapperGreg Hysen2018-12-191-24/+13
| | | * | | | | Wrappers for balance threshold filter + updated some tests to use the wrapperGreg Hysen2018-12-193-63/+429
| | | * | | | | Conformed to hex format for constructing offsetsGreg Hysen2018-12-191-2/+1
| | | * | | | | Removed unnecessary noteGreg Hysen2018-12-191-2/+0
| | | * | | | | Include threshold balance in constructor of BalanceThresholdFilter contractGreg Hysen2018-12-194-2/+21
| | | * | | | | Function DocumentationGreg Hysen2018-12-192-59/+96
| | | * | | | | Updated Balance Threshold Filter to use mixin patternGreg Hysen2018-12-193-290/+358
| | | * | | | | ComplianceForwarder renamed to BalanceThresholdFilterGreg Hysen2018-12-193-17/+47
| | | * | | | | Revert reasons for balance threshold filterGreg Hysen2018-12-193-13/+39
| | | * | | | | Some commentsGreg Hysen2018-12-191-4/+4
| | | * | | | | Documented inline assembly functionsGreg Hysen2018-12-192-51/+153
| | | * | | | | working on batch fills. Compliance part is finished.Greg Hysen2018-12-192-7/+7
| | | * | | | | cleanupGreg Hysen2018-12-191-15/+18
| | | * | | | | cleaningGreg Hysen2018-12-192-34/+30
| | | * | | | | cleaningGreg Hysen2018-12-191-9/+19
| | | * | | | | cleaningGreg Hysen2018-12-191-11/+3
| | | * | | | | cleaningGreg Hysen2018-12-192-56/+19
| | | * | | | | cleaning IGreg Hysen2018-12-191-1/+17
| | | * | | | | Code to validate addresses from order arraysGreg Hysen2018-12-192-8/+49
| | | * | | | | Refactoring asmGreg Hysen2018-12-191-3/+41
| | | * | | | | generalized KYC extension passing all testsGreg Hysen2018-12-193-5/+16
| | | * | | | | Abstract address validation in asmGreg Hysen2018-12-191-13/+21
| | | * | | | | Exchange selector contract - autogeneratedGreg Hysen2018-12-191-0/+162
| | | * | | | | Making progress on generalized forwarderGreg Hysen2018-12-192-77/+98
| | | * | | | | Extract makerAddress in assemblyGreg Hysen2018-12-192-8/+50
| | | * | | | | fillOrder -> executeTransaction renameGreg Hysen2018-12-192-6/+6
| | | * | | | | Removed unnecessary comments in compliant forwarderGreg Hysen2018-12-191-2/+1
| | | * | | | | Wrapped up tests for compliant forwarderGreg Hysen2018-12-192-5/+15
| | | * | | | | More tests + require instead of revert in compliance contractGreg Hysen2018-12-193-18/+92
| | | * | | | | Ran linterGreg Hysen2018-12-192-43/+11
| | | * | | | | Ran prettierGreg Hysen2018-12-191-33/+50
| | | * | | | | End-to-end test for compliant forwarder - worksGreg Hysen2018-12-191-28/+28
| | | * | | | | WIP - Tests for compliant forwarderGreg Hysen2018-12-192-5/+12
| | | * | | | | Writing tests for Compliant ForwarderGreg Hysen2018-12-191-47/+125
| | | * | | | | template for Compliant Forwarder testsGreg Hysen2018-12-192-41/+18
| | | * | | | | Compile Compliant Forwarder contractGreg Hysen2018-12-191-1/+1
| | | * | | | | Yes Compliance TokenGreg Hysen2018-12-196-37/+21
| | | * | | | | Broken commit -- saving current state of getting wyre compliance token contra...Greg Hysen2018-12-197-81/+1579
| | | * | | | | Untested - Compliant Forwarder with Wyre "Yes Compliance" TokenGreg Hysen2018-12-192-0/+220
| | | | |/ / / | | | |/| | |
| | * | | | | Add Python SRA client to Developer homeFabio Berger2018-12-131-0/+9
| * | | | | | Declare interface and make isNoBorder optionalSteve Klebanoff2018-12-191-1/+4
| * | | | | | Type definition so TS knows it has defaultPropsSteve Klebanoff2018-12-191-1/+1
| * | | | | | Move Hero to bottom, give interface explicit namesSteve Klebanoff2018-12-191-45/+51
| * | | | | | LintingSteve Klebanoff2018-12-191-1/+4
| * | | | | | includeEmpty -> shouldIncludeEmptySteve Klebanoff2018-12-192-5/+5
| * | | | | | Get rid of unused importSteve Klebanoff2018-12-191-1/+0
| * | | | | | Move imports and put action into varSteve Klebanoff2018-12-191-9/+8
| * | | | | | Move importsSteve Klebanoff2018-12-191-4/+3
| * | | | | | Remove commentsSteve Klebanoff2018-12-191-2/+0
| * | | | | | Not assigning to variable because we never used the variableSteve Klebanoff2018-12-191-1/+1
| * | | | | | Removing unused interfaceSteve Klebanoff2018-12-191-4/+0
| * | | | | | Removing unused importsSteve Klebanoff2018-12-193-24/+14
| * | | | | | useAnchorTag -> shouldUseAnchorTagSteve Klebanoff2018-12-194-8/+8
| * | | | | | run prettier on websiteSteve Klebanoff2018-12-1932-297/+404
| * | | | | | Remove community and market maker routeFred Carlsen2018-12-191-2/+0
| * | | | | | Added routesFred Carlsen2018-12-191-0/+2
| * | | | | | Added community and market maker routesFred Carlsen2018-12-191-0/+2
| * | | | | | Left-align hero on mobileFred Carlsen2018-12-192-3/+9
| * | | | | | Change cursor on dropdown triggersFred Carlsen2018-12-191-0/+1
| * | | | | | Tweak market makerFred Carlsen2018-12-197-14/+69
| * | | | | | Mobile tweaksFred Carlsen2018-12-192-3/+28
| * | | | | | Prevent overflow on instant pageFred Carlsen2018-12-191-0/+6
| * | | | | | Merge branch 'development' into feature/website/0x-orgSteve Klebanoff2018-12-1920-153/+379
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
* | | | | | | Remove community and market maker routeFred Carlsen2018-12-191-2/+0
* | | | | | | Merge remote-tracking branch 'upstream/development' into feature/website/0x-orgFred Carlsen2018-12-1920-153/+379
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Fix OrderWatcher title to fix sidebar topFabio Berger2018-12-181-1/+1
| * | | | | | Fix version picker so it doesn't overflow onto two linesFabio Berger2018-12-181-7/+9
| * | | | | | Fix bug in pull_missing_blocks with incorrect start block (#1438)Alex Browne2018-12-181-10/+6
| * | | | | | Pull approval events for ZRX and DAI (#1430)Alex Browne2018-12-181-19/+49
| * | | | | | Merge branch 'development' into feature/instant/usd-eth-toggleSteve Klebanoff2018-12-15142-693/+2238
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |