Commit graph

3988 commits

Author SHA1 Message Date
Paul Kaplan
e49eb3a222 Refresh the data related to the project json on switch back from editor 2018-12-03 15:15:18 -05:00
Karishma Chadha
da4cfb3120 Track isScratcher status and pass hasCloudPermission flag to gui. 2018-12-03 15:02:13 -05:00
Paul Kaplan
0903f919e4
Merge pull request #2377 from LLK/paulkaplan-patch-1
Point scratch-gui dependency back to develop tag
2018-12-03 14:55:01 -05:00
Paul Kaplan
aa10db8cf6
Point scratch-gui dependency back to develop tag
This was accidentally changed to "latest" when the merge from @rschamp's latest hotfix to master was made.
2018-12-03 14:53:55 -05:00
Paul Kaplan
30eb06066c
Merge pull request #2372 from paulkaplan/es6-promise-polyfill
Add es6-promise polyfill to fix browsers lacking promise.finally
2018-12-03 13:53:07 -05:00
Ray Schamp
80cf7137b8
Merge pull request #2376 from LLK/hotfix/fix-adventure-game
[Develop] Add project data to adventure game tutorial
2018-12-03 13:28:46 -05:00
Ray Schamp
7d816ac5e7
Merge branch 'develop' into hotfix/fix-adventure-game 2018-12-03 13:28:27 -05:00
Ray Schamp
d89d9778d3
Merge pull request #2375 from LLK/hotfix/fix-adventure-game
[Master] Add project data to adventure game tutorial
2018-12-03 12:39:32 -05:00
Ray Schamp
a0b6fda7a0
Add project data to adventure game tutorial 2018-12-03 12:33:28 -05:00
chrisgarrity
44e64aede8 Add missing tutorial shortcuts
Add `/bird` and `/makeitfly` as redirects to the tips page.

When the Fly tutorial is created /mak
2018-12-03 10:45:03 -05:00
chrisgarrity
e246c6a75c
Merge pull request #2184 from sehgalvibhor/thumbnail-fix
Thumbnail Fix
2018-12-03 09:53:45 -05:00
chrisgarrity
39a3af8732 Add tip_bar fastly config
Add another section to the fastly config that will permanently redirect any URL with `tip_bar=` to a matching `tutorial=`
2018-12-03 09:47:26 -05:00
Paul Kaplan
ee4268af15 Add es6-promise polyfill to fix browsers lacking promise.finally
This fixes an issue where projects could not be loaded on Edge
2018-12-03 09:32:27 -05:00
Benjamin Wheeler
39f13b50ec
Merge pull request #2346 from benjiwheeler/share-message
Display green "Shared" banner after user shares; bring CSS into line with spec
2018-12-03 09:31:43 -05:00
Ben Wheeler
655f3365ec rearranged css for linting 2018-12-03 09:24:35 -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
chrisgarrity
f7d65f212c
Merge pull request #2371 from apple502j/patch-5
[Master] No localhost allowed on HoC Banner
2018-12-03 08:09:28 -05:00
apple502j
574f2b0897
HOTFIX: No localhost allowed on real website! 2018-12-03 20:31:49 +09:00
Ben Wheeler
351d38de09 fixed lint errors 2018-12-02 08:35:31 -05:00
Ben Wheeler
e1cc0c390b tweaked banner css to bring it into line with design spec 2018-12-02 08:35:31 -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
Vibhor Sehgal
f1ccfbee66 Fix for Fashion microworld 2018-12-01 18:34:01 +05:30
Eric Rosenbaum
ab106f7723 Update windows version requirement 2018-11-30 17:21:59 -05:00
chrisgarrity
f6d54e25b9
Merge pull request #2367 from chrisgarrity/feature/mod-info
Additional project data for Moderators/Admins on the project page
2018-11-30 08:21:15 -05:00
Paul Kaplan
403690ee92
Merge pull request #2368 from ericrosenbaum/feature/makeymakey-extension
Add Makey Makey extension chip
2018-11-30 08:07:29 -05:00
chrisgarrity
e95e5c5f25 Additional project data for Moderators/Admins 2018-11-29 15:43:28 -05:00
Eric Rosenbaum
8260d7bb5d Add Makey Makey extension chip 2018-11-29 15:28:55 -05:00
Paul Kaplan
443039389a
Merge pull request #2366 from paulkaplan/fix-cloud-switching
Pass canSave to both editor and player view to allow cloud reconnecting.
2018-11-29 11:26:52 -05:00
Paul Kaplan
b039584c42
Merge pull request #2365 from paulkaplan/project-thumbnails
Add project thumbnail update action to pass into GUI
2018-11-29 10:59:13 -05:00
Paul Kaplan
c777ccffc8 Pass canSave to both editor and player view to allow cloud reconnecting.
The canSave prop was being passed to the editor view, but needs to also be passed to the player view because it is used to decide whether to connect the viewer to cloud variables. People cannot connect to cloud variables after entering editor mode on anothers project.
2018-11-29 10:53:03 -05:00
Paul Kaplan
172915f9d9 Add project thumbnail update action 2018-11-29 09:55:45 -05:00
chrisgarrity
42f5674a74
Merge pull request #2358 from chrisgarrity/fix-tx-config
Add new localization files to tx config
2018-11-29 08:23:23 -05:00
Benjamin Wheeler
84dc08b5cc
Merge pull request #2314 from chen-robert/gh2263-negative-loves
Fix gh-2263: Negative loves
2018-11-28 19:25:01 -08:00
chrisgarrity
4d4c9f8be7
Merge pull request #2361 from LLK/hotfix/replace-logged-out
[Master] show intro for logged out users
2018-11-28 14:04:45 -05:00
chrisgarrity
edfee0713a show intro for logged out users
Switch `&&` to `||`. Current date before AND after HoC is never true.
2018-11-28 12:23:47 -05:00
chrisgarrity
5d695ad158 Add new localization files to tx config 2018-11-28 10:15:40 -05:00
chrisgarrity
1f6f4d429f
Merge pull request #2327 from LLK/hotfix/hoc-banner
Hotfix/hoc banner
2018-11-28 10:07:44 -05:00
chrisgarrity
bef5e615f7
Merge pull request #2186 from apple502j/add-parents
Migrate Parents Page
2018-11-28 09:23:01 -05:00
chrisgarrity
7d6a1aabd5
Merge pull request #2353 from chrisgarrity/issue/2352-this-browser
Revised unsupported browser info
2018-11-27 17:44:09 -05:00
Bryce Taylor
cfcd2abd53
Merge pull request #2351 from BryceLTaylor/Integration-test-update
Get integration tests to pass after preview to project change
2018-11-27 14:19:09 -05:00
chrisgarrity
5cff3f9ae4 Revised unsupported browser info
- Header reads ‘This browser is not supported’
- FAQ link goes to general Scratch FAQ.
2018-11-27 12:51:49 -05:00
BryceLTaylor
b1b6aa66a0 Look for correct URL in See Inside test 2018-11-27 11:37:22 -05:00
BryceLTaylor
78dfaf07a8 explicitly require chromedriver so tests run 2018-11-27 11:36:16 -05:00
Paul Kaplan
99ac59d2cb
Merge pull request #2350 from paulkaplan/fix-comments-remixing
Remove comments when remixing, they do not exist on the new project
2018-11-26 16:32:12 -05:00
Paul Kaplan
1c4c5895af Remove comments when remixing, they do not exist on the new project 2018-11-26 11:21:14 -05:00
Paul Kaplan
2f393d2407
Merge pull request #2343 from paulkaplan/implement-copy-link
Implement the copy link functionality
2018-11-26 10:24:56 -05:00
Paul Kaplan
f025407818 Use a more popular clipboard manager 2018-11-26 10:22:55 -05:00
Paul Kaplan
1c09bdf7b0 Implement the copy link functionality
This does not implement any further design, like showing a confirmation popover, but just makes sure the button works. I used a very slim package to implement copy that does not include any fallbacks for IE, since we do not need to support that here.
2018-11-26 10:22:34 -05:00