GitLab

[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 

remove obsolete static URL so localizations get picked up correctly.

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

Rewording | 10n.json

Fix GH-1545: add `unread` as a key/value on each message

GH-1455: apply path explicitly rather than in `defaults`

thanks @chrisgarrity !

* Link to pt-br downloads if locale is pt-br

Fix GH-1540: Direct studio activity link to the activity tab

This fixes #1545 by adding unread as a key/value on each message during the filtering process. This means the unread count is always applied to the list of full messages, and never to a subset (as was happening before to cause #1545).

[Develop] Add QA Engineer posting

[Master] Add QA Engineer posting

This should fix #1455 by preventing the path from being changes via opts passed in, even though we don’t pass in a `path` anywhere.

* Fixes GH-1435/Make as many names as possible on credits page non-translate

* fixed the travis error that occured before

Fixes #1540 by ensuring that the anchor link for studio activity is directed to the activity tab of the studio

[Master] Hotfix: use recipient thumbnail, not actor for manager activity

[Develop] Hotfix: use recipient thumbnail, not actor for manager activity

Fixes an issue where the thumbnail mismatches the username presented

Fix issue 1195 registration gender tabbing

Fix CSS class of forum post message row

[Master] Hotfix: highlight unread message row in light blue

[Develop] Hotfix: highlight unread message row in light blue

This addresses issues with seeing unread notifications by highlighting them as light blue, along with more opaque icons

[Master] fix parentheses around interval

* 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www:
  remove debug message

* 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www:
  call as anonymous method