Commit graph

2715 commits

Author SHA1 Message Date
Ben Wheeler
fc466fa7cc shortened harvard text, improved responsive styles for SiP 2019-03-25 23:32:31 -04:00
Ben Wheeler
dd51cf4ea6 pass token to comments endpoints every time, not only if user is admin 2019-03-25 14:21:06 -04:00
Ben Wheeler
163741f34e add ownerUsername to comment API endpoint URIs; handle error responses from those endpoints 2019-03-25 13:40:12 -04:00
Ben Wheeler
49df9a6386 split admin and non-admin project studios endpoints 2019-03-23 10:03:51 -04:00
Ben Wheeler
986c608136 make token optional in call to getProjectStudios endpoint 2019-03-22 15:43:00 -04:00
Ben Wheeler
4a20a09f52 change studios for project endpoint to include owner, token 2019-03-21 21:11:14 -04:00
Ben Wheeler
836af62e13 revised educators strings and removed commented out code 2019-03-21 11:35:30 -04:00
Ben Wheeler
dd3b777763 moved educators SiP from 3-icon section to standalone sub-banner 2019-03-21 09:23:59 -04:00
Ben Wheeler
5977796822 trying out a 3-icon resources for educators section 2019-03-18 18:05:20 -04:00
Ben Wheeler
815aa31f91 refactored the Resources for Educators section to have icons 2019-03-12 09:57:31 -04:00
Ben Wheeler
ee2cb00cc8 switched order of scratch in practice, other text in resources for educators 2019-03-05 15:40:11 -05:00
chrisgarrity
3aa37d5a82
Merge pull request #2748 from kyleplo/patch-4
Migrate Starter Projects
2019-03-05 12:40:58 +01:00
kyleplo
1aa87a74c8 Create starter-projects.jsx
* add messages for localization
* define projects to include in starter-projects.json
* add new route and redirect
2019-03-05 12:23:41 +01:00
seotts
32bbb1ae96 removed extra line breaks 2019-03-04 09:14:32 -05:00
Sarah Otts
2e5d93d933
Merge branch 'develop' into issue-2806 2019-03-04 09:10:44 -05:00
Andrew Sliwinski
c69a6b1ed9
Merge pull request #2773 from jakel181/patch-1
Update moderator requirements.
2019-02-28 17:39:22 -05:00
Ben Wheeler
e6f1a701f1 use long version of mailing list url 2019-02-28 10:57:44 -05:00
Ben Wheeler
2a4e076339 corrected mail list form; links use _blank; redirect conference url; logo links to main site 2019-02-28 10:44:30 -05:00
Benjamin Wheeler
600205b7b7
Merge pull request #2795 from benjiwheeler/regional-conferences
Add 2019 Regional conferences page
2019-02-28 06:59:10 -05:00
Eric Rosenbaum
fb09d904f9 URL is /vernier 2019-02-27 21:13:46 -05:00
Ben Wheeler
7cbf6764e2 updated route alias for conferences 2019-02-27 17:00:58 -05:00
Ben Wheeler
42844a8927 made more conferences 2019 related strings translatable 2019-02-27 16:58:13 -05:00
Ben Wheeler
b2b3dfa037 updated 2019 conference text per further changes 2019-02-26 16:54:22 -05:00
seotts
2020759204 updated mod job description 2019-02-26 14:04:56 -05:00
jakel181
4de5cb27b6
Update moderator.jsx 2019-02-26 07:56:54 -05:00
apple502j
5e34e41a21
Add SiP texts 2019-02-26 18:24:57 +09:00
apple502j
cf4cf875b2
Add SiP Link 2019-02-26 18:23:33 +09:00
Ben Wheeler
6668e6d840 updated text and icons per feedback from scratch foundation 2019-02-25 17:22:30 -05:00
Ben Wheeler
42f2486e1c improved 2019 conference responsiveness, improved calendar icon 2019-02-25 13:49:08 -05:00
Ben Wheeler
3e02b59866 improve responsive layouts of 2019 conferences page 2019-02-25 11:47:10 -05:00
Ben Wheeler
f33b96d6bf new title image for conference page, new calendar icon 2019-02-20 18:13:07 -05:00
Ben Wheeler
5b20f743f2 added envelope, calendar icons 2019-02-20 17:55:32 -05:00
Ben Wheeler
c29518bd6b adjusted 2019 conferences title size 2019-02-20 17:16:30 -05:00
Ben Wheeler
7ef7a40b8e compressed svgs 2019-02-20 17:14:30 -05:00
Ben Wheeler
1483f6d86c revised conference layout and css per feedback 2019-02-20 16:41:52 -05:00
Ben Wheeler
3179f7e59d use solid icons, not outlines ones, on 2019 conference page 2019-02-19 16:26:30 -05:00
Paul Kaplan
4e8ea5c3bd Get thumbnails from the project for reporting 2019-02-15 14:27:36 -05:00
Ben Wheeler
9509e698cb initial conference 2019 changes 2019-02-15 12:11:14 -05:00
Benjamin Wheeler
a985585d80
Merge pull request #2764 from apple502j/patch-11
Don't refer to a section which does not exist
2019-02-15 07:59:51 -05:00
Ben Wheeler
752a90965c in FAQ, added reference to Scratch Extensions to blocks change answer 2019-02-14 14:17:57 -05:00
jakel181
99a4408df3
Update privacypolicy.jsx 2019-02-14 11:23:41 -05:00
jakel181
ec87c9ee8f
Update privacypolicy.jsx 2019-02-14 11:12:50 -05:00
jakel181
e15f0c8baa
Update privacypolicy.jsx 2019-02-14 11:08:19 -05:00
jakel181
370d249975
Update moderator.jsx 2019-02-13 16:40:10 -05:00
jakel181
4ae339a5e6
Update moderator.jsx 2019-02-13 16:24:20 -05:00
jakel181
3fdfe6d588
Update moderator.jsx 2019-02-13 16:10:50 -05:00
Benjamin Wheeler
6ed66a7321
Merge pull request #2767 from benjiwheeler/autocensored-message
show autocensored message if API indicates project was autocensored
2019-02-12 10:31:41 -05:00
Paul Kaplan
9f2ca84283
Merge pull request #2765 from paulkaplan/form-submit-logout
Use a dummy form submission instead of logging out via xhr.
2019-02-11 15:33:36 -05:00
Ben Wheeler
902367ef05 show autocensored message if API indicates project was autocensored 2019-02-11 13:00:35 -05:00
Paul Kaplan
c6961aae36 Do not try to manage fullscreen mode URI for unsaved projects
This fixes the issue where you could go from /projects/editor => /projects/0/fullscreen by entering fullscreen mode on a new unsaved project.
2019-02-11 10:28:44 -05:00
Paul Kaplan
49afbd2c70 Use a dummy form submission instead of logging out via xhr.
This fixes an issue where you could get logged out but then remain on your page by dismissing the window.onbeforeunload prompt when you have unsaved changes. That would put you in a state where you looked logged in but could not save.
2019-02-11 10:08:38 -05:00
apple502j
653beccf4b
Don't refer to a section which does not exist 2019-02-09 15:25:12 +09:00
Eric Rosenbaum
d988534144 Update images 2019-02-07 14:25:43 -05:00
Eric Rosenbaum
777f0cca47 Initial draft of landing page 2019-02-06 11:54:30 -05:00
Benjamin Wheeler
16ca2d7319
Merge pull request #2739 from chrisgarrity/issue/2309-wide-translations
Wrap ‘need help?’ link when translation is too long
2019-02-05 09:43:15 -05:00
chrisgarrity
56d2a90bf2 Wrap ‘need help’ link when translation is too long
Refactored the submit row of the login component to use Flex Row instead of `float: right` for the `need help` link.  The bulk of the changes are white space, so remember to ignore whitespace for review.
2019-02-05 13:00:41 +01:00
Ben Wheeler
7aa1ba6c42 use slider toggle for turning comments on and off 2019-02-01 17:03:43 -05:00
Ben Wheeler
6ffaa1afa8 include informationpage.jsx after render.jsx, so CSS overrides in correct order 2019-01-31 11:23:07 -05:00
chrisgarrity
a7d0cb857b Change video id to one without autoplay 2019-01-31 16:59:41 +01:00
Benjamin Wheeler
bb96d5ebb3
Merge pull request #2732 from benjiwheeler/keep-commenting-enabled-mobile
reenable commenting on mobile, which was disabled in #2512
2019-01-30 13:43:15 -05:00
chrisgarrity
42bc19c2e3
Merge pull request #2622 from apple502j/about-video
About video
2019-01-30 18:19:32 +01:00
Benjamin Wheeler
5b9229c6c0
Merge pull request #2731 from chrisgarrity/issue/modal-zindex
Make www modal z-index consitent with gui
2019-01-30 12:17:01 -05:00
Ben Wheeler
bf8dd81ce9 comment form buttons should stay in row in mobile 2019-01-30 11:52:53 -05:00
Ben Wheeler
1a39d82fbf reenable commenting on mobile, which was disabled in #2512 2019-01-30 09:56:04 -05:00
chrisgarrity
42d5254f1e more resizing for new video 2019-01-30 12:58:15 +01:00
apple502j
10da7662e6
Remove height and width 2019-01-30 19:54:17 +09:00
chrisgarrity
3c661660c8 Make www modal z-index consitent with gui
The gui uses z-indices up to 500 for things that should be covered by a modal and sets the modal to 510. www should match gui.
2019-01-30 11:50:07 +01:00
chrisgarrity
29b08dfd16
Merge pull request #2728 from chrisgarrity/issue/2271-tutorials-shortcut
Add route for `/tutorials` shortcut
2019-01-30 10:10:57 +01:00
Benjamin Wheeler
f5134483a3
Merge pull request #2676 from apple502j/patch-8
Make internal URL clickable
2019-01-29 23:28:25 -05:00
chrisgarrity
b293f34444
Merge pull request #2535 from Kenny2github/no-faq-htmlmsg
Migrate FAQ page to FormattedMessage. Note that I pushed the `faq/l10n.json` to transifex and manually updated scratchr2_translations as this is a 'breaking' change for translations.
2019-01-29 17:52:40 +01:00
chrisgarrity
fc5d2ed8c7 Add route for /tutorials shortcut 2019-01-29 17:21:06 +01:00
Benjamin Wheeler
bfa4e3331c
Merge pull request #2512 from benjiwheeler/mobile-read-only
changed tablet width to 768; several responsive tweaks
2019-01-29 10:47:24 -05:00
Ben Wheeler
a8d4184b3f renamed frameless.js tablet var to mobileIntermediate, use tabletPortrait for breaks 2019-01-29 10:35:19 -05:00
chrisgarrity
31e572e534
Merge pull request #2720 from chrisgarrity/sync-translations
Add missing resource to .tx/config
2019-01-29 15:23:58 +01:00
chrisgarrity
b105c517d6 Add missing resource to .tx/config
The `download/scratch2` l10n file was missing from the config file, along with the new ideas page.

Also, the `name` field in the routes json needs to match the resource name. So changed the `download-scratch2` route name to match the l10n name.
2019-01-29 11:33:45 +01:00
Ben Wheeler
2ef8edf5b1 added back commented out no jobs message, for later 2019-01-28 23:37:11 -05:00
Ben Wheeler
4b660b0176 constrain studio and remix thumbnails to a single column 2019-01-28 23:12:43 -05:00
Ben Wheeler
640d565207 made extension chip showing/hiding consistent 2019-01-28 23:12:36 -05:00
Ben Wheeler
be975cba26 using tabletPortrait instead of changing value of tablet var, per chrisg's suggestion 2019-01-28 22:36:39 -05:00
Ben Wheeler
7b19878d7f changed tablet width to 768; several responsive tweaks 2019-01-28 22:27:01 -05:00
Ken
f2bea32df8
Add Community Moderator listing 2019-01-29 08:59:31 +08:00
Paul Kaplan
8e57bb5493 Pass updates up from project updater to top-level redux store 2019-01-25 13:35:39 -05:00
Ray Schamp
29d5a80b5e
Update z-index so validation bubbles go below the nav bar 2019-01-25 11:20:32 -05:00
Ray
d8d46b102b Fix initial value for notes and credits aka description
Resolves "mirror world" issue
2019-01-25 10:11:22 -05:00
Paul Kaplan
d6c48a5730 Wrap project update inputs to show server validation 2019-01-24 16:53:21 -05:00
Eric Rosenbaum
71cb92c214
Merge pull request #2704 from ericrosenbaum/bugfix/update-extension-chips
Update extension chips
2019-01-23 17:30:38 -05:00
Eric Rosenbaum
825b885638 Update extension chip icons 2019-01-23 15:51:35 -05:00
Eric Rosenbaum
44ec3de0f1 Change extension chip wording to “Video Sensing” 2019-01-23 15:51:00 -05:00
Benjamin Wheeler
b72118e29d
Merge pull request #2702 from benjiwheeler/autocensored-message
added default censored messages
2019-01-23 15:24:58 -05:00
Benjamin Wheeler
5f3f7f0977
Merge pull request #2703 from LLK/revert-2693-revert-2682-studio-use-permissions
Revert "Revert "Add to studio modal should only show studios user can actually change""
2019-01-23 14:17:27 -05:00
Ben Wheeler
aeedf456c0 corrected messageHTML to message 2019-01-23 13:29:37 -05:00
Ben Wheeler
696bfa117e refactored censored message into component, removed autocensor message 2019-01-23 10:30:26 -05:00
Ben Wheeler
971b3dc2d1 added autocensor-specific banner message 2019-01-23 09:18:40 -05:00
Benjamin Wheeler
4d3e46e40b
Revert "Revert "Add to studio modal should only show studios user can actually change"" 2019-01-22 17:07:52 -05:00
Ben Wheeler
ddf6793362 reformat banner css to be less red, better line-height, max width on text 2019-01-22 16:35:59 -05:00
Ben Wheeler
d70bbe20c9 added default censored messages 2019-01-22 15:15:36 -05:00
Eric Rosenbaum
dea983c995 Update WeDo legacy link text 2019-01-22 11:32:42 -05:00
Eric Rosenbaum
5603e2dc2b Fix WeDo extension chip wording 2019-01-22 11:23:48 -05:00
Eric Rosenbaum
3231d4cbd7 Fix WeDo page title 2019-01-22 11:18:59 -05:00
Eric Rosenbaum
11c449226e Update LEGO wording 2019-01-22 11:02:10 -05:00