GitLab

This reverts commit 5ce1a9f4, reversing
changes made to 5be4c45f.

Revert "[Master] Upgrade to ES6"

[Master] Upgrade to ES6

Changed the localization string to use a placeholder to allow translators to re-order if needed.

Also added preview-faq to the transifex config.

Since dispatch is not passed in anymore.

Setting onClick to onNextStep directly caused click event data to be passed in handleAdvanceStep, which then merged it with the formData state in student registration. This caused issues.

Add state pseudo classes to make the style more ‘specific’

Reorder the import of InformationPage and Page.

MessagesPresenation has to be loaded after Page.

Gh 1751/add abkhaz to languages menu

# 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

[Master] Add back in FPC and recently shared rows

[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