Commit graph

432 commits

Author SHA1 Message Date
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
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
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
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
e9b736270f make showStudio utility function purely functional 2019-01-16 16:42:02 -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
ed1cf35721 de-dup helpers.cloudData 2019-01-15 10:10:36 -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
Paul Kaplan
6c8881106e
Merge pull request #2657 from paulkaplan/more-replies
Allow loading more than 20 replies
2019-01-10 14:29:27 -05:00
Paul Kaplan
1277ca4876 Make "See more replies" only the width of the replies column 2019-01-10 10:58:34 -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
7f99e8b8c2 Prevent uncaught errors from going to sentry
For real this time. Just needed to figure out the right plugins to filter. TryCatch plugin is the one that reports errors from setTimeouts, which the VM executes code in.

Remove the previous window.onerror kludge, it was not working and prevented errors from reaching the console.

Tested locally by providing the staging DSN for Sentry
2019-01-10 10:07:30 -05:00
Paul Kaplan
2ea49fc4d3
Disable window onerror 2019-01-09 16:56:31 -05:00
Paul Kaplan
885977e554 Disable global handlers 2019-01-08 14:19:11 -05:00
Benjamin Wheeler
63cc104668
Merge branch 'develop' into hotfix/proxy-love-favorite 2019-01-07 14:20:28 -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
Ben Wheeler
8e1d6fee54 love and favorite proxy, and use x-requested-with header 2019-01-07 11:39:31 -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
ad0da48eeb
Merge pull request #2596 from benjiwheeler/hotfix/view-all-remixes
[Master] Show link to view all remixes on project page
2019-01-04 11:47:47 -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
b452f73a32 revised remix list header css to handle longer strings better 2019-01-04 10:22:48 -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
Paul Kaplan
07ad54bb6c Only track green flag once 2019-01-02 16:22:42 -05:00
Paul Kaplan
a2fbdf9943 Only track green flag once 2019-01-02 16:19:26 -05:00
Andrew Sliwinski
4a4b8815e5 Remove "CappedNumber" from view count on project page. 2018-12-30 10:06:02 -05:00
Ray Schamp
7a7a6de4b0
Merge pull request #2543 from paulkaplan/fix-gui-min-size
Bring in the min sizes for GUI to allow scrollable UI
2018-12-27 16:10:59 -05:00
Paul Kaplan
da8d60706f Bring in the min sizes for GUI to allow scrollable UI 2018-12-27 11:12:34 -05:00
Paul Kaplan
bfd14a115a Fix the studio links to use the correct URL 2018-12-27 09:27:11 -05:00
Paul Kaplan
dcb03a0526 Fix lint whitespace 2018-12-20 13:48:38 -05:00
Colby Gutierrez-Kraybill
6a946b99fc Update to new sentry API pattern
Use current Sentry browser package and forward errorId into eventId
Fix up errorInfo reference
Put Sentry on the window object for GUI to use
Remove unneeded reference to old style Raven and raven-js
Move Sentry webpack config into production only

Add GA tracker ID to window

Allows scratch-gui to use same GA id
2018-12-20 12:56:33 -05:00
Paul Kaplan
a196462818
Merge pull request #2515 from paulkaplan/enfasten-remixing-further
Set isRemixing to true and then start remixing process
2018-12-20 08:31:58 -05:00
picklesrus
2f35049ff8
Merge pull request #2501 from kyleplo/patch-3
Make it clear that only Scratchers can use the cloud
2018-12-19 17:24:25 -05:00
Paul Kaplan
137015cfc0 Set isRemixing to true and then start remixing process
This makes it feel snappier to start the remixing project because it does not wait for the GUI to notify
2018-12-19 15:58:38 -05:00
Benjamin Wheeler
64fc4b3ed8
Merge pull request #2508 from benjiwheeler/switch-to-editor-on-remix
switch to editor after remixing from project page
2018-12-19 15:35:18 -05:00
Ben Wheeler
5ff13da56d admins should not see editable project title in editor 2018-12-19 11:59:47 -05:00
Ben Wheeler
859574a8bd switch to editor after remixing from project page 2018-12-19 11:40:49 -05:00