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
4386 commits 216 branches 1 tag 464 MiB
Commit graph

4386 commits

This branch
This branch
All branches
Author SHA1 Message Date
apple502j
608c08377a Don't link if destination is null 2019-01-17 21:23:15 +09:00
Karishma Chadha
71a67db73b
Merge pull request #2689 from LLK/paulkaplan-patch-3 
Bump GUI
 2019-01-16 17:29:10 -05:00
Karishma Chadha
2453278466
Update package.json 
Co-Authored-By: paulkaplan <pkaplan@media.mit.edu>
 2019-01-16 17:14:09 -05:00
Paul Kaplan
2d56e16f51
Bump GUI 2019-01-16 17:03:47 -05:00
Benjamin Wheeler
441d695f97
Merge pull request #2682 from benjiwheeler/studio-use-permissions 
Add to studio modal should only show studios user can actually change
 2019-01-16 16:59:33 -05:00
Ben Wheeler
e9b736270f make showStudio utility function purely functional 2019-01-16 16:42:02 -05:00
Bryce Taylor
a454f71032
Merge pull request #2688 from BryceLTaylor/Update-Footer-Link-Tests 
Remove Scratch Wiki test from integration tests
 2019-01-16 15:10:13 -05:00
BryceLTaylor
194842e414 Remove Scratch Wiki test 2019-01-16 14:56:01 -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
apple502j
ea9282a3eb
Check hashtag after URL 2019-01-16 09:15:58 +09:00
Benjamin Wheeler
245a90530d
Merge pull request #2677 from apple502j/patch-9 
Change Credits URL
 2019-01-15 18:23:04 -05:00
chrisgarrity
3146897c0f
Merge pull request #2675 from chrisgarrity/issue/cloud-log 
Support link to cloud variable log
 2019-01-15 11:28:49 -05:00
chrisgarrity
ed1cf35721 de-dup helpers.cloudData 2019-01-15 10:10:36 -05:00
apple502j
d8a0a90e92
Change Credits URL - Footer 2019-01-15 14:49:45 +09:00
apple502j
b8ba34e5fb
Credits URL changed - For Developers 2019-01-15 14:48:36 +09:00
apple502j
7937611272
Make internal URL clickable 2019-01-15 14:34:17 +09: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
Ray Schamp
348403a407
Merge pull request #2667 from rschamp/l10n-spam 
Don't create a separate test for each l10n json
 2019-01-11 12:20:19 -05:00
Ray Schamp
89ef3d1230
Merge pull request #2666 from rschamp/l10n-spam 
Don't create a separate test for each l10n json
 2019-01-11 12:17:29 -05:00
Ray
0db93fcc81 Don't create a separate test for each l10n json 
Reduces the spam in Travis for visibility
 2019-01-11 12:15:58 -05:00
Benjamin Wheeler
ba4fcb9707
Merge pull request #2660 from LLK/develop 
[MASTER] Deploy reply chain fixes and remix fixes
 2019-01-11 11:23:21 -05:00
Benjamin Wheeler
266a46a75b
Merge pull request #2664 from benjiwheeler/bump-gui 
bump gui version so that scratch-gui #4319
 2019-01-11 09:43:35 -05:00
Ben Wheeler
40e26ab636 bump gui version so that scratch-gui #4319 
bump gui version so that scratch-gui #4319 can land (resolve name conflict in project-fetcher-hoc)
 2019-01-11 09:40:53 -05:00
Christopher Willis-Ford
1153bb21eb Update Scratch Desktop download links to v1.2.1 2019-01-10 15:24:40 -08:00
Christopher Willis-Ford
2018f8534a Update Scratch Desktop download links to v1.2.1 2019-01-10 15:19:51 -08: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
cc6bd38b2d
Merge pull request #2659 from chrisgarrity/bump-gui-ver 
Bump gui version…
 2019-01-10 14:41:18 -05:00
chrisgarrity
e9899a7acb Bump gui version… 
so that https://github.com/LLK/scratch-www/pull/2656 can land (disable remixing until project loaded)
 2019-01-10 14:38:36 -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
chrisgarrity
17be315d25
Merge pull request #2653 from apple502j/patch-8 
Change Mobile Chrome supported ver to 63+
 2019-01-10 14:03:05 -05:00
Paul Kaplan
16391f25ee Strip out duplicates from replies and comments. 
Fixes https://github.com/LLK/scratch-www/issues/2575
 2019-01-10 13:49:07 -05:00
Paul Kaplan
78f96598a1
Merge pull request #2654 from LLK/develop 
[MASTER] Deploy sentry fix to stop noisy errors
 2019-01-10 11:18:26 -05:00
Paul Kaplan
e2c743445f Add unit test for setReplies action in preview reducer 2019-01-10 10:59:35 -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
f245285c9e
Merge pull request #2655 from paulkaplan/really-fix-sentry 
Prevent uncaught errors from going to sentry
 2019-01-10 10:32:23 -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
195cdba19a
Merge pull request #2650 from LLK/paulkaplan-patch-2 
Disable window onerror
 2019-01-10 08:30:09 -05:00
apple502j
830b38c214 Fix the credits again 2019-01-10 20:37:24 +09:00
apple502j
95203a462e
Change Mobile Chrome supported ver to 63+ 2019-01-10 19:02:59 +09:00
Paul Kaplan
48750de9a0
Merge pull request #2649 from LLK/develop 
[MASTER] Deploy performance and browser support issues
 2019-01-09 17:04:59 -05:00
Paul Kaplan
2ea49fc4d3
Disable window onerror 2019-01-09 16:56:31 -05:00
Paul Kaplan
e8ea9c90c9
Merge pull request #2648 from LLK/paulkaplan-patch-1 
Bump GUI to bring in performance and BSOD fixes
 2019-01-09 15:39:55 -05:00
Paul Kaplan
e2b51daa63
Bump GUI to bring in performance and BSOD fixes 2019-01-09 15:39:46 -05:00
Paul Kaplan
d5d0e251e4
Merge pull request #2646 from LLK/paulkaplan-patch-1 
Bump GUI to bring in unsupported browser error states
 2019-01-09 14:57:28 -05:00
Paul Kaplan
66739fedf4
Bump GUI to bring in unsupported browser error states 2019-01-09 14:57:16 -05:00
chrisgarrity
6cd2b38ad1
Merge pull request #2645 from chrisgarrity/revise-unsupported-browser 
Revise unsupported browser
 2019-01-09 14:48:49 -05:00