aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | [sra-spec] Add title tag
| * 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
|\ | | | | [instant] Dropdown hover 10% of primary color
| * 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
|\ \ | |/ |/| [instant] No more laggy input
| * 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
|\ | | | | [website] Remove @next dir, remove unused files.
| * 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
|\ \ | | | | | | [website] Fix duplicate props which made ci build break
| * | 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
|\ \ | |/ |/| [website] Tweak job listings
| * 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
|\ \ | | | | | | [instant] fix signature denial error message and add trust wallet detection
| * \ Merge branch 'development' into fix/instant/signature-deniedBrandon Millman2018-12-21400-599/+14731
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (914 commits) Unfix compiler version except for top level contracts Move OrderValidator to extensions Update CHANGELOG Remove assembly version of matchOrders Add getOrderInfo check before calling fillOrder Update comments and hard code function selector constants Fix build after rebase update comments Fix build and add back tests Update dependency paths Add OrderMatcher tests feat: Add OrderMatcher contract that takes spread in multiple assets by calling `matchOrders` followed by `fillOrder` Update CHANGELOG Use more efficient equality checks Add note about input validation Use more efficient check for overflow Check if amount == 0 before doing division Reapply prettier New relayers feat(sra_client.py): Test deployed pkg via tox ...
| * | | feat(instant): add new event for unknown buy errorsBrandon Millman2018-12-212-1/+7
| | | |
| * | | feature(contract-wrappers): add support for Trust Wallet signature denial ↵Brandon Millman2018-12-213-2/+14
| | | | | | | | | | | | | | | | errors when trying to sense signature denial from a provider
| * | | fix(instant): add analytics to unknown error on executeBuyAsyncBrandon Millman2018-12-211-0/+1
| | | |
| * | | fix(instant): catch unknown errors from executeBuyAsync, report them and ↵Brandon Millman2018-12-213-4/+9
| | | | | | | | | | | | | | | | show could not submit transaction
| * | | 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
|\ \ \ \ | | | | | | | | | | [website] Don't show placeholder text on contact page
| * | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | | [website] Fix TS errors
| * | | | 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 Solidity compiler version except for top level contracts
| * | | | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | [website] Add new relayers
| * | | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [website] Fixes
| * | | | | 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 ↵Fred Carlsen2018-12-20106-632/+4387
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/website/0x-org # Conflicts: # packages/website/ts/@next/components/button.tsx # packages/website/ts/@next/components/definition.tsx # packages/website/ts/@next/components/hero.tsx # packages/website/ts/@next/components/sections/landing/about.tsx # packages/website/ts/@next/pages/market_maker.tsx
| * | | | | | 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 ↵Amir Bandeali2018-12-2115-22/+30
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/contracts-extensions/orderValidator Move OrderValidator to extensions
| * | | | | | | Move OrderValidator to extensionsAmir Bandeali2018-12-2115-22/+30
|/ / / / / / /
* | | | | | | Merge pull request #1117 from 0xProject/feature/contracts/orderMatcherAmir Bandeali2018-12-2117-5/+1394
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Implement OrderMatcher
| * | | | | | | 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 ↵Amir Bandeali2018-12-2110-1/+796
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | calling `matchOrders` followed by `fillOrder`
* | | | | | | Merge pull request #1455 from 0xProject/fix/contracts/MAPupdatesAmir Bandeali2018-12-213-4/+46
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add validation to MAP
| * | | | | | 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
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | [website][react-shared][instant] 0x org
| * | | | | 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
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | [website] 0x org linting and prettier
| | * | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | [website] Bakken & Baeck 0x.org website fixes
| | * | | | | 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
| |\ \ \ \ | | | | | | | | | | | | [website] 0x org flawless
| | * | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | | [website] 0x.org Launch Kit and Ecosystem links
| | * | | | 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
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | [website] 0x.org Remove unused paths
| | * | | | | | 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
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | [website] 0x org about
| | * | | | | | feat: redirect careers to jobsfragosti2018-12-182-1/+3
| | | | | | | |
| | * | | | | | feat: add links to press pagefragosti2018-12-181-5/+7
| | | | | | | |
| | * | | | | | feat: remove download our presskit copyfragosti2018-12-181-2/+1
| | | | | | | |
| | * | | | | | feat: add press mailto linkfragosti2018-12-181-5/+11
| | | | | | | |
| | * | | | | | fix: use new AboutPageLayout API everywherefragosti2018-12-182-2/+2
| | | | | | | |
| | * | | | | | feat: update job titlesfragosti2018-12-181-30/+16
| | | | | | | |
| | * | | | | | fix: mission and values link to new tab and not appendfragosti2018-12-182-27/+30
| | | | | | | |
| | * | | | | | feat: link to mission and valuesfragosti2018-12-181-9/+9
| | | | | | | |
| * | | | | | | Merge pull request #1447 from 0xProject/feature/website/0x-org-jank-linksFrancesco Agosti2018-12-1812-151/+208
| |\| | | | | | | | |/ / / / / | |/| | | | | [website] Fix 0x org jank links
| | * | | | | feat: add react-shared release notesfragosti2018-12-181-0/+10
| | | | | | |
| | * | | | | feat: more blog url fixesfragosti2018-12-183-26/+26
| | | | | | |
| | * | | | | feat: fix blog linkfragosti2018-12-183-3/+4
| | | | | | |
| | * | | | | feat: final footer polishfragosti2018-12-182-3/+3
| | | | | | |
| | * | | | | Merge branch 'feature/website/0x-org' of ↵fragosti2018-12-1816-311/+463
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | https://github.com/0xProject/0x-monorepo into feature/website/0x-org-jank-links
| * | | | | | Merge pull request #1444 from 0xProject/feature/website/0x-org-instant-configSteve Klebanoff2018-12-187-121/+188
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | [website] 0x.org Instant
| | * | | | | Open all new instant links in new windowSteve Klebanoff2018-12-184-17/+24
| | | | | | |
| | * | | | | Fix URLsSteve Klebanoff2018-12-181-8/+4
| | | | | | |
| | * | | | | Conditional getStartedClick working on features listSteve Klebanoff2018-12-181-10/+11
| | | | | | |
| | * | | | | Action takes in useAnchorTagSteve Klebanoff2018-12-181-2/+11
| | | | | | |
| | * | | | | Janky but didn't want to mess anything else up, send in useAnchorTag boolean ↵Steve Klebanoff2018-12-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to force using anchortag
| | * | | | | Prettify button.tsxSteve Klebanoff2018-12-181-21/+21
| | | | | | |
| | * | | | | Prettify fileSteve Klebanoff2018-12-181-22/+15
| | | | | | |
| | * | | | | Custom getStartedLink based on screen sizeSteve Klebanoff2018-12-181-2/+16
| | | | | | |
| | * | | | | Run prettifierSteve Klebanoff2018-12-181-36/+60
| | | | | | |
| | * | | | | Add includeEmpty optionSteve Klebanoff2018-12-182-18/+29
| | | | | | |
| | * | | | | prettify fileSteve Klebanoff2018-12-181-2/+13
| | | | | | |
| * | | | | | Merge pull request #1445 from 0xProject/feature/0x-org-statsSteve Klebanoff2018-12-181-34/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | [website] 0x.org stats
| | * | | | | | total statsSteve Klebanoff2018-12-181-3/+3
| | | | | | | |
| | * | | | | | prettify about pageSteve Klebanoff2018-12-181-34/+13
| | | | | | | |
| * | | | | | | Merge pull request #1442 from 0xProject/feature/website/0x-org-analyticsSteve Klebanoff2018-12-181-15/+50
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [website] 0x.org: Allow manual triggering of error, and report newsletter errors to Rollbar
| | * | | | | | | manually trigger error and also send in newsletter errorsSteve Klebanoff2018-12-181-3/+7
| | | | | | | | |
| | * | | | | | | apply prettierSteve Klebanoff2018-12-181-14/+45
| | | | | | | | |
| * | | | | | | | Merge pull request #1443 from 0xProject/feature/website/0x-org-portal-updatedBrandon Millman2018-12-183-44/+34
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | [0x.org] fix portal
| | * | | | | | | fix(website): update Animation component for styled components v4Brandon Millman2018-12-183-44/+34
| |/ / / / / / /
| * | | | | | | Merge pull request #1441 from 0xProject/feature/website/0x-org-jobs-updateBrandon Millman2018-12-183-105/+153
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | [0x.org] update jobs page to load positions from greenhouse
| | * | | | | | fix(website): redirect /jobs to /about/jobsBrandon Millman2018-12-181-1/+1
| | | | | | | |
| | * | | | | | feature(website): implement loading jobs from greenhouse in jobs pageBrandon Millman2018-12-181-99/+149
| | | | | | | |
| | * | | | | | chore(website): yarn lockBrandon Millman2018-12-181-5/+3
| |/ / / / / /
| * / / / / / fix(website): fix mis-replaced website api backend linksBrandon Millman2018-12-181-2/+2
| |/ / / / /
| | * | | | feat: fix footer linksfragosti2018-12-183-23/+25
| | | | | |
| | * | | | feat: fix links in navbar and dropdownfragosti2018-12-184-51/+71
| | | | | |
| | * | | | feat: use react-shared Link componentfragosti2018-12-181-9/+21
| | | | | |
| | * | | | feat: update developer dropdown linksfragosti2018-12-182-54/+33
| |/ / / /
| * | | | Merge pull request #1440 from bakkenbaeck/feature/website/0x-orgFrancesco Agosti2018-12-1866-197/+939
| |\ \ \ \ | | | | | | | | | | | | Feature/website/0x org
| | * | | | Fixes hamburger icon bgcolor, jobs linkEzekiel Aquino2018-12-182-2/+1
| | | | | |
| | * | | | Add definitionFred Carlsen2018-12-181-0/+1
| | | | | |
| | * | | | Increase header tolerancesFred Carlsen2018-12-181-1/+1
| | | | | |
| | * | | | Show errors from serversideFred Carlsen2018-12-182-7/+69
| | | | | |
| | * | | | Update community pageFred Carlsen2018-12-185-40/+100
| | | | | |
| | * | | | Add community linksFred Carlsen2018-12-187-0/+24
| | | | | |
| | * | | | Replace share imageFred Carlsen2018-12-181-0/+0
| | | | | |
| | * | | | Removes content transform on mobile nav toggleEzekiel Aquino2018-12-182-2/+2
| | | | | |
| | * | | | Untoggles nav on headroom unpinEzekiel Aquino2018-12-181-1/+7
| | | | | |
| | * | | | Adds headroom instead for toggling nav visibilityEzekiel Aquino2018-12-183-44/+37
| | | | | |
| | * | | | Fix default marginFred Carlsen2018-12-181-1/+1
| | | | | |
| | * | | | Update lock fileFred Carlsen2018-12-181-4/+13
| | | | | |
| | * | | | Fix about introsFred Carlsen2018-12-182-2/+11
| | | | | |
| | * | | | Fixes mobile nav overflow on mobileEzekiel Aquino2018-12-182-3/+12
| | | | | |
| | * | | | Added Community pageFred Carlsen2018-12-173-1/+226
| | | | | |
| | * | | | Add def for react-scrollable-anchorFred Carlsen2018-12-171-0/+1
| | | | | |
| | * | | | Prepare banner for light themeFred Carlsen2018-12-171-1/+6
| | | | | |
| | * | | | Tweak banner border on mobileFred Carlsen2018-12-171-0/+7
| | | | | |
| | * | | | Fix cta linksFred Carlsen2018-12-172-2/+2
| | | | | |
| | * | | | Add market maker pageFred Carlsen2018-12-173-0/+130
| | | | | |
| | * | | | Tweak configuratorFred Carlsen2018-12-173-5/+16
| | | | | |
| | * | | | Update long term impact iconFred Carlsen2018-12-171-7/+7
| | | | | |
| | * | | | Fix liquidity source changeFred Carlsen2018-12-172-4/+6
| | | | | |
| | * | | | Update og imageFred Carlsen2018-12-171-0/+0
| | | | | |
| | * | | | Fixes scrollable anchors in why pageEzekiel Aquino2018-12-172-46/+55
| | | | | |
| | * | | | Fix wrong icon nameFred Carlsen2018-12-171-1/+1
| | | | | |
| | * | | | Adjust thick stroked svgsFred Carlsen2018-12-173-25/+30
| | | | | |
| | * | | | Fix footer link hover statesEzekiel Aquino2018-12-171-2/+2
| | | | | |
| | * | | | Fixes mobile button layout for Definition componentEzekiel Aquino2018-12-172-3/+15
| | | | | |
| | * | | | Resolves font flicker on route changeEzekiel Aquino2018-12-173-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | - Adds formular css to globally linked css
| | * | | | Update client list + logosFred Carlsen2018-12-1718-14/+178
| | | | | |
| | * | | | Fix newsletter input color in light themeFred Carlsen2018-12-171-5/+15
| | | | | |
| | * | | | Fix launch kit linkFred Carlsen2018-12-171-1/+1
| | | | | |
| | * | | | Fix stray tagFred Carlsen2018-12-171-1/+1
| | | | | |
| | * | | | Fix typoFred Carlsen2018-12-171-1/+1
| | | | | |
| | * | | | Fix homepage iconFred Carlsen2018-12-171-6/+6
| | | | | |
| | * | | | Fix mobile linksFred Carlsen2018-12-171-5/+5
| | | | | |
| | * | | | Fix portal linkFred Carlsen2018-12-171-1/+1
| | | | | |
| | * | | | Fix mobile nav placementFred Carlsen2018-12-171-0/+2
| |/ / / /
| * | | | feat: update prod deploy destinationfragosti2018-12-151-1/+1
| | | | |
| * | | | chore(website): yarn lockBrandon Millman2018-12-151-17/+487
| | | | |
| * | | | fix(website) replace 0xproject.com with 0x.orgBrandon Millman2018-12-1531-56/+56
| | | | |
| * | | | Merge pull request #1375 from bakkenbaeck/websiteBrandon Millman2018-12-15187-21/+7099
| |\ \ \ \ | | |_|_|/ | |/| | | [WIP] Website
| | * | | Fix logo linkFred Carlsen2018-12-151-1/+1
| | | | |
| | * | | Merge remote-tracking branch 'upstream/development' into websiteFred Carlsen2018-12-15155-1398/+1512
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .gitignore # README.md # contracts/core/CHANGELOG.json # contracts/examples/package.json # contracts/extensions/package.json # contracts/interfaces/package.json # contracts/libs/package.json # contracts/multisig/package.json # contracts/protocol/CHANGELOG.json # contracts/protocol/DEPLOYS.json # contracts/protocol/package.json # contracts/test-utils/CHANGELOG.json # contracts/test-utils/CHANGELOG.md # contracts/test-utils/package.json # contracts/tokens/CHANGELOG.json # contracts/tokens/package.json # contracts/utils/package.json # packages/0x.js/CHANGELOG.json # packages/0x.js/CHANGELOG.md # packages/0x.js/package.json # packages/abi-gen-wrappers/CHANGELOG.json # packages/abi-gen-wrappers/CHANGELOG.md # packages/abi-gen-wrappers/package.json # packages/abi-gen/CHANGELOG.json # packages/abi-gen/CHANGELOG.md # packages/abi-gen/package.json # packages/assert/CHANGELOG.json # packages/assert/CHANGELOG.md # packages/assert/package.json # packages/asset-buyer/CHANGELOG.md # packages/asset-buyer/package.json # packages/base-contract/CHANGELOG.json # packages/base-contract/CHANGELOG.md # packages/base-contract/package.json # packages/connect/CHANGELOG.json # packages/connect/CHANGELOG.md # packages/connect/package.json # packages/contract-wrappers/CHANGELOG.json # packages/contract-wrappers/CHANGELOG.md # packages/contract-wrappers/package.json # packages/dev-tools-pages/package.json # packages/dev-utils/CHANGELOG.json # packages/dev-utils/CHANGELOG.md # packages/dev-utils/package.json # packages/ethereum-types/CHANGELOG.json # packages/ethereum-types/CHANGELOG.md # packages/ethereum-types/package.json # packages/fill-scenarios/CHANGELOG.json # packages/fill-scenarios/CHANGELOG.md # packages/fill-scenarios/package.json # packages/instant/package.json # packages/instant/src/types.ts # packages/json-schemas/CHANGELOG.json # packages/json-schemas/CHANGELOG.md # packages/json-schemas/package.json # packages/metacoin/package.json # packages/migrations/CHANGELOG.json # packages/migrations/CHANGELOG.md # packages/migrations/package.json # packages/order-utils/CHANGELOG.json # packages/order-utils/CHANGELOG.md # packages/order-utils/package.json # packages/order-watcher/CHANGELOG.json # packages/order-watcher/CHANGELOG.md # packages/order-watcher/package.json # packages/pipeline/package.json # packages/pipeline/src/ormconfig.ts # packages/pipeline/src/parsers/ddex_orders/index.ts # packages/pipeline/src/parsers/oasis_orders/index.ts # packages/pipeline/src/parsers/paradex_orders/index.ts # packages/pipeline/src/parsers/token_metadata/index.ts # packages/pipeline/src/scripts/pull_competing_dex_trades.ts # packages/pipeline/src/scripts/pull_ddex_orderbook_snapshots.ts # packages/pipeline/src/scripts/pull_idex_orderbook_snapshots.ts # packages/pipeline/src/scripts/pull_missing_blocks.ts # packages/pipeline/src/scripts/pull_oasis_orderbook_snapshots.ts # packages/pipeline/src/scripts/pull_paradex_orderbook_snapshots.ts # packages/pipeline/src/scripts/pull_trusted_tokens.ts # packages/pipeline/src/scripts/update_relayer_info.ts # packages/pipeline/src/utils/get_ohlcv_trading_pairs.ts # packages/pipeline/src/utils/index.ts # packages/pipeline/test/parsers/ddex_orders/index_test.ts # packages/pipeline/test/parsers/oasis_orders/index_test.ts # packages/pipeline/test/parsers/paradex_orders/index_test.ts # packages/react-docs/CHANGELOG.json # packages/react-docs/CHANGELOG.md # packages/react-docs/package.json # packages/react-shared/CHANGELOG.json # packages/react-shared/CHANGELOG.md # packages/react-shared/package.json # packages/sol-compiler/CHANGELOG.md # packages/sol-compiler/package.json # packages/sol-cov/CHANGELOG.json # packages/sol-cov/CHANGELOG.md # packages/sol-cov/package.json # packages/sol-doc/CHANGELOG.json # packages/sol-doc/CHANGELOG.md # packages/sol-doc/package.json # packages/sol-resolver/CHANGELOG.md # packages/sol-resolver/package.json # packages/sra-spec/CHANGELOG.json # packages/sra-spec/CHANGELOG.md # packages/sra-spec/package.json # packages/subproviders/CHANGELOG.json # packages/subproviders/CHANGELOG.md # packages/subproviders/package.json # packages/testnet-faucets/package.json # packages/types/CHANGELOG.md # packages/types/package.json # packages/typescript-typings/CHANGELOG.json # packages/typescript-typings/CHANGELOG.md # packages/typescript-typings/package.json # packages/utils/CHANGELOG.json # packages/utils/CHANGELOG.md # packages/utils/package.json # packages/web3-wrapper/CHANGELOG.json # packages/web3-wrapper/CHANGELOG.md # packages/web3-wrapper/package.json # packages/website/package.json # packages/website/public/index.html # packages/website/ts/pages/instant/fee_percentage_slider.tsx # yarn.lock
| | * | | Add id propFred Carlsen2018-12-151-0/+1
| | | | |
| | * | | Jump down to configuratorFred Carlsen2018-12-151-4/+4
| | | | |
| | * | | Fix default heading sizeFred Carlsen2018-12-151-0/+4
| | | | |
| | * | | Update routesFred Carlsen2018-12-151-17/+10
| | | | |
| | * | | Update links and routesFred Carlsen2018-12-159-30/+36
| | | | |