scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2608 commits 216 branches 1 tag 464 MiB
Commit graph

1705 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Matthew Taylor
057f741f89 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
 2017-09-11 09:59:24 -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
9f3b0c903e Merge branch 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www into develop 
* 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www:
  remove debug message
 2017-09-09 17:00:39 -04:00
Matthew Taylor
a90dd6e296 remove debug message 2017-09-09 16:59:39 -04:00
Matthew Taylor
88ea667f8c Merge branch 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www into develop 
* 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www:
  call as anonymous method
 2017-09-09 16:56:05 -04:00
Matthew Taylor
ffa6b7d376 call as anonymous method 2017-09-09 16:55:43 -04:00
Matthew Taylor
35ab2ebe48 Merge pull request #1525 from mewtaylor/hotfix/fix-interval 
[Develop] fix parentheses around interval
 2017-09-09 16:03:53 -04:00
Matthew Taylor
7917f15874 fix parentheses around interval 2017-09-09 15:56:01 -04: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
d18fd0064b change width to min-width on icon 
fixes #1521 but no idea why **shrug**
 2017-09-08 18:09:55 -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
7e85d2c731 fix invite for initial 2017-09-08 09:38:47 -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
Matthew Taylor
7a3290a2ca show recipient for owner notification 2017-09-07 14:55:48 -04:00
LiFaytheGoblin
b5c44bae96 Fixes GH-1435/Make as many names as possible on credits page non-translate 2017-09-07 17:33:12 +02:00
Andrew Sliwinski
f3ee0443e8 Changed 'Animate a Name' educator guide link. Resolved GH-1509 2017-09-07 08:16:38 -04:00
Matthew Taylor
7945a7eff1 only dispatch count if the user is present 
this prevents a console error
 2017-09-06 14:25:44 -04:00
Matthew Taylor
ce88466ee4 tweak formatting for message content 
helps with comment formatting
 2017-09-06 11:41:26 -04:00
Matthew Taylor
2bd9b184c5 Fix GH-[1505, 1507]: hide message counter on 0 (#1510) 
* Hide messages counter when at 0

fixes #1507

* check for body before looking at success

fixes #1505
 2017-09-06 10:05:14 -04:00
Matthew Taylor
b77e278927 handle logout on messages page (#1503) 
Go back to redirecting to splash on logout, and empty messages page too.
 2017-09-05 14:31:10 -04:00
Matthew Taylor
432a6240aa have tab link go to curator tab 2017-09-05 12:38:16 -04:00
Matthew Taylor
5772eed8f7 use lodash instead of assign 
this fixes #1500, since lodash works in ie11 but `assign` does not
 2017-09-05 12:28:01 -04:00
Matthew Taylor
b7f1f5e913 fix comment message handling 
add comment message to redux to access the current user, and fix the string
 2017-09-05 12:06:06 -04:00
Matthew Taylor
d7fe43fad7 fix commentee assignment 2017-09-05 11:41:56 -04:00
chrisgarrity
c7eabe18c3 Merge pull request #1483 from Petroochio/gh-1470-credits-overflow 
Fix gh-1470 Firefox Overflow on Credits Page
 2017-09-05 10:15:31 -04:00
Matthew Taylor
e9f54b3fd3 use border-bottom, not top 
this fixes an issue with comment bubble displays in firefox
 2017-09-05 10:06:27 -04:00
Matthew Taylor
74400b0599 add comments to redux methods 2017-09-05 10:03:48 -04:00
Matthew Taylor
23c40c8f5e if social messages less than 0, display 0 
handles a caching edge case with admin messages.
 2017-09-05 10:03:35 -04:00
chrisgarrity
1311de0a61 Merge pull request #1493 from chrisgarrity/gh1454-teacher-invite 
Revise student invitation string
 2017-09-05 09:57:54 -04:00
Matthew Taylor
6493052725 Use username, not user id, for profile link 2017-09-05 09:10:41 -04:00
Matthew Taylor
b62a4db590 Pass to legacy on message routes with ajax 
Currenlty, some legacy endpoints are failing because they’re being directed to www. A similar thing happened with `/explore`, and this is the same fix
 2017-09-01 14:39:47 -04:00
Matthew Taylor
71b93cb207 reduce unread count on successful admin message dismiss 2017-09-01 11:07:21 -04:00
Matthew Taylor
630ae5e462 fix formatting for numbers and for dismiss icon 
fixes #1494
 2017-09-01 11:05:29 -04:00
Matthew Taylor
3dee0e46d2 continue to use proxy msg count for now 2017-09-01 10:20:18 -04:00
Matthew Taylor
654dafdaee fix binding for admin message dismissal 
based on https://stackoverflow.com/questions/39009611/react-bindthis-value-in-opposite-order-on-function-declaration
 2017-09-01 10:00:20 -04:00
chrisgarrity
b10b8a3d51 Revise student invitation string 
fixes #1454.

Changes ‘has invited you to join the class:’ sentence fragment to a complete sentence ‘Your teacher has invited you to join a class:’ to account for languages that reverse the  order of subject/object.
 2017-09-01 09:20:36 -04:00
Matthew Taylor
779c42717b I think I misunderstood the xhr docs 2017-08-31 23:39:49 -04:00
Matthew Taylor
3022a565ce json-encode body 2017-08-31 18:39:03 -04:00
Matthew Taylor
9ace64fda7 add csrf for message clear requests 2017-08-31 18:24:58 -04:00
Matthew Taylor
6dbc4abdc5 subtract admin notifications from social count 
fallout from #1487
 2017-08-31 17:48:07 -04:00
Matthew Taylor
3dd768f2f6 GH-1361: Implement Notifications Page (#1487) 
* start work on www page
committing out of paranoia.
including changing splash page endpoints

* updates from feedback

thanks @rschamp! This includes:

1. splitting out messages list into a separate component (for clarity)
2. some comment/formatting adjustments for the api calls
3. removal of an extraneous property in emoji-text

* remove duplicate string declaration

* use object.assign instead of defaults deep

we don’t need deep defaults

* fix react warnings
 2017-08-31 17:05:22 -04:00
Matthew Taylor
a089b664da Merge pull request #1491 from LLK/release/2.2.24 
[Develop] Release 2.2.24
 2017-08-31 13:41:15 -04:00
Matthew Taylor
38d79df894 Change header for download page 
follow up from https://github.com/LLK/scratch-www/pull/1475#issuecomment-326034683
 2017-08-30 12:58:08 -04:00
The_Grits
9942e91175 Add Tracy Tang (#1489) 2017-08-29 22:41:10 -04:00
Peter Gyory
59435d9ec6 Fix gh-1470 Firefox Overflow on Credits Page 
Add specific style on credits page to allow for word wrap
 2017-08-23 14:43:18 -06:00
Ken
a5cf7c60d6 Correct “WeDo” case 2017-08-23 10:49:25 +08:00
The_Grits
21210e1fa5 Re-Add Community Moderator (#1480) 2017-08-22 19:25:31 -04:00
Ken
0f1bd3df17 Update text for “learn more” links (#1478) 
* Update text for “learn more” links

* Remove “Scratch” from string
 2017-08-22 09:51:21 -04:00
St19_Galla
283572ed29 Fix gh-1472 & gh-1473: FAQ Updates (#1475) 
* various updates

* adding 2.0
 2017-08-21 18:55:56 -04:00
Peter Gyory
69effaac79 Fix issue 1195 registration gender tabbing 
Add focus highlight scss for radio buttons
on demographic registration step
 2017-08-21 15:13:49 -06:00
St19_Galla
ad25e09980 Add Ellen Daoust 2017-08-16 13:39:17 -04:00
Ken
6dc5bfa788 Update credits (#1451) 
Fixes #1450 

Thanks @Kenny2github
 2017-08-09 08:36:48 -04:00
chrisgarrity
6743364447 Merge pull request #1446 from St19Galla/patch-5 
Fix #1444 : Change Things to Try to Tips
 2017-08-09 08:28:10 -04:00
St19_Galla
b087874859 Update landing.jsx 2017-08-02 23:43:44 -04:00
St19_Galla
3f0f4d23e7 Update landing.jsx 2017-08-02 23:42:17 -04:00
Matthew Taylor
b13c76e1ea Merge pull request #1436 from TheGrits/patch-4 
Fix gh-1433: Fix Gunicorn Link
 2017-08-02 08:31:05 -04:00
Matthew Taylor
1cda176c9e Merge pull request #1434 from LiFaytheGoblin/issue/gh-1432-Addition_to_Credits_Page 
Added JT Galla to the Credits Page under 'Aknowledgements'
 2017-07-31 15:15:33 -04:00
Ray Schamp
3e371f5511 Merge branch 'develop' into jobs 2017-07-31 15:15:05 -04:00
Ray Schamp
e369a439e3 Add Senior Backend Engineer job posting 2017-07-31 14:47:56 -04:00
Matthew Taylor
fcb635b5a9 Merge pull request #1443 from St19Galla/patch-4 
Fix gh-1442: Remove Moderator Position
 2017-07-31 14:16:05 -04:00
St19_Galla
c472699dbe Update landing.jsx 2017-07-31 11:22:24 -04:00
Matthew Taylor
52a968f6ce Merge pull request #1427 from TheGrits/patch-3 
Alphabetize Routes List v2
 2017-07-31 08:07:30 -04:00
Matthew Taylor
5bd66cd628 Merge pull request #1439 from TheGrits/patch-5 
Fix gh-1438: Update Community Guidelines
 2017-07-28 15:35:24 -04:00
Matthew Taylor
d285cb08d7 Merge pull request #1443 from St19Galla/patch-4 
Fix gh-1442: Remove Moderator Position
 2017-07-28 14:00:13 -04:00
St19_Galla
dd9386b8e8 TTT -> Tips 2017-07-28 13:49:41 -04:00
St19_Galla
2cf2e7e951 Remove Moderator Position 2017-07-27 11:30:39 -04:00
The_Grits
d8a62719cb Update Community Guidelines 2017-07-26 14:49:17 -04:00
The_Grits
0d76d58f5f Make donate a redirect 2017-07-26 10:26:32 -04:00
The_Grits
487fd1b47a Fix Gunicorn Link 2017-07-25 20:38:03 -04:00
LiFaytheGoblin
f9a9130351 Added JT Galla to the Credits Page under 'Aknowledgements' 2017-07-25 22:11:05 +02:00
Matthew Taylor
e2a596ea9d Squashed commit of the following: 
commit b8a05d9624
Author: Matthew Taylor <mewtaylor@gmail.com>
Date:   Fri Jul 21 12:06:06 2017 -0400

    only change style for links on page

    otherwise, the footer links were getting the new styling

commit 34a3b8b49b
Author: St19_Galla <fcbdsp@gmail.com>
Date:   Thu Jul 20 22:28:03 2017 -0400

    Update l10n.json

commit 9c8241b92c
Merge: 3f90e98 bca79e6
Author: Matthew Taylor <mewtaylor@gmail.com>
Date:   Thu Jul 20 16:36:32 2017 -0400

    Merge pull request #1423 from mewtaylor/hotfix/camp-page

    Hotfix Scratch Camp 2017 Page

commit bca79e652a
Author: St19_Galla <fcbdsp@gmail.com>
Date:   Wed Jul 19 15:42:16 2017 -0400

    Update l10n.json (#1421)

commit 4a9418d49c
Author: St19_Galla <fcbdsp@gmail.com>
Date:   Wed Jul 19 11:48:29 2017 -0400

    Down Deep - Scratch Camp 2017 Page (#1409)

    * Add files via upload

    * Create downdeep.jsx

    * Delete downdeep.jsx

    * Delete downdeep.scss

    * Delete l10n.json

    * Delete downdeep.jsx

    * Create dd.jsx

    * Rename dd.jsx to filler.jsx

    * Add files via upload

    * Delete dd.jsx

    * Delete filler.jsx

    * Create filler.jsx

    * Add files via upload

    * Delete filler.jsx

    * Update routes.json

    * whoops

    * travis

    * Update downdeep.jsx

    * Update downdeep.scss

    * Update downdeep.scss

    * Update _colors.scss

    * what i get for rushing

    * Update downdeep.jsx

    * Update l10n.json

    * thisandagain's changes

    * Carl's Changes

    * carl's changes

    * carl's changes

    * Update downdeep.jsx

    * Rename downdeep.jsx to camp.jsx

    * Rename downdeep.scss to camp.scss

    * Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx

    * Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss

    * Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json

    * Update camp.jsx

    * Add files via upload

    * Update camp.jsx

    * Update camp.scss

    * Update l10n.json

    * Create filler

    * Add files via upload

    * Delete bubbles.svg

    * Delete dolphin.svg

    * Delete fish-divider.svg

    * Delete fish-divider2.svg

    * Delete map.svg

    * Delete ocean-bottom.svg

    * Delete ocean-top.svg

    * Delete treasure.svg

    * Update camp.scss

    * Update camp.scss

    * Update camp.scss

    * Update camp.jsx

    * whoops

    * Update camp.scss

    * Update l10n.json

    * Update camp.scss

    * Update camp.jsx

    * Update _colors.scss

    * Update camp.scss

    * Update camp.scss

    * Update camp.scss

    * Update camp.scss

    * Update _colors.scss

    * Update camp.scss

    * Update camp.scss

commit 3f90e98593
Merge: c8afebf 84a37a6
Author: Ray Schamp <rschamp@users.noreply.github.com>
Date:   Thu Jul 13 16:32:51 2017 -0400

    Merge pull request #1413 from rschamp/hotfix/rip-smartystreets

    [Master] Remove SmartyStreets API
 2017-07-21 12:10:48 -04:00
Matthew Taylor
e264a1d2c9 Merge pull request #1426 from St19Galla/patch-2 
Fix gh-1425 // Camp Page Typo
 2017-07-21 12:02:11 -04:00
The_Grits
d936d0d9c4 Add -redirect tags + reorder 2017-07-21 09:51:45 -04:00
The_Grits
5fa9c6a05f Alphabetize Routes List v2 2017-07-21 07:30:42 -04:00
St19_Galla
110e47f1d2 Update l10n.json 2017-07-20 22:28:03 -04:00
Matthew Taylor
d0e7c29b5f key api calls on username check 
`this.props.user` will now return `true` because there is a default user object that’s empty. So, instead, wait for an actual user object
 2017-07-20 15:01:36 -04:00
Matthew Taylor
8561385324 Update name for legacy carousel 2017-07-20 13:56:11 -04:00
Matthew Taylor
cb4ca51061 Add new carousel component 
1. Moves carousel to `LegacyCarousel` since it currently is designed to handle JSON from proxy endpoints
2. Add separate `Carousel` endpoint to handle data from project models in scratch’s new api, the standard moving forward.
 2017-07-20 13:47:14 -04:00
Matthew Taylor
7d9b6fc5d8 Merge pull request #1415 from St19Galla/patch-2 
Fix gh-1410: Correct "Tips" Page Link
 2017-07-20 07:40:59 -04:00
Matthew Taylor
36583f0d04 Merge pull request #1416 from mewtaylor/issue/custom-rows-api 
Move custom homepage row to new api endpoints
 2017-07-19 17:19:27 -04:00
St19_Galla
9f47d504ec Update l10n.json (#1421) 2017-07-19 15:42:16 -04:00
St19_Galla
43b8f0b38f Down Deep - Scratch Camp 2017 Page (#1409) 
* Add files via upload

* Create downdeep.jsx

* Delete downdeep.jsx

* Delete downdeep.scss

* Delete l10n.json

* Delete downdeep.jsx

* Create dd.jsx

* Rename dd.jsx to filler.jsx

* Add files via upload

* Delete dd.jsx

* Delete filler.jsx

* Create filler.jsx

* Add files via upload

* Delete filler.jsx

* Update routes.json

* whoops

* travis

* Update downdeep.jsx

* Update downdeep.scss

* Update downdeep.scss

* Update _colors.scss

* what i get for rushing

* Update downdeep.jsx

* Update l10n.json

* thisandagain's changes

* Carl's Changes

* carl's changes

* carl's changes

* Update downdeep.jsx

* Rename downdeep.jsx to camp.jsx

* Rename downdeep.scss to camp.scss

* Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx

* Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss

* Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json

* Update camp.jsx

* Add files via upload

* Update camp.jsx

* Update camp.scss

* Update l10n.json

* Create filler

* Add files via upload

* Delete bubbles.svg

* Delete dolphin.svg

* Delete fish-divider.svg

* Delete fish-divider2.svg

* Delete map.svg

* Delete ocean-bottom.svg

* Delete ocean-top.svg

* Delete treasure.svg

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update camp.jsx

* whoops

* Update camp.scss

* Update l10n.json

* Update camp.scss

* Update camp.jsx

* Update _colors.scss

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update _colors.scss

* Update camp.scss

* Update camp.scss
 2017-07-19 11:48:29 -04:00
Matthew Taylor
36dc8283b8 move projects loved by following to new api endpoint 2017-07-19 11:25:39 -04:00
Matthew Taylor
753a3e1eed Split splash into container/presentation component 
This does a bit of upkeep based on recs from @rschamp that:

1. Splits splash into container/presentation components
2. Updates the default project count to 20 million
3. makes the api calls that get info from the api take in arguments rather than use the session
4. Updates `MapStateToProps` to be more specific in what it uses beyond just `session` and `permissions`

Thanks @rschamp!
 2017-07-17 12:19:49 -04:00
chrisgarrity
4cc353ab43 remove obsolete strings 
‘Help’ and ‘Discuss’ are not needed now that they’ve been replaced with the Tips page.

Fixes #1362
 2017-07-17 10:14:32 -04:00
Matthew Taylor
8c94a04e77 Move custom homepage row to new api endpoints 
This goes along with https://github.com/LLK/scratch-api/pull/292. This can be updated if we choose to migrate the `lovedByFollowing` endpoint off of proxy as well.
 2017-07-13 15:35:18 -04:00
St19_Galla
093d8f4eb3 Update tips.jsx 2017-07-13 12:48:18 -04:00
Ray Schamp
02b36ab9f3 Merge pull request #1414 from rschamp/hotfix/rip-smartystreets 
[Develop] Remove SmartyStreets API
 2017-07-13 10:52:58 -04:00
Ray Schamp
84a37a671f Remove SmartyStreets API 
We are so lax with this that it's not actually helping us, and we don't have a plan with them anymore.
 2017-07-13 10:44:50 -04:00
Matthew Taylor
03785b78f6 Merge pull request #1406 from TheGrits/patch-3 
Fix gh-1382: Centre Align Note
 2017-07-13 10:38:04 -04:00
The_Grits
6533b5b50a Misplaced Periods Fix 2017-07-10 19:49:13 -04:00
The_Grits
c5f6619947 Fix gh-1382: Centre Align Note 2017-07-07 20:17:03 -04:00
Andrew Sliwinski
d705272341 Merge pull request #1402 from TheGrits/patch-3 
Fix gh-1397: Update Supporting Organizations
 2017-07-07 19:45:28 -04:00
The_Grits
a9ba27ef97 Fix gh-1404: Add Junior Designer 2017-07-07 19:34:55 -04:00
The_Grits
a3714e5348 Add transifex remove pootle 2017-07-06 23:06:23 -04:00
chrisgarrity
24bfc18487 Add missing closing tag for PDF Guide 2017-07-05 13:42:20 -04:00
chrisgarrity
ced9339fb6 Remove unnecessary ‘^’ from routeAliases 2017-06-29 15:30:26 -04:00
chrisgarrity
ece3d4a1f9 update /help and /info routes 2017-06-29 14:42:17 -04:00
Matthew Taylor
7a44be5e5b Merge pull request #1389 from TheGrits/patch-3 
Fix gh-1388: Help -> Tips on FAQ Page
 2017-06-29 09:58:17 -04:00
chrisgarrity
f1cfeeca81 Merge pull request #1390 from chrisgarrity/issue/gh1387 
Add /info redirect
 2017-06-29 07:33:07 -04:00
chrisgarrity
ed056701c4 Add /info redirect 2017-06-28 17:25:36 -04:00
The_Grits
5570632ed3 Help -> Tips 2017-06-28 16:54:42 -04:00
chrisgarrity
f7345c443d Fix blocks icon for windows 
Note for future reference - set the size for SVGs with height not width if using rem.
IE on Windows 7 doesn’t resize correctly if the width is set with rem. Height works with rem, and exact pixel width works, but that should be avoided.
 2017-06-28 09:32:08 -04:00
chrisgarrity
a712a8d28a Fix typo in tutorial URL (#1377) 
Getting started tutorial link started with `//` instead of just `/`., and typo in downloading
 2017-06-27 16:33:57 -04:00
chrisgarrity
022d2dd506 FIx layout problems (#1380) 
* removed white-space: no wrap to let buttons flow in Cards section
* Fix download link (download should be part of the link)
* Set the size of the icons to fix alignment
 2017-06-27 16:27:07 -04:00
Matthew Taylor
b22aaa8465 Add /store to footer 2017-06-26 10:35:29 -04:00
Andrew Sliwinski
a16a189a7f Update compatibility requirements to clarify support for ChromeOS 2017-06-26 09:42:56 -04:00
Matthew Taylor
df2b7fd7df Merge pull request #1367 from mewtaylor/issue/gh-1364 
Fix GH-1364: Change `help` to `tips` in footer
 2017-06-23 16:39:19 -04:00
chrisgarrity
6469ac3362 Simplify /help redirect pattern (#1366) 
Restrict /help redirect to just `/help` or `/help/`. Anything else following help should get handled by scratchr2.
 2017-06-23 12:02:15 -04:00
Matthew Taylor
c1e5c7cb03 Change help to tips in footer 
Fixes #1364
 2017-06-23 11:55:43 -04:00
chrisgarrity
39b1400705 Handle /help redirect (#1363) 2017-06-23 10:28:34 -04:00
Matthew Taylor
dbb4fcc8a2 tweak some styling for the download page 
Adds the numbers back in above the download steps, and also moves the “note for mac users” down into a callout.
 2017-06-23 09:23:24 -04:00
Matthew Taylor
dd923aa586 change download route 2017-06-22 10:57:30 -04:00
Andrew Sliwinski
124c8e36d7 Update navigation. Resolves GH-1262 (#1285) 2017-06-22 09:40:34 -04:00
chrisgarrity
74e315dc71 Add new Tips page (#1357) 
New of tips page, uses cards from new resources server (s3)

* added get-localized-urls script to get the generated json from the s3 bucket
* added /tips route
* correct localized-urls for other pages
* remove thingstotry
* redirect /go
* fix up /info/cards view to use resources (s3).
* redirect /go to /tips
* change /hoc redirect from /go to /tips
* Add full set of cards pdf download to tips localization
* removed cards and guides from static PDFs, they are all coming from resources.scratch.mit.edu now.
* removed things to try view

Corrections for reviews:
* decided to pretty print the localized URLs
* replaced console.errors with process.stdout and fail with exit(1)
* formatted localized-urls to make it easier to read
* moved link outside  `<Button…` makes whole button clickable instead of just text
* fixed up css styles, removed unnecessary classes
* corrected “unused” resource links
 2017-06-21 16:20:18 -04:00
Matthew Taylor
2c7cc52a70 Merge pull request #1359 from mewtaylor/issue/store 
[Develop] Hotfix: add redirect for store
 2017-06-20 15:37:35 -04:00
Matthew Taylor
73b88c850b Add redirect for store 2017-06-20 14:38:14 -04:00
Matthew Taylor
c1ea4730c3 use $ui-gray instead 2017-06-19 11:41:44 -04:00
Matthew Taylor
4342ef36a3 Have behavior for default/error on version check 
This keeps the version field empty, as well as the links, until it gets a response from the `version.xml` request. It then displays an error message if there was an error trying to get the version.
 2017-06-19 11:36:33 -04:00
Matthew Taylor
670633a459 s/view/redirect 
thanks @chrisgarrity :)
 2017-06-19 11:35:33 -04:00
Matthew Taylor
49a52b634c add background gray for installation process 2017-06-19 11:35:15 -04:00
Matthew Taylor
cf863fb3d3 point links at /download 2017-06-16 10:14:01 -04:00
Matthew Taylor
6e3c255fa7 Make version dependent on xml call 
Fixes #1351 by including a call to `version.xml` to get the most up-to-date offline build version, defaulting to the current version, `456.0.3`. This also fixes #1352 by switching the route to `/download`, with a redirect from `/scratch2download/`
 2017-06-16 10:11:58 -04:00
Matthew Taylor
348fd2d860 Merge pull request #1258 from TheGrits/patch-3 
Fix gh-1254: Migrate Download Page
 2017-06-13 17:06:21 -04:00
The_Grits
5ed33945ff Centre align 2017-06-13 16:58:01 -04:00
Matthew Taylor
6ace6926c0 Merge pull request #1347 from LiFaytheGoblin/fix_issue/gh_1331_add_mark_ferrell_to_credits_page 
Fix issue/gh-1331: added mark ferrell to credits page
 2017-06-13 16:22:54 -04:00
The_Grits
dd655df674 Fix gh-1343: Update Credits Page (#1346) 
* Remove Christina Huang

* Add Christina Huang to Previous Members
 2017-06-12 09:22:58 -04:00
LiFaytheGoblin
acfb5d71ac added mark ferrell to credits page (issue 1331) 2017-06-11 12:57:26 +02:00
Matthew Taylor
7a958f0326 Revert "[Master] Revert PR #1324" 2017-06-08 15:31:37 -04:00
Matthew Taylor
69176fb572 Revert "[Develop] Revert PR #1324" 2017-06-08 15:31:09 -04:00
The_Grits
e0ab9f4f03 Remove width from download page 2017-06-06 19:43:01 -04:00
Ray Schamp
e4ba1061b9 Revert "Merge pull request #1324 from mewtaylor/issue/api-250" 
This reverts commit 949a166c0f, reversing
changes made to 56b46fd861.
 2017-06-02 14:12:54 -04:00
The_Grits
c29dde59a1 Update download.scss 2017-06-02 08:13:29 -04:00
The_Grits
8b39259ce5 Thanks Travis 
(and St19Galla)
 2017-05-24 23:48:37 -04:00
The_Grits
15d393a9e2 Update Styling of Download Page 2017-05-24 20:19:49 -04:00
Matthew Taylor
e7c04044ae remove ?$ from search expressjs expression 
I don’t see a reason for this to be here, and it’s breaking the build with the explore change
 2017-05-24 17:33:55 -04:00
Matthew Taylor
949a166c0f Merge pull request #1324 from mewtaylor/issue/api-250 
For api-250: Change explore endpoint
 2017-05-24 14:03:36 -04:00
Matthew Taylor
a8cf1af73c Merge pull request #1316 from mewtaylor/issue/explore-projects 
Fix r2-3978: Use regex in express patterns to limit scope
 2017-05-24 12:49:09 -04:00
Matthew Taylor
373c7784c6 Change conference date 
Fixes #1322
 2017-05-24 08:42:25 -04:00
Matthew Taylor
1a83b34387 Change explore endpoint 
For scratch-api#250
 2017-05-22 15:41:28 -04:00
The_Grits
d740eb586f Lint fix download page 2017-05-22 11:58:55 -04:00
The_Grits
fadf0a3346 Download Page Restyle 2017-05-20 00:24:18 -04:00
Matthew Taylor
87da9f3d8a Use regex in express patterns to limit scope 
This fixes https://github.com/LLK/scratchr2/issues/3798 by using regex in expressjs patterns, and then also parsing those regex patterns for fastly, such that we can limit the scope of the regex created for a specific view
 2017-05-18 13:57:49 -04:00
Andrew Sliwinski
afe134a898 Merge pull request #1309 from thisandagain/hotfix/cm 
[Develop] Hotfix - Remove "Trust & Safety Manager" role from jobs page
 2017-05-15 11:37:38 -04:00
Matthew Taylor
5b3341673f Merge pull request #1312 from mewtaylor/hotfix/revert-birthday-banner 
[Develop] Hotfix: Remove 10th anniversary banner
 2017-05-15 11:23:41 -04:00
Matthew Taylor
ae53dcd746 Remove 10th banner 2017-05-15 11:08:15 -04:00
Andrew Sliwinski
042ae48408 Remove 'Trust & Safety Manager' role from jobs page 2017-05-14 12:52:53 -04:00
Matthew Taylor
a5281179cd Merge pull request #1293 from TheGrits/patch-4 
Fix gh-1292: Dropdown Mobile Un-Friendly
 2017-05-08 15:54:51 -04:00
The_Grits
f589ed0f4d Update dropdown.scss 2017-05-08 10:10:24 -04:00
The_Grits
f901d3b429 Restyle the Download Page 2017-05-03 16:19:56 -04:00
The_Grits
8ae401e861 Move mobile rule 2017-05-03 15:58:14 -04:00
Andrew Sliwinski
52b6ed9eb8 Merge pull request #1271 from TheGrits/patch-5 
Fix gh-875: Double Search Bar
 2017-05-03 14:37:02 -04:00
Matthew Taylor
b1e33a2933 Merge pull request #1299 from TheGrits/patch-9 
Fix gh-1294: Unlocalize Browser Links
 2017-05-03 14:33:50 -04:00
Matthew Taylor
787040b972 Merge pull request #1297 from TheGrits/patch-8 
Fix gh-1296: Add DD Liu to Credits Page
 2017-05-03 11:48:01 -04:00
Ray Schamp
ed2cd81a7a Merge pull request #1300 from St19Galla/patch-1 
Fix gh-1282 ~ Add "United States" to faq/educators page
 2017-05-02 18:15:34 -04:00
St19_Galla
f82d5f8341 add US to educators 2017-05-02 15:34:57 -04:00
St19_Galla
5083614f48 add US to faq 2017-05-02 15:33:31 -04:00
The_Grits
a837c05ac7 Remove localized Microsoft links 2017-05-02 15:29:00 -04:00
The_Grits
5822b2facb Update Firefox Link 2017-05-02 13:38:00 -04:00
The_Grits
0a747f68bd Add DD Liu 
Resolves #1296
 2017-05-01 11:24:55 -04:00
Matthew Taylor
00b80b40f3 Merge pull request #1295 from mewtaylor/issue/r2-4586 
Implement r2-4586: Add anniversary banner
 2017-05-01 07:35:31 -04:00
Matthew Taylor
d6f8b2fa9e add card tutorial redirect 2017-04-28 13:43:18 -04:00
Matthew Taylor
a950c91725 Add studio link 2017-04-28 09:09:06 -04:00
Matthew Taylor
fc075aedaf Add anniversary banner 2017-04-28 08:51:40 -04:00
The_Grits
83baa2ada6 import frameless 2017-04-26 23:14:50 -04:00
The_Grits
8f827d812a Re-add min-width for mobile 2017-04-26 23:13:24 -04:00
Matthew Taylor
aef7b5e834 Merge pull request #1291 from LLK/release/2.2.20 
[Master] Release 2.2.20
 2017-04-26 22:20:07 -04:00
Matthew Taylor
aed3093bc0 Change invalidation to year 2017-04-21 07:51:03 -04:00
Matthew Taylor
f61fe17353 use birthOffset for age validation 
Fixes #1278
 2017-04-20 16:47:35 -04:00
Matthew Taylor
76c46be17b Merge pull request #1269 from mewtaylor/issue/r2-4470 
Fix R2-4470: Only allows birthdays >= 13 yrs old for teacher reg
 2017-04-19 16:41:09 -04:00
Matthew Taylor
9c50f31ce3 Merge pull request #1270 from TheGrits/patch-4 
Fix gh-728: Align Misaligned Nav-bar Dropdown
 2017-04-19 16:40:15 -04:00
Matthew Taylor
f2e4858868 Revert "[Master] Temp Hotfix: remove custom rows" 2017-04-18 06:36:39 -04:00
Matthew Taylor
6b513f82e0 Merge pull request #1268 from mewtaylor/issue/gh-1265 
[Develop] Hotfix GH-1265: Update jobs route to include moderator
 2017-04-14 14:20:20 -04:00
Matthew Taylor
cd3fb9245a Only apply offset to teachers 
thanks @chrisgarrity!
 2017-04-14 14:18:32 -04:00
The_Grits
5cc8911b04 Thanks Travis 2017-04-14 11:13:46 -04:00
The_Grits
d7e63aadee Fix gh-875: Double Search Bar 2017-04-14 10:08:17 -04:00
The_Grits
7c9f6f4fad Fix gh-728 
Fixes mis-aligned nav-bar dropdown
 2017-04-14 06:46:50 -04:00
Matthew Taylor
cb7ce8c71d update language for age validation 
thanks @TheGrits!
 2017-04-13 07:41:47 -04:00
Matthew Taylor
2c472b607a Only allows birthdays > 13 yrs old for teacher reg 
Helps fix https://github.com/LLK/scratchr2/issues/4470 from the UX side of things
 2017-04-12 17:41:43 -04:00
Matthew Taylor
12e87df7c3 Merge pull request #1257 from TheGrits/patch-4 
Nit-picky Developer Class Type
 2017-04-11 12:58:09 -04:00
Matthew Taylor
a56c8d0b37 Update jobs route to include moderator 
Fixes #1265 by updating the logic for checking the route to include an optional moderator endpoint check
 2017-04-11 12:57:02 -04:00
Matthew Taylor
5ca5c149f3 temporarily remove custom homepage rows 
redis emptied when mc1 restarted, so this is all going to mysql at the moment
 2017-04-11 09:27:19 -04:00
The_Grits
6dbf66d59d Patches and Styling 2017-04-06 10:40:46 -04:00
Matthew Taylor
b2e827f752 Merge pull request #1260 from mewtaylor/release/april-fools-rollback 
[Develop] Hotfix: Revert those changes we did last week
 2017-04-03 14:51:29 -04:00
Matthew Taylor
9affc8441c Revert "Merge pull request #1255 from LLK/release/branch" 
This reverts commit c36bde2c30, reversing
changes made to becae19f6f.
 2017-04-03 14:32:38 -04:00
The_Grits
94dec64045 Thanks Travis 
Gotta love missing semicolons
 2017-04-01 13:06:45 -04:00
The_Grits
68d10ffe32 Patch 3 wip (#30) 2017-04-01 10:55:47 -04:00
The_Grits
6255f989b0 Nit-picky Developer Class Type 
Just noticed that the type on this page was copied over from the About page. Non-blocking issue, just me being nit-picky.
 2017-04-01 10:06:40 -04:00
The_Grits
0f87a65622 importy 2017-03-31 19:35:33 -04:00
Matthew Taylor
d8ef3110e2 don’t apply to top banners 2017-03-31 10:26:56 -04:00
Matthew Taylor
0e645ce954 Reset banner on new login 2017-03-31 10:00:40 -04:00
Matthew Taylor
d66e11fced Banner updates 2017-03-31 09:02:54 -04:00
Matthew Taylor
7522be4c03 Merge pull request #1253 from TheGrits/patch-4 
Fix gh-1194: Remove Scratch Day from Localization
 2017-03-22 08:41:51 -04:00
Matthew Taylor
3a299e06f7 Merge pull request #1240 from TheGrits/patch-3 
Fix gh-1239: Update Conference Dates
 2017-03-22 08:32:54 -04:00
The_Grits
77bdd356d8 Remove Scratch Day from Localization File 2017-03-20 11:06:28 -04:00
The_Grits
bc43e89d36 Remove localization of Scratch Day 2017-03-20 11:05:52 -04:00
Matthew Taylor
e9f7748fdf Merge pull request #1243 from TheGrits/patch-4 
Fix gh-1242: Update Credits Page
 2017-03-16 11:57:11 -04:00
Matthew Taylor
0bb60700ba Merge pull request #1244 from mewtaylor/issue/opt-in 
[Develop] Hotfix: re-add checkbox to opt-in to email list for teacher
 2017-03-15 10:15:16 -04:00
Matthew Taylor
63c6bf59f2 Merge pull request #1149 from mewtaylor/issue/r2-4092 
For R2-4092: Add checkbox to opt-in to teacher emails
 2017-03-15 10:08:35 -04:00
The_Grits
c45663e966 Add Juanita Buitrago to Previous Members 2017-03-13 17:09:08 -04:00
The_Grits
f1880e47d5 Remove Juanita Buitrago 2017-03-13 17:08:39 -04:00