scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-18 11:32:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2735 commits 222 branches 1 tag 517 MiB
Commit graph

2735 commits

This branch
This branch
All branches
Author SHA1 Message Date
chrisgarrity
ef4f851e6d 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:53:42 -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
chrisgarrity
3de61d092f
Merge pull request #1662 from chrisgarrity/feature/hoc-2017 
Feature/hoc 2017
 2017-11-08 14:36:03 -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
Sheshank Shankar
c143d6c706 Fixes #1645 and #1644 (#1646) 
* Fixes #1645

* Fixes #1644 as well

* hopefully this should fix it

* Update download.jsx

* Update download.jsx
 2017-11-07 17:31:52 -05:00
The_Grits
39c6915884 Fix gh-1634: Fix Localization on Developers Page (#1636) 
* Add ScratchJr Section Localization

* Add Localization for ScratchJr and "Projects"

* Update ScratchJr String / Remove ScratchJr Title

* Readd "ScratchJr"
 2017-11-07 17:30:11 -05:00
Sheshank Shankar
58ddff4001 Fix #1649: Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650) 
* 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-07 16:42:53 -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
7e00d40325
Merge pull request #1647 from LLK/release/2.2.26 
[Develop] Release 2.2.26
 2017-11-03 12:04:11 -04:00
Matthew Taylor
eef64e139e
Merge pull request #1648 from LLK/release/2.2.26 
[Master] Release 2.2.26
 2017-11-03 12:04:00 -04:00
Matthew Taylor
a87b7dc3fa
Merge pull request #1653 from mewtaylor/issue/gh-1652 
Fix GH-1652: resolve typo in social message count name
 2017-11-03 10:17:11 -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
05bdcc74e0
Merge pull request #1639 from mewtaylor/issue/gulptea-avatar 
Point at GulpTea’s avatar in credits page
 2017-10-30 10:36:48 -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
jwzimmer
44bb646ab2 removed redundant require statements 2017-10-24 11:38:07 -04:00
jwzimmer
2813218dc9 added signing out from discuss (scratchr2) 2017-10-23 21:39:33 -04:00
jwzimmer
658a65c807 add findText helper function, add test for signing out of homepage 2017-10-23 21:17:55 -04:00
jwzimmer
79499b677f Updated selenium & chromedriver versions, which fixed test failures in test_footer_links. Also fixed the clickFooterLinks function so it only checks links in the footer, to remove false positives (e.g. test finds 'Tips' in navbar and passes). 2017-10-23 20:15:37 -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
Matthew Taylor
a1675cbb7d hide overflow on comment component (#1611) 
fixes #1568 by imposing a hidden state on overflow text.
 2017-10-11 10:09:02 -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
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