scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-15 18:12:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3809 commits 220 branches 1 tag 511 MiB
Commit graph

3809 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sheshank Shankar
ce7bcd3409 Fix typos in FAQ. Resolves GH-1604 2017-10-08 11:00:31 -04:00
Sheshank Shankar
d99f503002 Fix typo in FAQ. Resolves GH-1601 2017-10-08 10:13:31 -04:00
KT
0301618b9c Updates to community moderation listing. Resolves GH-1442 Resolves GH-1596 
* Removing moderator job listing

* Update moderator.jsx
 2017-10-08 10:00:09 -04:00
Ken
36cb865f89 Fix TOS and messages typos. Resolves GH-1593 Resolves GH-1595 
* fix typo

"many not" -> "may not"

* Fix typo in l10n.json while I'm at it
 2017-10-08 09:58:06 -04:00
Sheshank Shankar
5f4256e7d7 Add Link to profile pic (#1576) 
* 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
 2017-10-04 15:58:24 -04:00
Matthew Taylor
bd8c3d6dd0 Merge pull request #1591 from mewtaylor/hotfix/message-count-endpoint 
[Master] Hotfix: change message count endpoint
 2017-10-03 17:25:44 -04:00
Matthew Taylor
161f50611c Merge pull request #1590 from mewtaylor/hotfix/message-count-endpoint 
[Develop] Hotfix: change message count endpoint
 2017-10-03 16:49:07 -04:00
Matthew Taylor
75217978c1 Switch message count to new endpoint 2017-10-03 16:37:00 -04:00
Matthew Taylor
2830257b17 Merge pull request #1589 from LLK/release/2.2.25 
[Develop] Release 2.2.25
 2017-10-03 15:14:26 -04:00
Matthew Taylor
ea1b4248e4 Merge pull request #1562 from LLK/release/2.2.25 
[Master] Release 2.2.25
 2017-10-03 15:05:08 -04:00
Matthew Taylor
37131df008 Handle message count split in container 
Fixes issue where admin messages caused social messages to display as unread when they weren’t
 2017-10-03 12:53:49 -04:00
Matthew Taylor
d272a2e4e6 Handle case of messages length being less than unreadcount 
this fixes #1561 by making sure that if the count is retrieved before the messages themselves, there is no error in the console.
 2017-10-02 10:33:53 -04:00
chrisgarrity
6d0b064c12 Merge pull request #1578 from chrisgarrity/hotfix/pt-br 
Hotfix/pt br
 2017-09-27 07:03:15 -04:00
chrisgarrity
13284dee21 Rename AnimateYourNameGuide to NameGuide 
remove obsolete static URL so localizations get picked up correctly.

git-ignore localized-urls.json as it’s pulled from scratch-resources now.
 2017-09-26 16:56:34 -04:00
chrisgarrity
8b055d894c follow injectIntl convention 
wrap the createClass with injectIntl to be consistent with other uses in www
 2017-09-26 16:54:09 -04:00
chrisgarrity
b48411a8e4 Link to pt-br downloads if locale is pt-br 2017-09-26 16:53:46 -04:00
chrisgarrity
2d9056d5af Merge pull request #1571 from chrisgarrity/gh1570-fix-name-guide 
Rename AnimateYourNameGuide to NameGuide

fixes #1570
 2017-09-26 15:12:21 -04:00
Sheshank Shankar
e8671c1727 Add Tina Quach to Credits. Resolves GH-1572 
* Add Tina Quach to Credits

* Update credits.jsx

* Update credits.jsx
 2017-09-26 11:10:58 -04:00
chrisgarrity
1d08a9e201 Rename AnimateYourNameGuide to NameGuide 
remove obsolete static URL so localizations get picked up correctly.

git-ignore localized-urls.json as it’s pulled from scratch-resources now.
 2017-09-25 17:16:58 -04:00
Andrew Sliwinski
72d934e8df Merge pull request #1567 from VutonDesign/develop 
Fixing some grammar mistakes in markdown files.
 2017-09-24 18:11:03 -04:00
Vuton Design
b47ad7a73f Should be a capital 🖌️ 2017-09-24 22:44:46 +01:00
Vuton Design
d95b36540e Just noticed that was an oxford comma 2017-09-24 22:26:50 +01:00
Vuton Design
46db5a225b Fixing a mistake 2017-09-24 22:19:30 +01:00
Vuton Design
833905add3 Fixing grammar mistakes 2017-09-24 22:03:46 +01:00
Vuton Design
d374fed9f4 Fixing some more grammar mistakes 2017-09-24 22:01:42 +01:00
Andrew Sliwinski
d542f18e74 Merge pull request #1552 from VutonDesign/patch-1 
Rewording | 10n.json
 2017-09-20 07:57:38 -04:00
Matthew Taylor
c9eacf4ac3 Merge pull request #1559 from mewtaylor/issue/gh-1545 
Fix GH-1545: add `unread` as a key/value on each message
 2017-09-19 17:18:42 -04:00
Matthew Taylor
129042fce6 Merge pull request #1553 from mewtaylor/issue/gh-1455 
GH-1455: apply path explicitly rather than in `defaults`
 2017-09-19 17:14:00 -04:00
Matthew Taylor
a9cb7bbd99 don’t iterate over list if no filter applied 
thanks @chrisgarrity !
 2017-09-19 17:11:46 -04:00
chrisgarrity
5f48fc13e8 Link to pt-br downloads if locale is pt-br (#1558) 
* Link to pt-br downloads if locale is pt-br
 2017-09-19 11:56:30 -04:00
Matthew Taylor
9b3b1a2623 render load more even if messages not there 
This handles #1546 by still checking about whether to display the loadMore button even if messages are not present (i.e. if a subfilter has no messages present).
 2017-09-19 10:30:14 -04:00
Matthew Taylor
4fa3c0f761 Merge pull request #1551 from mewtaylor/issue/gh-1540 
Fix GH-1540: Direct studio activity link to the activity tab
 2017-09-19 10:18:18 -04:00
Matthew Taylor
8c631b40d9 add unread as a key/value on each message 
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).
 2017-09-19 10:13:52 -04:00
Matthew Taylor
9a3358b35c provide a default opts if it’s undefined 2017-09-18 14:40:52 -04:00
Ray Schamp
5245123a4c Merge pull request #1555 from rschamp/hotfix/qa-engineer 
[Develop] Add QA Engineer posting
 2017-09-18 14:16:19 -04:00
Ray Schamp
4e49653fcc Merge pull request #1554 from rschamp/hotfix/qa-engineer 
[Master] Add QA Engineer posting
 2017-09-18 14:16:10 -04:00
Ray Schamp
62ad6ff51f Add QA Engineer posting 2017-09-18 11:48:01 -04:00
Matthew Taylor
4175c119d2 apply path explicitly rather than in defaults 
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.
 2017-09-18 11:44:06 -04:00
Vuton Design
20ce38e8d0 Update l10n.json 2017-09-16 09:30:34 +01:00
Linda
e119cea627 Fixes GH-1435/Reduce work for translators on credits page (#1514) 
* Fixes GH-1435/Make as many names as possible on credits page non-translate

* fixed the travis error that occured before
 2017-09-15 17:24:41 -04:00
Matthew Taylor
1335de9b57 Direct studio activity link to the activity tab 
Fixes #1540 by ensuring that the anchor link for studio activity is directed to the activity tab of the studio
 2017-09-15 15:49:57 -04:00
LiFaytheGoblin
aa8efd0bc9 fixed the travis errors that occured earlier 2017-09-15 14:34:21 +02:00
Matthew Taylor
57749008c6 Merge pull request #1541 from mewtaylor/issue/manager-thumbnail-activity 
[Master] Hotfix: use recipient thumbnail, not actor for manager activity
 2017-09-13 14:48:06 -04:00
Matthew Taylor
426259fbe8 Merge pull request #1542 from mewtaylor/issue/manager-thumbnail-activity 
[Develop] Hotfix: use recipient thumbnail, not actor for manager activity
 2017-09-13 14:11:50 -04:00
Matthew Taylor
d4b0207bb0 clean up stuff 2017-09-13 13:51:17 -04:00
Matthew Taylor
98cbfd638f use recipient thumbnail, not actor for manager activity 
Fixes an issue where the thumbnail mismatches the username presented
 2017-09-13 13:47:27 -04:00
Matthew Taylor
16a5208624 Merge pull request #1477 from Petroochio/IS-1195-radio-button-tabbing 
Fix issue 1195 registration gender tabbing
 2017-09-13 08:26:37 -04:00
Matthew Taylor
556b527dc3 Merge pull request #1529 from towerofnix/fix-class-typo 
Fix CSS class of forum post message row
 2017-09-13 08:18:43 -04:00
Matthew Taylor
2034edb82f Merge pull request #1532 from mewtaylor/hotfix/highlight-unread-rows 
[Master] Hotfix: highlight unread message row in light blue
 2017-09-11 10:50:05 -04:00
Matthew Taylor
94ce746f9b Merge pull request #1533 from mewtaylor/hotfix/highlight-unread-rows 
[Develop] Hotfix: highlight unread message row in light blue
 2017-09-11 10:16:04 -04:00