scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-12 00:31:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2261 commits 221 branches 1 tag 506 MiB
Commit graph

892 commits

Author SHA1 Message Date
Sheshank Shankar
240606b3d0 Fixes #1702: Scratch Conference site - small edits (#1727) 
Update the conference page with new banner image and small copy edits.
 2017-12-13 15:25:12 -05:00
chrisgarrity
04e1e36978 revert 2017 HoC top and middle banners 2017-12-12 11:21:35 -05:00
Matthew Taylor
24e65e707f
Revert "[Master] temporarily take out curator row and recently shared row" 2017-12-11 08:40:16 -05:00
Matthew Taylor
9fbd5b691c temporarily take out curator row and recently shared row 2017-12-01 15:12:49 -05:00
chrisgarrity
ec507b73c5
Merge pull request #1654 from chrisgarrity/feature/hoc-2017 
Top and middle banners for HoC 2017
 2017-12-01 13:22:31 -05:00
Matthew Taylor
666a893dad fix lint 
whoops!
 2017-11-21 14:19:18 -05:00
Matthew Taylor
d55caf7e96 update translations to just use FormattedMessage 2017-11-21 11:17:35 -05:00
Sheshank Shankar
3283904bb9 Add Learning Resource designer (#1676) 2017-11-21 09:19:45 -05:00
Sheshank Shankar
4f14dfcbe3 Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673) 
* 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
 2017-11-21 09:19:37 -05:00
chrisgarrity
048d5c1383 Switch CTA button based on logged in state 
Invite logged-out users to ‘Get Started with Coding!’, and make the whole Scratch animation clickable (goes to the Animate a Name tutorial).

See #1664
 2017-11-08 16:50:14 -05:00
Matthew Taylor
081e3c5327
Fix #1649: Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650) (#1663) 
* 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
 2017-11-08 13:30:16 -05:00
chrisgarrity
60a2a51bb5 minor formatting changes for consistency 2017-11-08 09:04:33 -05:00
chrisgarrity
4fe3997df4 Top and middle banners for HoC 2017 
Css animated top banner

Middle banner of activities - responsive

https://github.com/LLK/scratchr2/issues/4869

Also updated ttt see-more/open- modal link to be consistent with the new icon from Carl.
 2017-11-03 16:50:26 -04:00
Matthew Taylor
8489918805 resolve typo 
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
 2017-11-03 10:16:01 -04:00
Matthew Taylor
a1da26b0c9 Point at @GulpTea’s avatar 2017-10-30 08:39:42 -04:00
Matthew Taylor
18f82fce3f Merge branch 'issue/gh-1546' into develop 
* 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
 2017-10-26 08:41:54 -04:00
Matthew Taylor
361afaa937 Make api request on filter change 
This fixes #1546 by using an updated api endpoint that accepts filter arguments.
 2017-10-24 13:10:32 -04:00
The_Grits
cfa55d98e8 Fix gh-1588: Localize "it's free!" String (#1594) 
* Add it's free string
* Add it's free string into page
* Update presentation.jsx
 2017-10-23 11:11:33 -04:00
KT
16f312b0fa Fix #1612 (#1616) 
* Adding new mods and moving others to "Previous MIT Scratch Team Members" maintaining alphabetical order
 2017-10-12 08:26:47 -04:00
Ken
b2e7d57f5a Resolves #1614 (#1615) 
Email Settings -> Email
 2017-10-11 17:07:48 -04:00
Sheshank Shankar
5321712a25 Fix typos in Teacher Accounts FAQ. Resolves GH-1608 2017-10-09 13:49:19 -04:00
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
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
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
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
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
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
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
62ad6ff51f Add QA Engineer posting 2017-09-18 11:48:01 -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
Florrie
14fd4e9a5b Change CSS class .mod-studio-activity to .mod-forum-activity in forum post message row 2017-09-10 10:11:27 -03:00
Matthew Taylor
2a48f8a9a2 Merge pull request #1523 from LLK/release/messages-page 
[Develop] Release: new notifications page
 2017-09-09 01:07:59 -04:00
Matthew Taylor
026c035af3 adjust line-height for notifications 
this applies to the comments only
 2017-09-08 14:24:59 -04:00
Matthew Taylor
9e3823e6e7 add icons to social message notifications 2017-09-08 14:10:46 -04:00
Matthew Taylor
1dffc08445 change the way invites are assigned 
assign invites directly to the state rather than by defaults in order to ensure empty objects can be part of an update
 2017-09-08 10:24:39 -04:00
Matthew Taylor
b82d312dd8 make invite an array instead of an object 
When trying to clear the invite, because invite is currently an object, it’s getting the state’s existing invite re-applied via `defaultsDeep`. Making it an array should solve this issue
 2017-09-08 09:29:46 -04:00
Andrew Sliwinski
f3ee0443e8 Changed 'Animate a Name' educator guide link. Resolved GH-1509 2017-09-07 08:16:38 -04:00