Commit graph

6863 commits

Author SHA1 Message Date
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
Paul Kaplan
d31cbe58e2
Merge pull request #2344 from paulkaplan/fix-comment-actions
Show comment actions on hover and fix report translation
2018-11-26 10:15:16 -05:00
chrisgarrity
b195c4acf3
Merge pull request #2347 from chrisgarrity/feature/2279-unsupported-browser
Project page - unsupported browser view
2018-11-26 09:53:48 -05:00
chrisgarrity
decb250dd5 Initial version 2018-11-26 09:43:05 -05:00
Paul Kaplan
1be21bdb7e
Merge pull request #2345 from paulkaplan/fix-placeholder-alignment
Fix alignment of the placeholder and text in project instructions & note
2018-11-26 09:25:44 -05:00
Paul Kaplan
3fb5dd769a
Merge pull request #2340 from paulkaplan/visibility-info
Show details about why a project is not public
2018-11-26 09:18:38 -05:00
Paul Kaplan
d5c3ae773f Fix lint 2018-11-21 13:00:53 -05:00
Paul Kaplan
847d0c3844 Fix alignment of the placeholder and text in project instructions & note 2018-11-21 12:12:51 -05:00
Paul Kaplan
a8cf28958c Fix incorrect translation string in comment report 2018-11-21 11:47:12 -05:00
Paul Kaplan
933b805044 Make comment actions (report, delete, restore) only visible on hover 2018-11-21 11:46:54 -05:00
chrisgarrity
345b111371
Merge pull request #2333 from chrisgarrity/feature/2270-shortcut-redirect
Tutorial shortcut redirects
2018-11-21 11:31:00 -05:00
Paul Kaplan
2ed74a2682 Show deleted banner if both deleted and censored.
This is because the user can take an action to remove the trash status, but not the censored status.
2018-11-21 10:36:27 -05:00
Paul Kaplan
0b8c13fb40 Use the project author username in visibility request instead of viewer
/ht @chrisgarrity
2018-11-21 10:31:10 -05:00
Ray Schamp
54ce126559
Merge pull request #2342 from LLK/revert-2341-revert-2322-static-host-cdn
Revert "Revert "use cdn.scratch.ly in staging""
2018-11-21 10:28:03 -05:00
Ray Schamp
df3d18e649
Revert "Revert "use cdn.scratch.ly in staging"" 2018-11-21 10:27:13 -05:00
Ray Schamp
dd53c481d4
Merge pull request #2341 from LLK/revert-2322-static-host-cdn
Revert "use cdn.scratch.ly in staging"
2018-11-21 10:09:04 -05:00
Ray Schamp
45415944c1
Revert "use cdn.scratch.ly in staging" 2018-11-21 10:07:57 -05:00
Benjamin Wheeler
95fb947c08
Merge pull request #2325 from benjiwheeler/hash-redirect
redirect hash urls to url pathnames
2018-11-20 16:06:46 -05:00
Paul Kaplan
ac6a870a3f
Merge pull request #2334 from chrisgarrity/feature/rename-preview
Rename /preview to /projects
2018-11-20 15:34:03 -05:00
Ben Wheeler
79ae4dd511 let pathname end without a slash 2018-11-20 15:03:57 -05:00
Eric Rosenbaum
bfc36e25f9
Merge pull request #2329 from ericrosenbaum/feature/get-link-from-app-stores
App store badges for Link download
2018-11-20 13:17:18 -05:00
Paul Kaplan
c18ccba646 Fix scss linting 2018-11-20 12:16:10 -05:00
Paul Kaplan
122160726d Show details about why a project is not public
Follow up the project info request with a request to the visibility endpoint to find out if the project is trashed or censored. The project just not being published is handled by the existing code.

This PR generalizes the ShareBanner to a more generic "Banner" that is then filled with the relevant content.
2018-11-20 12:01:52 -05:00
Paul Kaplan
af301ba450
Merge pull request #2336 from paulkaplan/exit-single-comment-view
Allow user to exit "single comment mode" and see all comments.
2018-11-20 08:13:42 -05:00
Benjamin Wheeler
efd23ed853
Merge pull request #2322 from benjiwheeler/static-host-cdn
use cdn.scratch.ly in staging
2018-11-19 18:18:36 -05:00
Ben Wheeler
7ee463509c use cdn.scratch.ly in staging 2018-11-19 17:07:48 -05:00