aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Pin @types/styled-components versionsLeonid Logvinov2019-01-096-24/+15
* Add yarn.lock changesLeonid Logvinov2019-01-091-227/+1165
* Remove accidentally commited filesLeonid Logvinov2019-01-0970-51510/+0
* Merge developmentLeonid Logvinov2019-01-091333-28966/+121925
|\
| * Merge pull request #1494 from 0xProject/feature/order-watcher/dockerizeFabio B2019-01-095-16/+86
| |\
| | * rename methodFabio Berger2019-01-091-4/+4
| | * Remove stray consoleFabio Berger2019-01-091-1/+0
| | * Add assertions to catch trying to add undefined schemasFabio Berger2019-01-091-0/+9
| | * Fixx request payload and expected responsesFabio Berger2019-01-081-6/+8
| | * Fixx OrderWatcher WS tests so they are completely independent from one anotherFabio Berger2019-01-081-10/+12
| | * Merge branch 'development' into feature/order-watcher/dockerizeFabio Berger2019-01-08550-4852/+13209
| | |\
| | * | Create server entry point and Dockerfile for OrderWatcherFabio Berger2019-01-083-0/+58
| * | | Merge pull request #1439 from 0xProject/migrations/docker-imageJacob Evans2019-01-098-12/+109
| |\ \ \
| | * | | chore(python-packages): Change docker command in setup.pyJacob Evans2019-01-021-7/+1
| | * | | Python ganache snapshot 2.2.2Jacob Evans2018-12-291-3/+1
| | * | | Readme, read snapshot name from package.jsonJacob Evans2018-12-273-2/+52
| | * | | Dockerfile defaults to latestJacob Evans2018-12-241-1/+1
| | * | | Copy latest published version to 0x_ganache_snapshot-latest.zipJacob Evans2018-12-241-1/+1
| | * | | Use new bucket, bind on 0.0.0.0Jacob Evans2018-12-242-6/+8
| | * | | Add Docker image and Snapshot commandsJacob Evans2018-12-175-2/+55
| * | | | Update README.mdChris Kalani2019-01-091-1/+1
| * | | | Update README.mdChris Kalani2019-01-091-1/+1
| * | | | fetch and save copper (#1472)Xianny2019-01-0928-7/+3517
| * | | | Move json_schemas to its own package (#1435)F. Eugene Aumson2019-01-0945-54/+565
| |\ \ \ \
| | * | | | Add entry point for validation of JSON stringsF. Eugene Aumson2018-12-291-0/+22
| | * | | | Correct inconsistencies in JSON schema namesF. Eugene Aumson2018-12-2914-36/+23
| | * | | | Clarify what kind of support ticket was raised.F. Eugene Aumson2018-12-211-1/+2
| | * | | | Correct doc titlesF. Eugene Aumson2018-12-152-3/+3
| | * | | | Tweak special case: only strip Schema as suffixF. Eugene Aumson2018-12-151-1/+3
| | * | | | Add example usage to sra_client READMEF. Eugene Aumson2018-12-151-0/+29
| | * | | | HACK: cp files because CircleCI isn'tF. Eugene Aumson2018-12-151-0/+5
| | * | | | Stop installing packages as editableF. Eugene Aumson2018-12-151-6/+6
| | * | | | Support ALL the schemasF. Eugene Aumson2018-12-153-20/+23
| | * | | | Move zero_ex.json_schemas to its own packageF. Eugene Aumson2018-12-1531-12/+474
| * | | | | Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2019-01-091-2/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #1493 from 0xProject/fix/asset-buyer/no-longer-betaFrancesco Agosti2019-01-091-2/+0
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Remove beta note from asset-buyerSteve Klebanoff2019-01-091-2/+0
| | |/ / / /
| * / / / / Fix typoFabio Berger2019-01-095-5/+5
| |/ / / /
| * | | | Merge pull request #1465 from 0xProject/feature/contracts/dutchAuctionWrapperGreg Hysen2019-01-0829-140/+1356
| |\ \ \ \
| | * | | | 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
| | * | | | relaxed version on contract-extension dependenciesGreg Hysen2019-01-081-1/+1
| | * | | | Added NetworkID 50 address for dutch auction wrapperGreg Hysen2019-01-081-2/+1
| | * | | | removed manual updte of package.json versionGreg Hysen2019-01-086-6/+6
| | * | | | 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-082-4/+4
| | * | | | 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-0811-6/+52
| | * | | | Added dutch auction utils to contract-wrappersGreg Hysen2019-01-081-0/+144
| | * | | | ran prettier + added changelog entry for contract wrappersGreg Hysen2019-01-085-31/+20
| | * | | | ran prettierGreg Hysen2019-01-083-39/+41
| | * | | | 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-0815-47/+1092
| | * | | | changed name for confusionGreg Hysen2019-01-081-7/+6
| | * | | | Dutch Auction Contract WrapperGreg Hysen2019-01-085-137/+158
| |/ / / /
| * | | | 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
| * | | | | Merge pull request #1363 from 0xProject/feat/order-utils/abiEncoderAmir Bandeali2019-01-0853-394/+1104
| |\ \ \ \ \
| | * | | | | Use enums in pipelineAmir Bandeali2019-01-0819-59/+75
| | * | | | | Minimize unnecessary type assertionsAmir Bandeali2019-01-0812-366/+248
| | * | | | | 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-085-1/+9
| | * | | | | Add recursive MultiAsset decoding, store first address in pipelineAmir Bandeali2019-01-089-23/+64
| | * | | | | 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 assetDataUtils instead of IAssetData for encoding MultiAsset valuesAmir Bandeali2019-01-082-41/+21
| | * | | | | Use new AbiEncoder, add logic for encoding/decoding MultiAsset assetDataAmir Bandeali2019-01-084-72/+217
| | * | | | | feat: Add MultiAsset typesAmir Bandeali2019-01-081-1/+8
| |/ / / / /
| * | | | | Merge pull request #1484 from 0xProject/fix/sra-spec/title-tagSteve Klebanoff2019-01-081-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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
| * | | | | Merge pull request #1480 from 0xProject/feature/instant/performance-boostFrancesco Agosti2019-01-0330-79/+153
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #1476 from 0xProject/fix/website/build-errorsSteve Klebanoff2018-12-261-1/+0
| |\ \ \ \ \
| | * | | | | 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-21400-599/+14731
| | |\ \ \ \ \
| | * | | | | | 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 #1468 from 0xProject/feature/contracts/unfix-compiler-versionAmir Bandeali2018-12-2176-75/+76
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Unfix compiler version except for top level contractsAmir Bandeali2018-12-2176-75/+76
| * | | | | | | | | 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-2179-242/+5357
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | New relayersSteve Klebanoff2018-12-206-4/+101
| * | | | | | | | | Merge pull request #1462 from bakkenbaeck/feature/website/0x-orgSteve Klebanoff2018-12-2111-3/+23
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | 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-20106-632/+4387
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Added routesFred Carlsen2018-12-181-0/+2
| | * | | | | | | | | | Added community and market maker routesFred Carlsen2018-12-181-0/+2
| | * | | | | | | | | | Left-align hero on mobileFred Carlsen2018-12-182-3/+9
| | * | | | | | | | | | Change cursor on dropdown triggersFred Carlsen2018-12-181-0/+1
| | * | | | | | | | | | Tweak market makerFred Carlsen2018-12-187-14/+69
| | * | | | | | | | | | Mobile tweaksFred Carlsen2018-12-182-3/+28
| | * | | | | | | | | | Prevent overflow on instant pageFred Carlsen2018-12-181-0/+6
| * | | | | | | | | | | Merge pull request #1464 from 0xProject/feature/contracts-extensions/orderVal...Amir Bandeali2018-12-2115-22/+30
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Move OrderValidator to extensionsAmir Bandeali2018-12-2115-22/+30
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #1117 from 0xProject/feature/contracts/orderMatcherAmir Bandeali2018-12-2117-5/+1394
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Update CHANGELOGAmir Bandeali2018-12-211-0/+4
| | * | | | | | | | | | Remove assembly version of matchOrdersAmir Bandeali2018-12-212-369/+52
| | * | | | | | | | | | Add getOrderInfo check before calling fillOrderAmir Bandeali2018-12-212-124/+242
| | * | | | | | | | | | Update comments and hard code function selector constantsAmir Bandeali2018-12-212-53/+56
| | * | | | | | | | | | Fix build after rebaseAmir Bandeali2018-12-219-784/+22
| | * | | | | | | | | | update commentsAmir Bandeali2018-12-216-13/+17
| | * | | | | | | | | | Fix build and add back testsAmir Bandeali2018-12-214-4/+776
| | * | | | | | | | | | Update dependency pathsAmir Bandeali2018-12-211-6/+6
| | * | | | | | | | | | Add OrderMatcher testsAmir Bandeali2018-12-215-2/+774
| | * | | | | | | | | | feat: Add OrderMatcher contract that takes spread in multiple assets by calli...Amir Bandeali2018-12-2110-1/+796
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #1455 from 0xProject/fix/contracts/MAPupdatesAmir Bandeali2018-12-213-4/+46
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Update CHANGELOGAmir Bandeali2018-12-211-0/+4
| | * | | | | | | | | Use more efficient equality checksAmir Bandeali2018-12-211-2/+2
| | * | | | | | | | | Add note about input validationAmir Bandeali2018-12-211-0/+3
| | * | | | | | | | | Use more efficient check for overflowAmir Bandeali2018-12-211-5/+5
| | * | | | | | | | | Check if amount == 0 before doing divisionAmir Bandeali2018-12-212-1/+36
| |/ / / / / / / / /
| * | | | | | | | | feat(sra_client.py): Test deployed pkg via toxF. Eugene Aumson2018-12-201-0/+14
| * | | | | | | | | Merge pull request #1448 from 0xProject/feature/website/0x-orgSteve Klebanoff2018-12-20231-127/+8792
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'development' into feature/website/0x-orgSteve Klebanoff2018-12-2064-235/+3892
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #1457 from 0xProject/feature/website/0x-org-lintingSteve Klebanoff2018-12-2042-398/+498
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | 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
| | |/ / / / / / / /
| | * | | | | | | | Merge pull request #1456 from 0xProject/feature/website/0x-org-bb-fixes-rebaseSteve Klebanoff2018-12-1911-20/+115
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | 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
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | / / / / / | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | fix(website): fix broken copper form post linkBrandon Millman2018-12-181-21/+40
| | * | | | | | | Merge pull request #1452 from 0xProject/feature/website/0x-org-flawlessFrancesco Agosti2018-12-183-15/+10
| | |\ \ \ \ \ \ \
| | | * | | | | | | fix: uppercase Kfragosti2018-12-181-1/+1
| | | * | | | | | | feat: update statsfragosti2018-12-181-2/+2
| | | * | | | | | | feat: make 0x.org #flawlessfragosti2018-12-182-13/+8
| | * | | | | | | | Merge pull request #1449 from 0xProject/feature/website/0x-org-steve-linksSteve Klebanoff2018-12-186-148/+144
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix linkSteve Klebanoff2018-12-181-2/+2
| | | * | | | | | | Merge branch 'feature/website/0x-org' into feature/website/0x-org-steve-linksSteve Klebanoff2018-12-1818-226/+281
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Use constantsSteve Klebanoff2018-12-181-9/+5
| | | * | | | | | | | Link homepage to Why#casesSteve Klebanoff2018-12-181-1/+2
| | | * | | | | | | | Per Matt's sugestion change personalized to dedicatedSteve Klebanoff2018-12-181-1/+1
| | | * | | | | | | | Ecosystem linksSteve Klebanoff2018-12-182-2/+16
| | | * | | | | | | | Prettify ecosystemSteve Klebanoff2018-12-181-52/+54
| | | * | | | | | | | Capitalize K in Launch KitSteve Klebanoff2018-12-181-1/+1
| | | * | | | | | | | Prettify dropdownSteve Klebanoff2018-12-181-26/+16
| | | * | | | | | | | Allow banner to open in new windowSteve Klebanoff2018-12-182-3/+13
| | | * | | | | | | | Prettify bannerSteve Klebanoff2018-12-181-37/+26
| | | * | | | | | | | Remove unused targetSteve Klebanoff2018-12-181-1/+1
| | | * | | | | | | | Merge branch 'feature/website/0x-org' into feature/website/0x-org-steve-linksSteve Klebanoff2018-12-187-121/+188
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | fragment and launchkit urlSteve Klebanoff2018-12-181-3/+7
| | | * | | | | | | | | prettify launch kitSteve Klebanoff2018-12-181-29/+19
| | * | | | | | | | | | Merge pull request #1451 from 0xProject/feature/website/0x-org-hide-linksSteve Klebanoff2018-12-182-4/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge branch 'feature/website/0x-org' into feature/website/0x-org-hide-linksSteve Klebanoff2018-12-1812-151/+208
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Remove community and market-maker URLsSteve Klebanoff2018-12-182-4/+0
| | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge pull request #1450 from 0xProject/feature/website/0x-org-aboutFrancesco Agosti2018-12-186-76/+74
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | feat: redirect careers to jobsfragosti2018-12-182-1/+3
| | | * | | | | | | | | feat: add links to press pagefragosti2018-12-181-5/+7