GitLab

* 'hotfix/dec-1' of https://github.com/LLK/scratch-www:
  update transifex config to reflect new conference page
  fix lint
  update translations to just use `FormattedMessage`
  Change back routeAlias for conference pages
  Add Learning Resource designer (#1676)
  Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673)
  Fix #1649: Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650) (#1663)

# Conflicts:
#	src/routes.json
#	src/views/conference/2018/index/index.jsx
#	src/views/conference/2018/index/l10n.json

whoops!

These are needed to ensure that fastly doesn’t 404 on the 2016 and 2017 sites.

* add 2018 conference page (new subdirectory and index page)

* Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences.

* Update mailto link in the footer

* add 2018 conference page (new subdirectory and index page)

* Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences.

* Update mailto link in the footer

Issue/add signing out

Updated selenium & chromedriver versions, which fixed test failures i…

Fix #1668 (Update llk link)

Invite logged-out users to ‘Get Started with Coding!’, and make the whole Scratch animation clickable (goes to the Animate a Name tutorial).

See #1664

Feature/hoc 2017

* Adds fix to #1644

* Update l10n.json

* Add files via upload

* Add files via upload

* Delete index.jsx

* Delete index.scss

* Delete l10n.json

* Update index.jsx

* Update l10n.json

* Update l10n.json

* Update index.jsx

* Fixes #1645

* Fixes #1644 as well

* hopefully this should fix it

* Update download.jsx

* Update download.jsx

* Add ScratchJr Section Localization

* Add Localization for ScratchJr and "Projects"

* Update ScratchJr String / Remove ScratchJr Title

* Readd "ScratchJr"

* Adds fix to #1644

* Update l10n.json

* Add files via upload

* Add files via upload

* Delete index.jsx

* Delete index.scss

* Delete l10n.json

* Update index.jsx

* Update l10n.json

* Update l10n.json

* Update index.jsx

Css animated top banner

Middle banner of activities - responsive

https://github.com/LLK/scratchr2/issues/4869

Also updated ttt see-more/open- modal link to be consistent with the new icon from Carl.

[Develop] Release 2.2.26

[Master] Release 2.2.26

Fix GH-1652: resolve typo in social message count name

I think this happened when I was resolving a merge conflict, and I confused the naming from previous/new along the way. Thanks @jwzimmer!

Fixes #1652

Point at GulpTea’s avatar in credits page

* issue/gh-1546:
  Make api request on filter change
  render load more even if messages not there

# Conflicts:
#	src/views/messages/container.jsx
#	src/views/messages/presentation.jsx

This fixes #1546 by using an updated api endpoint that accepts filter arguments.

Updated selenium & chromedriver versions, which fixed test failures in test_footer_links. Also fixed the clickFooterLinks function so it only checks links in the footer, to remove false positives (e.g. test finds 'Tips' in navbar and passes).

* Add it's free string
* Add it's free string into page
* Update presentation.jsx

* Adding new mods and moving others to "Previous MIT Scratch Team Members" maintaining alphabetical order

Email Settings -> Email

fixes #1568 by imposing a hidden state on overflow text.