GitLab

* 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

* 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

[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.

* 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.

* Removing moderator job listing

* Update moderator.jsx

* fix typo

"many not" -> "may not"

* Fix typo in l10n.json while I'm at it

* Add Link to profile pic

* Update comment-message.jsx

* Double-Quotes to Single-Quotes

* fix indentation

* Update comment-message.jsx

* Update comment-message.jsx

* Update comment-message.jsx

[Master] Hotfix: change message count endpoint

[Develop] Hotfix: change message count endpoint

[Develop] Release 2.2.25

[Master] Release 2.2.25

Fixes issue where admin messages caused social messages to display as unread when they weren’t

this fixes #1561 by making sure that if the count is retrieved before the messages themselves, there is no error in the console.

Hotfix/pt br

remove obsolete static URL so localizations get picked up correctly.

git-ignore localized-urls.json as it’s pulled from scratch-resources now.

wrap the createClass with injectIntl to be consistent with other uses in www

Rename AnimateYourNameGuide to NameGuide

fixes #1570 

* Add Tina Quach to Credits

* Update credits.jsx

* Update credits.jsx

remove obsolete static URL so localizations get picked up correctly.

git-ignore localized-urls.json as it’s pulled from scratch-resources now.

Fixing some grammar mistakes in markdown files.

Rewording | 10n.json