GitLab

# Conflicts:
#	src/views/developers/developers.jsx

Add a closing paren

Translators can’t translate a string with unbalanced paren’s.

* Move period

* update l10n with new msg format

* update jsx to use FormattedMessage instead of FormattedHTMLMessage

* Update l10n.json

[Develop] Add back in FPC and recently shared rows

There appears to have been a merge issue between the hotfixes around CSEdWeek and the implementation of the splash refactor, so this rectifies that error.

[Master] Release 2018.1

otherwise, redux won’t recognize a change in values

this was not detecting row updates well on re-render

Implement GH-1711: Add 3.0 preview faq page

after review from @thisandagain – thanks!

Implements #1711

Implement GH-1628: Use new activity endpoint

[Develop] Ignore querystring when routing conference page 

[Master] Ignore querystring when routing conference page 

There should be a generalized solution for this, but my attempts have failed thus far.

[DEVELOP] Hotfix/revert hoc banners

[MASTER] revert 2017 HoC top and middle banners

update read me for automated  tests

Merge branch 'issue/update-test-readme' of https://github.com/jwzimmer/scratch-www into jwzimmer-issue/update-test-readme

Fixes #1736 Pull Request Template Enhancements

Update the conference page with new banner image and small copy edits.

Update the conference page with new banner image and small copy edits.

* Clarify logo licensing in FAQ

Upgrade compatibility to node 8

Fix #1733 | Spelling issue