Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | feat: use PureComponent instead of Component | fragosti | 2019-01-02 | 16 | -18/+18 |
| | |||||
* | Merge pull request #1470 from 0xProject/feature/website/0x-org-cleanup | Francesco Agosti | 2019-01-02 | 269 | -4062/+645 |
|\ | | | | | [website] Remove @next dir, remove unused files. | ||||
| * | fix: merge conflict | fragosti | 2018-12-27 | 1 | -10/+15 |
| |\ | |||||
| * | | fix: remove --json flag from build | fragosti | 2018-12-21 | 1 | -1/+1 |
| | | | |||||
| * | | feat: move over @next images as well, selectively delete | fragosti | 2018-12-21 | 121 | -364/+0 |
| | | | |||||
| * | | feat: remove unused files | fragosti | 2018-12-21 | 29 | -2818/+1 |
| | | | |||||
| * | | feat: make project build by adding back old footer component | fragosti | 2018-12-21 | 10 | -12/+240 |
| | | | |||||
| * | | feat: remove @next directory from all imports | fragosti | 2018-12-21 | 40 | -204/+204 |
| | | | |||||
| * | | feat: move all @next files to non @next directory | fragosti | 2018-12-21 | 119 | -676/+212 |
| | | | |||||
* | | | feat: use kovan.0xproject.com instead of kovan.0x.org | fragosti | 2018-12-27 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge pull request #1476 from 0xProject/fix/website/build-errors | Steve Klebanoff | 2018-12-26 | 1 | -1/+0 |
|\ \ | | | | | | | [website] Fix duplicate props which made ci build break | ||||
| * | | fix(website): Fix bad merge | Steve Klebanoff | 2018-12-25 | 1 | -1/+0 |
|/ / | |||||
* | | Merge pull request #1469 from 0xProject/fix/website/job-openings | Steve Klebanoff | 2018-12-22 | 2 | -10/+16 |
|\ \ | |/ |/| | [website] Tweak job listings | ||||
| * | fix(website): Cleanup jobs section | Steve Klebanoff | 2018-12-21 | 2 | -8/+13 |
| | | |||||
| * | make percentage 100% | Steve Klebanoff | 2018-12-21 | 1 | -1/+1 |
| | | |||||
| * | give more space to job title and change apply link | Steve Klebanoff | 2018-12-21 | 2 | -4/+6 |
| | | |||||
* | | Merge pull request #1434 from 0xProject/fix/instant/signature-denied | Brandon Millman | 2018-12-21 | 9 | -6/+38 |
|\ \ | | | | | | | [instant] fix signature denial error message and add trust wallet detection | ||||
| * \ | Merge branch 'development' into fix/instant/signature-denied | Brandon Millman | 2018-12-21 | 400 | -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 errors | Brandon Millman | 2018-12-21 | 2 | -1/+7 |
| | | | | |||||
| * | | | feature(contract-wrappers): add support for Trust Wallet signature denial ↵ | Brandon Millman | 2018-12-21 | 3 | -2/+14 |
| | | | | | | | | | | | | | | | | errors when trying to sense signature denial from a provider | ||||
| * | | | fix(instant): add analytics to unknown error on executeBuyAsync | Brandon Millman | 2018-12-21 | 1 | -0/+1 |
| | | | | |||||
| * | | | fix(instant): catch unknown errors from executeBuyAsync, report them and ↵ | Brandon Millman | 2018-12-21 | 3 | -4/+9 |
| | | | | | | | | | | | | | | | | show could not submit transaction | ||||
| * | | | fix(instant): use isTrust property to determine if provider is trust wallet | Brandon Millman | 2018-12-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | feature(instant): add trust wallet detection | Brandon Millman | 2018-12-15 | 3 | -0/+4 |
| | | | | |||||
| * | | | fix(instant): treat executeBuyQuote errors as signature denials | Brandon Millman | 2018-12-15 | 1 | -5/+9 |
| | | | | |||||
* | | | | Merge pull request #1467 from 0xProject/fix/website/remove-placeholders | Steve Klebanoff | 2018-12-21 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | [website] Don't show placeholder text on contact page | ||||
| * | | | | Remove using label as placeholder | Steve Klebanoff | 2018-12-21 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1466 from 0xProject/feature/website/remove-ts-warnings | Steve Klebanoff | 2018-12-21 | 20 | -959/+26 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | [website] Fix TS errors | ||||
| * | | | | Don't allow compiling with errors | Steve Klebanoff | 2018-12-21 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Declare imported package which doesn't have types | Steve Klebanoff | 2018-12-21 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fix types | Steve Klebanoff | 2018-12-21 | 3 | -3/+4 |
| | | | | | |||||
| * | | | | Fix types | Steve Klebanoff | 2018-12-21 | 4 | -3/+8 |
| | | | | | |||||
| * | | | | Fix TS error w/ children on portal | Steve Klebanoff | 2018-12-21 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Rename props and fix router types | Steve Klebanoff | 2018-12-21 | 1 | -4/+8 |
| | | | | | |||||
| * | | | | Fix StyledCommunityLink props | Steve Klebanoff | 2018-12-21 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | remove unused file | Steve Klebanoff | 2018-12-20 | 1 | -170/+0 |
| | | | | | |||||
| * | | | | remove unused instant pages | Steve Klebanoff | 2018-12-20 | 7 | -776/+0 |
| | | | | | |||||
* | | | | | Merge pull request #1468 from 0xProject/feature/contracts/unfix-compiler-version | Amir Bandeali | 2018-12-21 | 76 | -75/+76 |
|\ \ \ \ \ | | | | | | | | | | | | | Unfix Solidity compiler version except for top level contracts | ||||
| * | | | | | Unfix compiler version except for top level contracts | Amir Bandeali | 2018-12-21 | 76 | -75/+76 |
| | | | | | | |||||
* | | | | | | Merge pull request #1463 from 0xProject/feature/website/new-logos | Steve Klebanoff | 2018-12-21 | 6 | -4/+101 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | [website] Add new relayers | ||||
| * | | | | | Merge branch 'development' into feature/website/new-logos | Steve Klebanoff | 2018-12-21 | 79 | -242/+5357 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | New relayers | Steve Klebanoff | 2018-12-20 | 6 | -4/+101 |
| | | | | | | |||||
* | | | | | | Merge pull request #1462 from bakkenbaeck/feature/website/0x-org | Steve Klebanoff | 2018-12-21 | 11 | -3/+23 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | [website] Fixes | ||||
| * | | | | | Reapply prettier | Fred Carlsen | 2018-12-20 | 2 | -6/+8 |
| | | | | | | |||||
| * | | | | | Disable fee slider when no address is put in | Fred Carlsen | 2018-12-20 | 2 | -1/+2 |
| | | | | | | |||||
| * | | | | | Fix page titles | Fred Carlsen | 2018-12-20 | 9 | -6/+25 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'upstream/feature/website/0x-org' into ↵ | Fred Carlsen | 2018-12-20 | 106 | -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 route | Fred Carlsen | 2018-12-19 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/development' into feature/website/0x-org | Fred Carlsen | 2018-12-19 | 20 | -153/+379 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Added routes | Fred Carlsen | 2018-12-18 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Added community and market maker routes | Fred Carlsen | 2018-12-18 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Left-align hero on mobile | Fred Carlsen | 2018-12-18 | 2 | -3/+9 |
| | | | | | | | | |||||
| * | | | | | | | Change cursor on dropdown triggers | Fred Carlsen | 2018-12-18 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Tweak market maker | Fred Carlsen | 2018-12-18 | 7 | -14/+69 |
| | | | | | | | | |||||
| * | | | | | | | Mobile tweaks | Fred Carlsen | 2018-12-18 | 2 | -3/+28 |
| | | | | | | | | |||||
| * | | | | | | | Prevent overflow on instant page | Fred Carlsen | 2018-12-18 | 1 | -0/+6 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1464 from ↵ | Amir Bandeali | 2018-12-21 | 15 | -22/+30 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/contracts-extensions/orderValidator Move OrderValidator to extensions | ||||
| * | | | | | | | Move OrderValidator to extensions | Amir Bandeali | 2018-12-21 | 15 | -22/+30 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1117 from 0xProject/feature/contracts/orderMatcher | Amir Bandeali | 2018-12-21 | 17 | -5/+1394 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Implement OrderMatcher | ||||
| * | | | | | | | Update CHANGELOG | Amir Bandeali | 2018-12-21 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Remove assembly version of matchOrders | Amir Bandeali | 2018-12-21 | 2 | -369/+52 |
| | | | | | | | | |||||
| * | | | | | | | Add getOrderInfo check before calling fillOrder | Amir Bandeali | 2018-12-21 | 2 | -124/+242 |
| | | | | | | | | |||||
| * | | | | | | | Update comments and hard code function selector constants | Amir Bandeali | 2018-12-21 | 2 | -53/+56 |
| | | | | | | | | |||||
| * | | | | | | | Fix build after rebase | Amir Bandeali | 2018-12-21 | 9 | -784/+22 |
| | | | | | | | | |||||
| * | | | | | | | update comments | Amir Bandeali | 2018-12-21 | 6 | -13/+17 |
| | | | | | | | | |||||
| * | | | | | | | Fix build and add back tests | Amir Bandeali | 2018-12-21 | 4 | -4/+776 |
| | | | | | | | | |||||
| * | | | | | | | Update dependency paths | Amir Bandeali | 2018-12-21 | 1 | -6/+6 |
| | | | | | | | | |||||
| * | | | | | | | Add OrderMatcher tests | Amir Bandeali | 2018-12-21 | 5 | -2/+774 |
| | | | | | | | | |||||
| * | | | | | | | feat: Add OrderMatcher contract that takes spread in multiple assets by ↵ | Amir Bandeali | 2018-12-21 | 10 | -1/+796 |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | calling `matchOrders` followed by `fillOrder` | ||||
* | | | | | | | Merge pull request #1455 from 0xProject/fix/contracts/MAPupdates | Amir Bandeali | 2018-12-21 | 3 | -4/+46 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Add validation to MAP | ||||
| * | | | | | | Update CHANGELOG | Amir Bandeali | 2018-12-21 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Use more efficient equality checks | Amir Bandeali | 2018-12-21 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Add note about input validation | Amir Bandeali | 2018-12-21 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | Use more efficient check for overflow | Amir Bandeali | 2018-12-21 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | Check if amount == 0 before doing division | Amir Bandeali | 2018-12-21 | 2 | -1/+36 |
|/ / / / / / | |||||
* | | | | | | feat(sra_client.py): Test deployed pkg via tox | F. Eugene Aumson | 2018-12-20 | 1 | -0/+14 |
| | | | | | | |||||
* | | | | | | Merge pull request #1448 from 0xProject/feature/website/0x-org | Steve Klebanoff | 2018-12-20 | 231 | -127/+8792 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | [website][react-shared][instant] 0x org | ||||
| * | | | | | Merge branch 'development' into feature/website/0x-org | Steve Klebanoff | 2018-12-20 | 64 | -235/+3892 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #1457 from 0xProject/feature/website/0x-org-linting | Steve Klebanoff | 2018-12-20 | 42 | -398/+498 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | [website] 0x org linting and prettier | ||||
| | * | | | | | Declare interface and make isNoBorder optional | Steve Klebanoff | 2018-12-19 | 1 | -1/+4 |
| | | | | | | | |||||
| | * | | | | | Type definition so TS knows it has defaultProps | Steve Klebanoff | 2018-12-19 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Move Hero to bottom, give interface explicit names | Steve Klebanoff | 2018-12-19 | 1 | -45/+51 |
| | | | | | | | |||||
| | * | | | | | Linting | Steve Klebanoff | 2018-12-19 | 1 | -1/+4 |
| | | | | | | | |||||
| | * | | | | | includeEmpty -> shouldIncludeEmpty | Steve Klebanoff | 2018-12-19 | 2 | -5/+5 |
| | | | | | | | |||||
| | * | | | | | Get rid of unused import | Steve Klebanoff | 2018-12-19 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | Move imports and put action into var | Steve Klebanoff | 2018-12-19 | 1 | -9/+8 |
| | | | | | | | |||||
| | * | | | | | Move imports | Steve Klebanoff | 2018-12-19 | 1 | -4/+3 |
| | | | | | | | |||||
| | * | | | | | Remove comments | Steve Klebanoff | 2018-12-19 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | Not assigning to variable because we never used the variable | Steve Klebanoff | 2018-12-19 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Removing unused interface | Steve Klebanoff | 2018-12-19 | 1 | -4/+0 |
| | | | | | | | |||||
| | * | | | | | Removing unused imports | Steve Klebanoff | 2018-12-19 | 3 | -24/+14 |
| | | | | | | | |||||
| | * | | | | | useAnchorTag -> shouldUseAnchorTag | Steve Klebanoff | 2018-12-19 | 4 | -8/+8 |
| | | | | | | | |||||
| | * | | | | | run prettier on website | Steve Klebanoff | 2018-12-19 | 32 | -297/+404 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1456 from 0xProject/feature/website/0x-org-bb-fixes-rebase | Steve Klebanoff | 2018-12-19 | 11 | -20/+115 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | [website] Bakken & Baeck 0x.org website fixes | ||||
| | * | | | | | Remove community and market maker route | Fred Carlsen | 2018-12-19 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | Added routes | Fred Carlsen | 2018-12-19 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Added community and market maker routes | Fred Carlsen | 2018-12-19 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Left-align hero on mobile | Fred Carlsen | 2018-12-19 | 2 | -3/+9 |
| | | | | | | | |||||
| | * | | | | | Change cursor on dropdown triggers | Fred Carlsen | 2018-12-19 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Tweak market maker | Fred Carlsen | 2018-12-19 | 7 | -14/+69 |
| | | | | | | | |||||
| | * | | | | | Mobile tweaks | Fred Carlsen | 2018-12-19 | 2 | -3/+28 |
| | | | | | | | |||||
| | * | | | | | Prevent overflow on instant page | Fred Carlsen | 2018-12-19 | 1 | -0/+6 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'development' into feature/website/0x-org | Steve Klebanoff | 2018-12-19 | 20 | -153/+379 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| * | | | | fix(website): fix broken copper form post link | Brandon Millman | 2018-12-18 | 1 | -21/+40 |
| | | | | | |||||
| * | | | | Merge pull request #1452 from 0xProject/feature/website/0x-org-flawless | Francesco Agosti | 2018-12-18 | 3 | -15/+10 |
| |\ \ \ \ | | | | | | | | | | | | | [website] 0x org flawless | ||||
| | * | | | | fix: uppercase K | fragosti | 2018-12-18 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | feat: update stats | fragosti | 2018-12-18 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | feat: make 0x.org #flawless | fragosti | 2018-12-18 | 2 | -13/+8 |
| | | | | | | |||||
| * | | | | | Merge pull request #1449 from 0xProject/feature/website/0x-org-steve-links | Steve Klebanoff | 2018-12-18 | 6 | -148/+144 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | [website] 0x.org Launch Kit and Ecosystem links | ||||
| | * | | | | Fix link | Steve Klebanoff | 2018-12-18 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Merge branch 'feature/website/0x-org' into feature/website/0x-org-steve-links | Steve Klebanoff | 2018-12-18 | 18 | -226/+281 |
| | |\ \ \ \ | |||||
| | * | | | | | Use constants | Steve Klebanoff | 2018-12-18 | 1 | -9/+5 |
| | | | | | | | |||||
| | * | | | | | Link homepage to Why#cases | Steve Klebanoff | 2018-12-18 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Per Matt's sugestion change personalized to dedicated | Steve Klebanoff | 2018-12-18 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Ecosystem links | Steve Klebanoff | 2018-12-18 | 2 | -2/+16 |
| | | | | | | | |||||
| | * | | | | | Prettify ecosystem | Steve Klebanoff | 2018-12-18 | 1 | -52/+54 |
| | | | | | | | |||||
| | * | | | | | Capitalize K in Launch Kit | Steve Klebanoff | 2018-12-18 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Prettify dropdown | Steve Klebanoff | 2018-12-18 | 1 | -26/+16 |
| | | | | | | | |||||
| | * | | | | | Allow banner to open in new window | Steve Klebanoff | 2018-12-18 | 2 | -3/+13 |
| | | | | | | | |||||
| | * | | | | | Prettify banner | Steve Klebanoff | 2018-12-18 | 1 | -37/+26 |
| | | | | | | | |||||
| | * | | | | | Remove unused target | Steve Klebanoff | 2018-12-18 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'feature/website/0x-org' into feature/website/0x-org-steve-links | Steve Klebanoff | 2018-12-18 | 7 | -121/+188 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | fragment and launchkit url | Steve Klebanoff | 2018-12-18 | 1 | -3/+7 |
| | | | | | | | | |||||
| | * | | | | | | prettify launch kit | Steve Klebanoff | 2018-12-18 | 1 | -29/+19 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1451 from 0xProject/feature/website/0x-org-hide-links | Steve Klebanoff | 2018-12-18 | 2 | -4/+0 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | [website] 0x.org Remove unused paths | ||||
| | * | | | | | | Merge branch 'feature/website/0x-org' into feature/website/0x-org-hide-links | Steve Klebanoff | 2018-12-18 | 12 | -151/+208 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Remove community and market-maker URLs | Steve Klebanoff | 2018-12-18 | 2 | -4/+0 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #1450 from 0xProject/feature/website/0x-org-about | Francesco Agosti | 2018-12-18 | 6 | -76/+74 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | [website] 0x org about | ||||
| | * | | | | | | feat: redirect careers to jobs | fragosti | 2018-12-18 | 2 | -1/+3 |
| | | | | | | | | |||||
| | * | | | | | | feat: add links to press page | fragosti | 2018-12-18 | 1 | -5/+7 |
| | | | | | | | | |||||
| | * | | | | | | feat: remove download our presskit copy | fragosti | 2018-12-18 | 1 | -2/+1 |
| | | | | | | | | |||||
| | * | | | | | | feat: add press mailto link | fragosti | 2018-12-18 | 1 | -5/+11 |
| | | | | | | | | |||||
| | * | | | | | | fix: use new AboutPageLayout API everywhere | fragosti | 2018-12-18 | 2 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | feat: update job titles | fragosti | 2018-12-18 | 1 | -30/+16 |
| | | | | | | | | |||||
| | * | | | | | | fix: mission and values link to new tab and not append | fragosti | 2018-12-18 | 2 | -27/+30 |
| | | | | | | | | |||||
| | * | | | | | | feat: link to mission and values | fragosti | 2018-12-18 | 1 | -9/+9 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1447 from 0xProject/feature/website/0x-org-jank-links | Francesco Agosti | 2018-12-18 | 12 | -151/+208 |
| |\| | | | | | | | |/ / / / / | |/| | | | | | [website] Fix 0x org jank links | ||||
| | * | | | | | feat: add react-shared release notes | fragosti | 2018-12-18 | 1 | -0/+10 |
| | | | | | | | |||||
| | * | | | | | feat: more blog url fixes | fragosti | 2018-12-18 | 3 | -26/+26 |
| | | | | | | | |||||
| | * | | | | | feat: fix blog link | fragosti | 2018-12-18 | 3 | -3/+4 |
| | | | | | | | |||||
| | * | | | | | feat: final footer polish | fragosti | 2018-12-18 | 2 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'feature/website/0x-org' of ↵ | fragosti | 2018-12-18 | 16 | -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-config | Steve Klebanoff | 2018-12-18 | 7 | -121/+188 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | [website] 0x.org Instant | ||||
| | * | | | | | Open all new instant links in new window | Steve Klebanoff | 2018-12-18 | 4 | -17/+24 |
| | | | | | | | |||||
| | * | | | | | Fix URLs | Steve Klebanoff | 2018-12-18 | 1 | -8/+4 |
| | | | | | | | |||||
| | * | | | | | Conditional getStartedClick working on features list | Steve Klebanoff | 2018-12-18 | 1 | -10/+11 |
| | | | | | | | |||||
| | * | | | | | Action takes in useAnchorTag | Steve Klebanoff | 2018-12-18 | 1 | -2/+11 |
| | | | | | | | |||||
| | * | | | | | Janky but didn't want to mess anything else up, send in useAnchorTag boolean ↵ | Steve Klebanoff | 2018-12-18 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to force using anchortag | ||||
| | * | | | | | Prettify button.tsx | Steve Klebanoff | 2018-12-18 | 1 | -21/+21 |
| | | | | | | | |||||
| | * | | | | | Prettify file | Steve Klebanoff | 2018-12-18 | 1 | -22/+15 |
| | | | | | | | |||||
| | * | | | | | Custom getStartedLink based on screen size | Steve Klebanoff | 2018-12-18 | 1 | -2/+16 |
| | | | | | | | |||||
| | * | | | | | Run prettifier | Steve Klebanoff | 2018-12-18 | 1 | -36/+60 |
| | | | | | | | |||||
| | * | | | | | Add includeEmpty option | Steve Klebanoff | 2018-12-18 | 2 | -18/+29 |
| | | | | | | | |||||
| | * | | | | | prettify file | Steve Klebanoff | 2018-12-18 | 1 | -2/+13 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1445 from 0xProject/feature/0x-org-stats | Steve Klebanoff | 2018-12-18 | 1 | -34/+13 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | [website] 0x.org stats | ||||
| | * | | | | | | total stats | Steve Klebanoff | 2018-12-18 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | prettify about page | Steve Klebanoff | 2018-12-18 | 1 | -34/+13 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1442 from 0xProject/feature/website/0x-org-analytics | Steve Klebanoff | 2018-12-18 | 1 | -15/+50 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [website] 0x.org: Allow manual triggering of error, and report newsletter errors to Rollbar | ||||
| | * | | | | | | | manually trigger error and also send in newsletter errors | Steve Klebanoff | 2018-12-18 | 1 | -3/+7 |
| | | | | | | | | | |||||
| | * | | | | | | | apply prettier | Steve Klebanoff | 2018-12-18 | 1 | -14/+45 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1443 from 0xProject/feature/website/0x-org-portal-updated | Brandon Millman | 2018-12-18 | 3 | -44/+34 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | [0x.org] fix portal | ||||
| | * | | | | | | | fix(website): update Animation component for styled components v4 | Brandon Millman | 2018-12-18 | 3 | -44/+34 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #1441 from 0xProject/feature/website/0x-org-jobs-update | Brandon Millman | 2018-12-18 | 3 | -105/+153 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | [0x.org] update jobs page to load positions from greenhouse | ||||
| | * | | | | | | fix(website): redirect /jobs to /about/jobs | Brandon Millman | 2018-12-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | feature(website): implement loading jobs from greenhouse in jobs page | Brandon Millman | 2018-12-18 | 1 | -99/+149 |
| | | | | | | | | |||||
| | * | | | | | | chore(website): yarn lock | Brandon Millman | 2018-12-18 | 1 | -5/+3 |
| |/ / / / / / | |||||
| * / / / / / | fix(website): fix mis-replaced website api backend links | Brandon Millman | 2018-12-18 | 1 | -2/+2 |
| |/ / / / / | |||||
| | * | | | | feat: fix footer links | fragosti | 2018-12-18 | 3 | -23/+25 |
| | | | | | | |||||
| | * | | | | feat: fix links in navbar and dropdown | fragosti | 2018-12-18 | 4 | -51/+71 |
| | | | | | | |||||
| | * | | | | feat: use react-shared Link component | fragosti | 2018-12-18 | 1 | -9/+21 |
| | | | | | | |||||
| | * | | | | feat: update developer dropdown links | fragosti | 2018-12-18 | 2 | -54/+33 |
| |/ / / / | |||||
| * | | | | Merge pull request #1440 from bakkenbaeck/feature/website/0x-org | Francesco Agosti | 2018-12-18 | 66 | -197/+939 |
| |\ \ \ \ | | | | | | | | | | | | | Feature/website/0x org | ||||
| | * | | | | Fixes hamburger icon bgcolor, jobs link | Ezekiel Aquino | 2018-12-18 | 2 | -2/+1 |
| | | | | | | |||||
| | * | | | | Add definition | Fred Carlsen | 2018-12-18 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Increase header tolerances | Fred Carlsen | 2018-12-18 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Show errors from serverside | Fred Carlsen | 2018-12-18 | 2 | -7/+69 |
| | | | | | | |||||
| | * | | | | Update community page | Fred Carlsen | 2018-12-18 | 5 | -40/+100 |
| | | | | | | |||||
| | * | | | | Add community links | Fred Carlsen | 2018-12-18 | 7 | -0/+24 |
| | | | | | | |||||
| | * | | | | Replace share image | Fred Carlsen | 2018-12-18 | 1 | -0/+0 |
| | | | | | | |||||
| | * | | | | Removes content transform on mobile nav toggle | Ezekiel Aquino | 2018-12-18 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Untoggles nav on headroom unpin | Ezekiel Aquino | 2018-12-18 | 1 | -1/+7 |
| | | | | | | |||||
| | * | | | | Adds headroom instead for toggling nav visibility | Ezekiel Aquino | 2018-12-18 | 3 | -44/+37 |
| | | | | | | |||||
| | * | | | | Fix default margin | Fred Carlsen | 2018-12-18 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update lock file | Fred Carlsen | 2018-12-18 | 1 | -4/+13 |
| | | | | | | |||||
| | * | | | | Fix about intros | Fred Carlsen | 2018-12-18 | 2 | -2/+11 |
| | | | | | | |||||
| | * | | | | Fixes mobile nav overflow on mobile | Ezekiel Aquino | 2018-12-18 | 2 | -3/+12 |
| | | | | | | |||||
| | * | | | | Added Community page | Fred Carlsen | 2018-12-17 | 3 | -1/+226 |
| | | | | | | |||||
| | * | | | | Add def for react-scrollable-anchor | Fred Carlsen | 2018-12-17 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Prepare banner for light theme | Fred Carlsen | 2018-12-17 | 1 | -1/+6 |
| | | | | | | |||||
| | * | | | | Tweak banner border on mobile | Fred Carlsen | 2018-12-17 | 1 | -0/+7 |
| | | | | | | |||||
| | * | | | | Fix cta links | Fred Carlsen | 2018-12-17 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Add market maker page | Fred Carlsen | 2018-12-17 | 3 | -0/+130 |
| | | | | | | |||||
| | * | | | | Tweak configurator | Fred Carlsen | 2018-12-17 | 3 | -5/+16 |
| | | | | | | |||||
| | * | | | | Update long term impact icon | Fred Carlsen | 2018-12-17 | 1 | -7/+7 |
| | | | | | | |||||
| | * | | | | Fix liquidity source change | Fred Carlsen | 2018-12-17 | 2 | -4/+6 |
| | | | | | | |||||
| | * | | | | Update og image | Fred Carlsen | 2018-12-17 | 1 | -0/+0 |
| | | | | | | |||||
| | * | | | | Fixes scrollable anchors in why page | Ezekiel Aquino | 2018-12-17 | 2 | -46/+55 |
| | | | | | | |||||
| | * | | | | Fix wrong icon name | Fred Carlsen | 2018-12-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Adjust thick stroked svgs | Fred Carlsen | 2018-12-17 | 3 | -25/+30 |
| | | | | | | |||||
| | * | | | | Fix footer link hover states | Ezekiel Aquino | 2018-12-17 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fixes mobile button layout for Definition component | Ezekiel Aquino | 2018-12-17 | 2 | -3/+15 |
| | | | | | | |||||
| | * | | | | Resolves font flicker on route change | Ezekiel Aquino | 2018-12-17 | 3 | -18/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Adds formular css to globally linked css | ||||
| | * | | | | Update client list + logos | Fred Carlsen | 2018-12-17 | 18 | -14/+178 |
| | | | | | | |||||
| | * | | | | Fix newsletter input color in light theme | Fred Carlsen | 2018-12-17 | 1 | -5/+15 |
| | | | | | | |||||
| | * | | | | Fix launch kit link | Fred Carlsen | 2018-12-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix stray tag | Fred Carlsen | 2018-12-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix typo | Fred Carlsen | 2018-12-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix homepage icon | Fred Carlsen | 2018-12-17 | 1 | -6/+6 |
| | | | | | | |||||
| | * | | | | Fix mobile links | Fred Carlsen | 2018-12-17 | 1 | -5/+5 |
| | | | | | | |||||
| | * | | | | Fix portal link | Fred Carlsen | 2018-12-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix mobile nav placement | Fred Carlsen | 2018-12-17 | 1 | -0/+2 |
| |/ / / / | |||||
| * | | | | feat: update prod deploy destination | fragosti | 2018-12-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | chore(website): yarn lock | Brandon Millman | 2018-12-15 | 1 | -17/+487 |
| | | | | | |||||
| * | | | | fix(website) replace 0xproject.com with 0x.org | Brandon Millman | 2018-12-15 | 31 | -56/+56 |
| | | | | | |||||
| * | | | | Merge pull request #1375 from bakkenbaeck/website | Brandon Millman | 2018-12-15 | 187 | -21/+7099 |
| |\ \ \ \ | | |_|_|/ | |/| | | | [WIP] Website | ||||
| | * | | | Fix logo link | Fred Carlsen | 2018-12-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'upstream/development' into website | Fred Carlsen | 2018-12-15 | 155 | -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 prop | Fred Carlsen | 2018-12-15 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Jump down to configurator | Fred Carlsen | 2018-12-15 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Fix default heading size | Fred Carlsen | 2018-12-15 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | Update routes | Fred Carlsen | 2018-12-15 | 1 | -17/+10 |
| | | | | | |||||
| | * | | | Update links and routes | Fred Carlsen | 2018-12-15 | 9 | -30/+36 |
| | | | | | |||||
| | * | | | Update links | Fred Carlsen | 2018-12-15 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | Copy fixes | Fred Carlsen | 2018-12-15 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | Add contact modal to pages with contact link | Fred Carlsen | 2018-12-15 | 4 | -59/+112 |
| | | | | | |||||
| | * | | | Fix modal submit | Fred Carlsen | 2018-12-15 | 1 | -7/+18 |
| | | | | | |||||
| | * | | | Change chapter link | Fred Carlsen | 2018-12-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fix xianny | Fred Carlsen | 2018-12-15 | 2 | -1/+1 |
| | | | | | |||||
| | * | | | Tweak modal confirmatino | Fred Carlsen | 2018-12-15 | 2 | -1/+16 |
| | | | | | |||||
| | * | | | Type fixes | Fred Carlsen | 2018-12-15 | 8 | -34/+43 |
| | | | | | |||||
| | * | | | Type fixes | Fred Carlsen | 2018-12-15 | 2 | -3/+1 |
| | | | | | |||||
| | * | | | Type fixes | Fred Carlsen | 2018-12-15 | 3 | -6/+8 |
| | | | | | |||||
| | * | | | Type fixes | Fred Carlsen | 2018-12-15 | 8 | -42/+55 |
| | | | | | |||||
| | * | | | Fixes | Fred Carlsen | 2018-12-15 | 2 | -0/+7 |
| | | | | | |||||
| | * | | | Tweak mission | Fred Carlsen | 2018-12-15 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Finish tweaking team | Fred Carlsen | 2018-12-15 | 1 | -7/+37 |
| | | | | | |||||
| | * | | | Cleanup | Ezekiel Aquino | 2018-12-15 | 1 | -5/+0 |
| | | | | | |||||
| | * | | | Cleanup | Ezekiel Aquino | 2018-12-15 | 2 | -38/+3 |
| | | | | | |||||
| | * | | | Cleanup ecosystem | Ezekiel Aquino | 2018-12-15 | 1 | -3/+1 |
| | | | | | |||||
| | * | | | Cleanup select | Ezekiel Aquino | 2018-12-15 | 1 | -13/+0 |
| | | | | | |||||
| | * | | | Cleanup configurator | Ezekiel Aquino | 2018-12-15 | 1 | -11/+5 |
| | | | | | |||||
| | * | | | Cleanup | Ezekiel Aquino | 2018-12-15 | 1 | -33/+1 |
| | | | | | |||||
| | * | | | Cleanup | Ezekiel Aquino | 2018-12-15 | 1 | -10/+3 |
| | | | | | |||||
| | * | | | More Cleanup | Ezekiel Aquino | 2018-12-15 | 1 | -33/+2 |
| | | | | | |||||
| | * | | | Add links to ecosystem | Fred Carlsen | 2018-12-15 | 1 | -7/+29 |
| | | | | | |||||
| | * | | | Misc typing | Fred Carlsen | 2018-12-15 | 3 | -3/+4 |
| | | | | | |||||
| | * | | | Add missing colors | Fred Carlsen | 2018-12-15 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Change ecosystem route | Fred Carlsen | 2018-12-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Link ecosystem | Fred Carlsen | 2018-12-15 | 2 | -92/+63 |
| | | | | | |||||
| | * | | | Replace launch kit icon | Fred Carlsen | 2018-12-15 | 2 | -2/+2 |
| | | | | |