scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-13 17:21:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3745 commits 220 branches 1 tag 509 MiB
Commit graph

169 commits

Author SHA1 Message Date
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
Ben Wheeler
d70bbe20c9 added default censored messages 2019-01-22 15:15:36 -05:00
Benjamin Wheeler
5ddb7660f6
Revert "Add to studio modal should only show studios user can actually change" 2019-01-17 11:22:00 -05:00
Ben Wheeler
ab82d37720 only show studios user can manipulate in add to studio modal 
Refactored studio list consolidation code for add to studio; set canAdd, 
canRemove flags directly on each studio.

pass flag userOwnsProject through to add to studio modal and its 
buttons.

pass flag isAdmin through to add to studio and its buttons.

set flags in add to studio buttons for whether user has permission to 
add project to studio, remove project from studio.

Set user ability/inability to click add to studio buttons using 
permissions flags and css
 2019-01-16 13:49:54 -05:00
Benjamin Wheeler
db6e0ed88f
Merge pull request #2624 from apple502j/patch-7 
Raise z-index of navbar
 2019-01-16 11:17:00 -05:00
Ben Wheeler
e88e669297 set the z-index of the player as a whole, to go under nav bar 
separately set z-index in fullscreen mode, to go over other project page 
UI including nav bar

correct isFullScreen prop
 2019-01-15 23:45:05 -05:00
chrisgarrity
b2b00ee867 Support link to cloud variable log 
Add Cloud Variables to the ‘Extension’ Chips when there are cloud variables in the project. If the user is logged in, also link to the cloud variable log for the project.
 2019-01-14 15:32:00 -05:00
chrisgarrity
cebdd0a17d
Merge pull request #2656 from chrisgarrity/issue/2628-remix-loading-project 
Don’t allow remixing if the project is not loaded
 2019-01-10 14:41:52 -05:00
chrisgarrity
ccbaa60e59 Don’t allow remixing if the project is not loaded 
Depends on https://github.com/LLK/scratch-gui/pull/4312

Adds new `isProjectLoaded` state to the project view, and disables the remix button until the project is loaded. Passes new callback to gui to be notified when the project is loaded.
 2019-01-10 10:50:37 -05:00
Paul Kaplan
f7e8922757 Allow loading more than 20 replies 2019-01-10 10:46:01 -05:00
Paul Kaplan
3ecc7d9a7e
Merge pull request #2612 from chrisgarrity/hotfix/no-comment-unshared 
Disallow comments on unshared projects
 2019-01-07 13:10:09 -05:00
chrisgarrity
29fb4b69d1 restore 5000 character limit for description fields 
Also make sure that validation error message is visible when 5000 character limit is exceeded.
 2019-01-07 11:09:44 -05:00
chrisgarrity
1d223825df Disallow comments on an unshared project 2019-01-07 10:42:53 -05:00
Benjamin Wheeler
976524b64d
Merge pull request #2600 from benjiwheeler/hotfix/view-all-remixes 
[Develop] Show link to view all remixes on project page
 2019-01-04 10:50:42 -05:00
Ben Wheeler
7f2fbd4a3b added View all link at top of studios list 2019-01-04 10:30:43 -05:00
Ben Wheeler
0ad5c977aa show link to view all remixes on project page 2019-01-03 18:50:19 -05:00
Ben Wheeler
9625bc554d added comments explaining need to show project instructions, notes when both are empty 2019-01-03 13:12:08 -05:00
Ben Wheeler
627737fdd4 collapse empty project instructions or notes and credits 2019-01-03 12:45:07 -05:00
Benjamin Wheeler
293b7beefc
Merge pull request #2506 from benjiwheeler/mod-info 
added author username to moderation info area
 2018-12-18 11:45:51 -05:00
Ben Wheeler
edec88f0ab added author username to moderation info area 2018-12-18 10:43:11 -05:00
Ben Wheeler
153c749546 pass onUpdateProjectThumbnail to gui when on project page 2018-12-17 15:36:09 -05:00
Ben Wheeler
2a0a76fba1 don't use flex-row class to wrap instructions and credits 2018-12-13 14:01:27 -05:00
Paul Kaplan
612d08e850 Fix line heights for instructions and comments 2018-12-12 17:04:14 -05:00
Paul Kaplan
ace110c59b Show username and cloud var alerts on projects that use them. 
Only implemented for scratch3 projects
 2018-12-11 11:15:00 -05:00
chrisgarrity
594ce06b5b
Merge pull request #2427 from chrisgarrity/issue/sb2-mod-info 
Add moderator info for sb2 projects
 2018-12-11 10:13:45 -05:00
apple502j
c134a95de3 Translate placeholder 2018-12-11 20:41:49 +09:00
chrisgarrity
84cfcdee85 Add moderator info for sb2 projects 2018-12-10 08:47:01 -05:00
Benjamin Wheeler
9d5788cc77
Merge pull request #2417 from benjiwheeler/view-count 
pass onGreenFlag to GUI; when called, call API to register project view
 2018-12-07 16:52:44 -05:00
Paul Kaplan
d20b16d79c
Merge pull request #2424 from paulkaplan/admin-toggle-comments 
Allow admins to toggle comments
 2018-12-07 16:47:01 -05:00
Paul Kaplan
551cc0cc13 Remove userOwnsProject because it is unused 2018-12-07 16:09:34 -05:00
Paul Kaplan
5d409bcdcf Allow admins to toggle comments 2018-12-07 12:57:50 -05:00
Paul Kaplan
2a464c8c21 Remove share button on censored project banner. 
Functionality needs reconsidering.
 2018-12-07 12:32:54 -05:00
Ben Wheeler
5c3300dd68 pass onGreenFlag to GUI; when called, call API to register project view 2018-12-06 23:06:27 -05:00
Ray Schamp
bc59a63e5e Only show the admin panel to admins 2018-12-06 17:07:28 -05:00
Ben Wheeler
d235d872e1 show remixed banner to all, not just new scratchers 2018-12-06 16:01:28 -05:00
Ben Wheeler
1adca1800a Banner message showing that user has remixed 2018-12-06 16:01:28 -05:00
Ray Schamp
af32c08971
Merge pull request #2413 from rschamp/mod-panel-phase-3 
Match scratchr2 admin panel behavior more closely
 2018-12-06 15:47:48 -05:00
Ray Schamp
15cc6ca529 Lint 2018-12-06 15:16:22 -05:00
Ray Schamp
b7ffa34eec Open and close admin panel from parent component 2018-12-06 15:05:20 -05:00
Ray Schamp
8e75b8c6cf
Merge pull request #2404 from rschamp/mod-panel-phase-1 
Admin panel for the project page
 2018-12-06 09:33:02 -05:00
Ray Schamp
59e0941652 Update iframe to the standalone view 2018-12-05 17:12:18 -05:00
Ray Schamp
096aeb02a0 Lint 2018-12-05 16:09:04 -05:00
Ray Schamp
726a2005bb Basic project admin panel support 
Just in case we don't do anything else, this "proxies" the old admin panel to the new project page.

Requires https://github.com/LLK/scratchr2/pull/5219 to work.
 2018-12-05 15:40:18 -05:00
Paul Kaplan
ff8bbe79b4 Use message instead of censorMessage for the censor message. 2018-12-04 16:29:46 -05:00
Karishma Chadha
da4cfb3120 Track isScratcher status and pass hasCloudPermission flag to gui. 2018-12-03 15:02:13 -05:00
Ben Wheeler
089cdbb06b revised banner css to be more flexible 
simplified share banner conditionals

shorter banner height without button; button has margin instead
 2018-12-03 09:24:35 -05:00
Ben Wheeler
a6a5ef7941 long and short shared messages; clarified logic around which banner to show 2018-12-02 08:35:31 -05:00
Ben Wheeler
3af745eede don't show shared message forever 2018-12-02 08:35:31 -05:00
Ben Wheeler
8d74726080 added congratulations on sharing message for new scratchers 2018-12-02 08:35:31 -05:00