scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 23:57:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3660 commits 217 branches 1 tag 464 MiB
Commit graph

2522 commits

Author SHA1 Message Date
chrisgarrity
e246c6a75c
Merge pull request #2184 from sehgalvibhor/thumbnail-fix 
Thumbnail Fix
 2018-12-03 09:53:45 -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
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
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
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
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
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
bef5e615f7
Merge pull request #2186 from apple502j/add-parents 
Migrate Parents Page
 2018-11-28 09:23:01 -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
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
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
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
df3d18e649
Revert "Revert "use cdn.scratch.ly in staging"" 2018-11-21 10:27:13 -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
Ben Wheeler
7ee463509c use cdn.scratch.ly in staging 2018-11-19 17:07:48 -05:00
chrisgarrity
c4403c5d8d Replace uses of /preview in URLs 2018-11-19 17:02:09 -05:00
Eric Rosenbaum
f77357daf2 Update mac and windows app store links 2018-11-19 15:59:37 -05:00
Paul Kaplan
3fe1242aa6 Allow user to exit "single comment mode" and see all comments. 
This visually appears like a "load more comments" button for now, but has the impact of unsetting the #comments-<id> hash in the url and resetting the comment state, showing all the comments (in paginated view)
 2018-11-19 15:47:47 -05:00
chrisgarrity
2065090bb8
Merge pull request #2262 from sjgllghr/issue/gh2212-migrate-scratch-1.4 
Fix gh-2212: Migrate Scratch 1.4 download page
 2018-11-19 15:27:49 -05:00
Eric Rosenbaum
8efb6045ee Lint 2018-11-19 15:22:18 -05:00
chrisgarrity
494bc3e48d Rename /preview to /projects 2018-11-19 14:59:56 -05:00
chrisgarrity
dd620e1187 Tutorial shortcut redirects 
Duplicate tutorial shortcuts previously handled by scratchr2.

Left out routeAlias as that is no longer needed.
 2018-11-19 14:18:22 -05:00
Paul Kaplan
7cfc3ed846 Show projectNotAvailable view in editor mode also 2018-11-19 14:16:56 -05:00
Ben Wheeler
50a2072794 removed stale comment 2018-11-19 13:58:02 -05:00
Eric Rosenbaum
9ee3c9eb6c App store badges for Link download 2018-11-19 13:51:29 -05:00
Ben Wheeler
1c8a124f44 switched button border radius back to 4px 2018-11-19 13:22:27 -05:00
chrisgarrity
911005f5ad
Merge branch 'master' into hotfix/hoc-banner 2018-11-19 12:03:02 -05:00
chrisgarrity
a06d8ec11e Add more bottom padding to activities button 
Also restore hocbanner messages to l10n.json.
 2018-11-19 11:11:48 -05:00
Ben Wheeler
cd030e0895 rearranged css to get tests working 2018-11-18 11:19:21 -05:00
Ben Wheeler
d9fdb67543 redirect hash urls to url pathnames 2018-11-17 23:59:41 -05:00
Ben Wheeler
30ed29a39a enable remix button; format remix, see inside button css 2018-11-17 15:13:58 -05:00
chrisgarrity
f2f4a6ac7c 2018 Hour of Code Banners 
* add Top and Middle HoC banners
* banners share styles
* add new assets for banners
* update presentation to check date to determine whether to show the HoC banners.
 2018-11-16 14:02:56 -05:00
Paul Kaplan
16e3fa100b
Merge pull request #2313 from paulkaplan/fix-missing-extensions 
Add missing extensions and images
 2018-11-14 20:31:26 -05:00
Robert Chen
9b7097a772 Resolved issue #2263 2018-11-14 17:06:33 -08:00
chrisgarrity
d2500e88c7
Merge pull request #2302 from chrisgarrity/issue/2281-gettingstarted 
Issue/2281 gettingstarted
 2018-11-14 17:11:46 -05:00
chrisgarrity
7e9403d049
Merge pull request #2291 from chrisgarrity/feature/2280-hoc-2018 
2018 Hour of Code Banners
 2018-11-14 17:10:35 -05:00
chrisgarrity
d24a76e896
Merge pull request #2303 from chrisgarrity/issue/fix-wedolegacy-translations 
Fix wedo-legacy translations
 2018-11-14 17:08:42 -05:00
S. Gallagher
e4be2bd87c make suggested changes 2018-11-14 13:36:21 -08:00
picklesrus
6c7a56dde8
Merge pull request #2220 from picklesrus/credits-stuff 
Redo the credits page.
 2018-11-14 16:32:43 -05:00
Paul Kaplan
194dc90688 Add missing extensions and images 2018-11-14 15:39:40 -05:00
Paul Kaplan
476578cfa8
Merge pull request #2304 from paulkaplan/update-share-endpoint 
Move sharing to special endpoint.
 2018-11-14 14:15:45 -05:00
Paul Kaplan
d36b71dcb3
Merge branch 'develop' into hide-backpack-logged-out 2018-11-14 14:12:51 -05:00
Eric Rosenbaum
9f640ffdd6
Merge pull request #2307 from ericrosenbaum/feature/update-microbit-hex-1.1.0 
Update microbit hex file version
 2018-11-14 13:28:54 -05:00
Benjamin Wheeler
6d09f2dada
Merge pull request #2289 from benjiwheeler/show-creator 
Pass authorId and authorUsername to gui
 2018-11-14 06:43:29 -05:00
Ben Wheeler
4bb5e641bb added comment about falseness of authorId, authorUsername 2018-11-14 06:42:57 -05:00
Eric Rosenbaum
1840c9ec19 Update microbit hex file version 2018-11-13 15:43:14 -05:00
Ben Wheeler
8e967737e5 use production or staging hosts for static assets url 2018-11-13 15:32:59 -05:00
picklesrus
4a66cc2e59 Fix code review comments. Got rid of a bunch of uncessary stuff. 2018-11-13 14:14:24 -05:00
Paul Kaplan
f8d598549d Update instead of replacing project info to match API. 
The API endpoint will return just the updated slice of the projectInfo, so just update the projectInfo instead of replacing.
 2018-11-13 12:23:05 -05:00
Paul Kaplan
3a03f10aff Move sharing to special endpoint. 
This makes a couple of assumptions about the shape of the endpoint:
- Route is /proxy/projects/:id/share.
- Returns the full (updated) project info on success, just like the project update endpoint does.

I reviewed these with colby since this is frontrunning the actual API, but I can update once the API is finalized.
 2018-11-13 08:49:37 -05:00
chrisgarrity
48593869f9 Fix wedo-legacy translations 
The translation generatation script uses the view name from the routes file when generating the translations files. So the route `name:` and `view:` must match.

Symptom: when generating translations there were warnings that there were no translations for `wedo-legacy`.
 2018-11-12 14:07:44 -05:00
chrisgarrity
13b3e57381 open getting started tutorial for logged out users 
- `create` on the navbar opens the getting started tutorial if the user is not logged in
- replaced any other use of `tip_bar=getStarted` with `tutorial=getStarted` (with the exception of Tips page)
- did not replace other uses of `tip_bar=home` as those should probably go to the new tips/ideas page.
 2018-11-12 12:58:59 -05:00
chrisgarrity
062c074407 allow query parameters on the preview route 
Preview needs to be able to handle query parameters for tutorials.
 2018-11-12 10:16:22 -05:00
Ray Schamp
25f7f5b273
Merge pull request #2301 from MasterOfTheTiger/issue/gh2298-job-listing 
Removes Full Stack Job Listing
 2018-11-11 18:26:16 +00:00
MasterOfTheTiger
4677feb371 State that no jobs are currently available 2018-11-11 08:58:55 -08:00
Ben Wheeler
c965fd15f9 generate author thumbnail and pass to gui 2018-11-10 02:07:48 -05:00
MasterOfTheTiger
12aeba90ed Use https for ScratchJR links 2018-11-09 09:17:04 -08:00
Paul Kaplan
9ed3ecc7bb Split up the backpack options and tie visibility to isLoggedIn 2018-11-08 13:19:12 -05:00
Paul Kaplan
c62470150b
Merge pull request #2290 from paulkaplan/project-not-available 
Add "project not available" view for when project body cannot be loaded
 2018-11-08 12:58:37 -05:00
Paul Kaplan
ae05f07e07 Fix project not available flag setting and catch 404 responses 2018-11-08 08:43:36 -05:00
chrisgarrity
a156c404e1 2018 Hour of Code Banners 
* add Top and Middle HoC banners
* banners share styles
* add new assets for banners
* update presentation to check date to determine whether to show the HoC banners.
 2018-11-07 17:14:28 -05:00
Paul Kaplan
315c8b78fc Add "project not available" view for when project body cannot be loaded 
This happens when the project id does not exist, or is not visible to the given user.
 2018-11-07 16:32:12 -05:00
Ben Wheeler
464d5f7c2d Pass authorId and authorUsername to gui 2018-11-07 12:59:16 -05:00
Ray Schamp
e2795ec4d6
Merge pull request #2284 from rschamp/bugfix/offline-homepage 
Avoid displaying an error when /news returns a 500
 2018-11-07 17:57:10 +00:00
Paul Kaplan
80028bfea5
Merge pull request #2288 from paulkaplan/ip-muted-comments 
Add IP Mute message to project comment errors
 2018-11-07 11:47:44 -05:00
Paul Kaplan
4105e88cfd Add IP Mute message to project comment errors 2018-11-07 10:58:07 -05:00
chrisgarrity
b5d551b705 Add new strings in preparation for Hour of Code 2018-11-06 16:15:54 -05:00
Ray Schamp
037078d623 Avoid displaying an error when /news returns a 500 
This situation probably occurs most frequently when running dev servers while offline, but could also happen if the API is having issues. 500 responses from the API should not take down the homepage so drastically, and are also sometimes unavoidable while working offline.
 2018-11-06 12:25:04 +00:00
Andrew Sliwinski
7721418165
Merge pull request #2269 from DeleteThisAcount/patch-1 
Fix typo on micro:bit landing page
 2018-11-05 13:00:19 -05:00
S. Gallagher
24a345cc21 stop using FormattedHTMLMessage 2018-11-04 07:57:48 -08:00
Ben Wheeler
7aae4219ec make share banner appear only if user has the power to share this project 2018-11-01 14:19:28 -04:00
S. Gallagher
3ba4e551d4 migrate scratch 1.4 download page 2018-10-31 16:20:35 -07:00
DeleteThisAcount
ab9004f901
fix small typo 2018-10-31 17:52:16 +01:00
Benjamin Wheeler
e14cb0f8f2
Merge pull request #2250 from benjiwheeler/share-button-icon 
removed erroneous share button icon
 2018-10-30 22:29:19 -04:00
Karishma Chadha
950f13a35a
Merge pull request #2245 from kchadha/cloudhost 
Configure Cloud Host
 2018-10-30 14:26:17 -04:00
Ben Wheeler
78f059e8b4 removed erroneous share button icon 2018-10-29 17:30:53 -04:00
picklesrus
db2453bc69 Replace FormattedHtmlMessage with FormattedMessage 2018-10-29 10:02:43 -04:00
chrisgarrity
b629d28a6d
Merge pull request #2242 from chrisgarrity/issue/2030-gui-layers 
remove obsolete code
 2018-10-29 09:59:50 -04:00
Benjamin Wheeler
183bdccdae
Merge pull request #2223 from sehgalvibhor/develop 
Responsive about page!
 2018-10-29 06:59:56 -04:00
Karishma Chadha
e771e91164 Configure cloud host and pass it as a prop to the gui. 2018-10-29 01:05:36 -04:00
Vibhor Sehgal
93d847271d Travis Fix 2018-10-29 08:08:13 +05:30
chrisgarrity
9dd13dac74 remove obsolete code 
Preview doesn’t need to set a z-index (the first version was trying to overlay gui on top of the project view).
 2018-10-26 15:11:46 -04:00
Paul Kaplan
f2490baa16
Merge pull request #2239 from paulkaplan/fix-comments-id 
Use #comments-id instead of #comment-id for fetching single comments
 2018-10-25 16:56:27 -04:00
Benjamin Wheeler
cff5733833
Merge pull request #2234 from benjiwheeler/isshared 
pass isShared to gui
 2018-10-25 15:57:07 -04:00
Benjamin Wheeler
8653e358b1
Merge pull request #2232 from benjiwheeler/dont-get-extensions 
moved getExtensions out of constructor, and out of projectInfo response
 2018-10-25 15:56:39 -04:00
Paul Kaplan
32f0999bb0 Use #comments-id instead of #comment-id for fetching single comments 2018-10-25 15:53:34 -04:00
Paul Kaplan
e563254c8f
Merge pull request #2231 from paulkaplan/comment-linking 
Decorate comment text to add @username links and scratch-domain links
 2018-10-25 15:18:56 -04:00
Paul Kaplan
f133f29353 Fix form styling for project edit fields 2018-10-25 11:38:27 -04:00
Paul Kaplan
209c8da9f7 Keep each input in its own formsy wrapper to improve performance 
Having Formsy around the entire page was causing re-renders to happen when you typed into an input, when really just that component needed to re-render.
 2018-10-25 10:27:54 -04:00
Vibhor Sehgal
04adcb5063 Retaining Flex Layout 2018-10-25 09:53:28 +08:00
Ben Wheeler
c4de63d93a pass isShared to gui 2018-10-24 18:13:57 -04:00
Paul Kaplan
dbca5a4044
Merge pull request #2226 from LLK/i10n-preview 
Extract strings for localizing the preview page
 2018-10-24 16:00:40 -04:00
Paul Kaplan
fa7c2d5b09
Merge pull request #2230 from paulkaplan/single-comment-mode 
Showing specific comment by url hash on preview
 2018-10-24 15:41:14 -04:00
Ben Wheeler
dd07e46c6a moved getExtensions out of constructor, and out of projectInfo response 2018-10-24 15:38:18 -04:00
Benjamin Wheeler
95dc611d77
Merge pull request #2222 from benjiwheeler/copy-remix 
Set capability flags to be passed to GUI, to support remix and save as copy
 2018-10-24 13:24:40 -04:00
Paul Kaplan
2c5efbda50 Fix scss linting 2018-10-24 11:45:17 -04:00
Paul Kaplan
5158907c5b
Merge pull request #2229 from paulkaplan/sudo-fix-load-more 
Do not rely on total comment number for load more functionality
 2018-10-24 11:42:00 -04:00
Paul Kaplan
9066686c2b Decorate comment text to add @username links and scratch-domain links 2018-10-24 11:25:32 -04:00
Paul Kaplan
faf3f49c50 Fix proptypes 2018-10-24 10:43:21 -04:00
Paul Kaplan
520018ee50 View single thread of comments by URL hash 2018-10-24 10:29:33 -04:00
Paul Kaplan
4d8256e985 Update all preview... l10n strings to project... 2018-10-24 09:35:30 -04:00
Paul Kaplan
ae626d5244 Do not rely on total comment number for load more functionality 
Show the load more comments button any time the last comment page was filled to the requested limit. As noted in the comment, this heuristic will be wrong at most 5% of the time but the failure mode (showing load more which, when clicked doesn't load any more, just goes away) is very mild, and for the overwhelming majority of project views that happen on projects with many, many comments, this is very unlikely to ever be noticed. It obviously isn't a perfect solution, but I cannot think of another that does not need the server to do another query to find out the total number of visible comments, or to find out if there are more comments after the requested offset+limit.
 2018-10-24 09:18:45 -04:00
Paul Kaplan
efb1a380da Update the comment routes 2018-10-24 08:55:36 -04:00
Ben Wheeler
3d964911a1 renamed canSaveAsCopy to canCreateCopy 2018-10-23 17:42:55 -04:00
Ben Wheeler
d713249bee changed the meaning of canCreateNew to true creation 2018-10-23 17:42:55 -04:00
Ben Wheeler
e03f83466e better logic around canSave when project is new 2018-10-23 17:42:55 -04:00
Ben Wheeler
ed7b6541e9 set canRemix and canSaveAsCopy 2018-10-23 17:42:55 -04:00
Paul Kaplan
f4887008a5 Extract strings for localizing the preview page 2018-10-23 11:38:34 -04:00
Vibhor Sehgal
733c3d1bff Responsive about page. 2018-10-23 11:29:44 +08:00
chrisgarrity
3fcc13a8cd Integrate www-gui localization 
* Initialize `locales` in redux using methods exported by GUI.
* pass GUI method to set the `scratchlanguage` cookie

NOTE: It does not reload the page, so switching back to the project page will not reflect language changes made in gui until the next page reload. Reloading the page will lose project state so we don’t want to do that.
 2018-10-22 17:38:35 -04:00
Paul Kaplan
c289ce72d1 Use parent_id and commentee_id the right way when posting comments. 
The parent_id is the top-level-parent, the commentee_id is the user to whom the comment is directed , the one that is mentioned in @ reply.
 2018-10-22 14:35:42 -04:00
picklesrus
d4a050a1c0 Remove duplicate message 2018-10-22 08:57:22 -04:00
picklesrus
ad564b4ea4 Redo the credits page. 
See https://github.com/LLK/scratch-www/issues/2093 for details.
 2018-10-21 14:57:12 -04:00
Benjamin Wheeler
a6409bbcce
Pass to and receive from GUI info about project creation lifecycle; handle url changes (#2197) 
* add canSaveNew prop to pass to GUI

* pass to and receive from GUI info about project lifecycle

* reset project data or fetch new project data depending on updates received from gui

* removed canSaveNew

* projectId always a string

* moved handleUpdateProjectId calls that fetch or set project metadata into componentDidUpdate

* changed page history object

* removed comments

* two small fixes to deal with edge cases

* cleaning up getExtensions
 2018-10-19 16:02:59 -04:00
Paul Kaplan
8acbf05b1a
Merge pull request #2211 from paulkaplan/fix-studio-modal 
Connect the consolidated studio data directly
 2018-10-19 10:44:32 -04:00
chrisgarrity
b0a5f7feff
Merge pull request #2183 from sehgalvibhor/character-fix 
Japanese Character Fix
 2018-10-19 09:12:53 -04:00
Paul Kaplan
f9f662a3f3
Merge pull request #2206 from paulkaplan/staff-comments 
Add * to comments from staff on preview
 2018-10-19 08:55:41 -04:00
apple502j
9cb2c34a1d
Merge branch 'develop' into add-parents 2018-10-19 21:14:57 +09:00
apple502j
43238c4bca
FAQ link fix 2018-10-19 21:13:27 +09:00
Paul Kaplan
35abd285df Connect the consolidated studio data directly 
To the modal to prevent constantly updating. Also only render the modals if they are visible
 2018-10-18 16:45:24 -04:00
Paul Kaplan
f3b9826fd5
Merge pull request #2208 from paulkaplan/fix-load-more 
Use top level + replies count to control "Load More" comments button
 2018-10-18 13:19:10 -04:00
Paul Kaplan
4f6f7502ae
Use scratchteam instead of is_staff 2018-10-18 13:09:43 -04:00
Paul Kaplan
61947f2390
Use scratchteam instead of is_staff 2018-10-18 13:09:08 -04:00
Paul Kaplan
066e5ff141 Use top level + replies count to control "Load More" comments button 
This fixes an issue where a project with one top-level comment and one reply would should the "Load more" button at the bottom, even though there were no more to load
 2018-10-18 11:42:10 -04:00
Paul Kaplan
1d3c3ff431 Use EmojiText component to allow emoji display when API includes them 2018-10-18 10:18:00 -04:00
Paul Kaplan
c257379846 Add * to comments from staff on preview 
This requires the API to include the `is_staff` flag, but it will not change functionality if it is not there, everyone would be considered not staff, which is the current behavior.
 2018-10-18 10:14:42 -04:00
Paul Kaplan
d982d2d723 Show the username of the person being replied to in a comment on preview 2018-10-18 10:11:51 -04:00
Paul Kaplan
312a9e2bff Restrict reporting comments to logged in users 2018-10-17 13:19:46 -04:00
Paul Kaplan
7b514344fa Allow admins access to comment delete 2018-10-17 13:16:41 -04:00
Paul Kaplan
242f01118b Add missing status message for comments 2018-10-17 11:56:43 -04:00
Ray Schamp
cd0fb08045 Change conditional rendering to be consistent 2018-10-17 11:21:52 -04:00
Paul Kaplan
2ac90315ea Use can prefix instead of undefined callback 2018-10-16 15:09:10 -04:00
Paul Kaplan
1965a1223d Fix sass lint 2018-10-16 15:08:01 -04:00
Paul Kaplan
7772e197c7 Make comment deleting and restoring correctly update replies 2018-10-16 15:08:01 -04:00
Paul Kaplan
592c0e5703 Add restore functionality to comments for admins 2018-10-16 15:08:00 -04:00
Paul Kaplan
b0ac4018ee Use admin routes to include all comments when loading page 2018-10-16 15:08:00 -04:00
Paul Kaplan
b7b7b079b9 Combine comment reported and deleted flags into visibility string 
To prepare for server including visibility
 2018-10-16 15:08:00 -04:00
sjgllghr
6d8235c7e8 Fix gh-2156: Use variables for media queries for consistency (#2182) 
* use variables for media queries

* add medium-and-intermediate media query variable
 2018-10-16 13:28:41 -04:00
Paul Kaplan
effbfbeaff
Merge pull request #2196 from paulkaplan/share-banner 
Make share banner work on preview
 2018-10-16 13:21:16 -04:00
Paul Kaplan
9ce79deac6 Control visibility externally and fix css 2018-10-16 13:02:22 -04:00
Paul Kaplan
21a7f1227e Make share banner actually share projects 2018-10-16 11:38:26 -04:00
Benjamin Wheeler
4124e26588
set explicit capabilities like “can____” for GUI and project page (#2187) 
* set explicit capabilities like “can____” for GUI and project page

* set canShare to proper value instead of hardcoding it

* don't tell gui canReport
 2018-10-16 10:49:35 -04:00
Paul Kaplan
29a6a27f46
Merge pull request #2173 from paulkaplan/comment-i10n 
Localize all the comment related strings
 2018-10-16 10:04:06 -04:00
Paul Kaplan
bb71bd706a
Merge pull request #2190 from paulkaplan/move-report-to-api 
Use the proper API route for reporting projects
 2018-10-16 10:03:43 -04:00
Paul Kaplan
95d088f56a
Merge pull request #2191 from paulkaplan/fix-delete-comment 
Fix comment delete endpoint
 2018-10-16 10:03:26 -04:00
Benjamin Wheeler
9106a14340
made account menu have min-width, changed max-width to rem from px (#2181) 2018-10-15 16:00:47 -04:00
Paul Kaplan
cef36682fd Fix comment delete endpoint 2018-10-15 15:24:20 -04:00
Paul Kaplan
85f13935b3 Use the proper API route for reporting projects 2018-10-15 11:17:40 -04:00
Robert Chen
24d07f6139 Fix gh-2160: Search with % (#2161) 
* Fixed turning '+' into ' '

* Fixed issue 2160

* Added space before '{'
 2018-10-15 09:36:05 -04:00
apple502j
ec1d46eef6 Parents Page fix 2018-10-15 19:51:57 +09:00
apple502j
4845b5af3e l10n 2018-10-15 19:51:46 +09:00
Vibhor Sehgal
1ae8180aa4 Fix Select Menu in Messages Section (#2179) 
* Fix width for Select in Message Section

* Removed extra CSS property

* Removed Margin property; Not required

* Fix for the CI test
 2018-10-15 06:48:29 -04:00
apple502j
972ae72a61 Parents Page SCSS 2018-10-15 18:18:04 +09:00
apple502j
1481bba310 Parents Page! 2018-10-15 18:17:43 +09:00
apple502j
7bf2c6d7e3 l10n 2018-10-15 18:17:31 +09:00
apple502j
38c85f559d Routes config 2018-10-15 18:16:17 +09:00
Vibhor Sehgal
56f7cf06ea Thumbnail Fix 2018-10-14 14:54:11 +05:30
Vibhor Sehgal
d9018185e7 Japanese Character Fix 2018-10-14 13:28:48 +05:30
Paul Kaplan
231e9c6d89 Internationalize strings in compose-comment 2018-10-12 09:16:27 -04:00
Paul Kaplan
9e1741f883
Merge pull request #2174 from paulkaplan/fix-comment-replying 
Prevent replying when comments are turned off
 2018-10-12 09:11:34 -04:00
Benjamin Wheeler
d5343dfb01
fix ReactModal bodyOpenClassName error so that it is entirely omitted, rather than passing null value (#2176) 2018-10-11 16:58:30 -04:00
Paul Kaplan
600ba29933 Prevent replying when comments are turned off 2018-10-11 11:54:58 -04:00
Paul Kaplan
1f8342b987
Merge pull request #2164 from paulkaplan/comment-report-delete 
Comment report action and modal flow for deleting
 2018-10-11 11:08:07 -04:00
Paul Kaplan
57408e46af Fix scss name order 2018-10-10 15:29:30 -04:00
Paul Kaplan
086012f802 Add comment toggling 2018-10-10 15:14:53 -04:00
Benjamin Wheeler
8b222f0466
fix base modal prop passed to ReactModal (#2165) 2018-10-10 14:08:59 -04:00
Paul Kaplan
c535f8e731 Update report route to match newest API update 2018-10-10 14:01:14 -04:00
Paul Kaplan
6b4e0595d0 Use gray for deleted, red for reported 2018-10-10 11:25:16 -04:00
Paul Kaplan
c19adee84a Fix internationalization 2018-10-10 11:15:09 -04:00
Paul Kaplan
237c6ecb55 Add parens for clarity 2018-10-10 09:17:18 -04:00
Paul Kaplan
997d0b5694 Fix css for report and delete comment styles 2018-10-10 09:13:21 -04:00
Paul Kaplan
ce84dddc34 Fix proptype warning for project id 2018-10-09 11:38:34 -04:00
Paul Kaplan
bdde34ba26 Implement report action with modal flow 2018-10-09 11:38:24 -04:00
chrisgarrity
32aa3e66d4
Merge pull request #2153 from LiFaytheGoblin/2133/move-media-queries-to-frameless 
Move media queries used in responsive project page to frameless
 2018-10-09 10:56:11 -04:00
chrisgarrity
47f71c2758 Fix confict resolution error 
I missed one of the changes when resolving conflicts.
 2018-10-09 10:24:02 -04:00
Paul Kaplan
c622d52396 Pass the topLevelCommentId to make sure nested comment deleting works 2018-10-09 10:16:35 -04:00
Paul Kaplan
e29caceb6b
Merge pull request #2150 from paulkaplan/new-comment 
Add comments to projects and replies to comments
 2018-10-09 10:02:17 -04:00
Benjamin Wheeler
341428ce50
storage.js can use PROJECT_HOST env setting (#2146) 2018-10-09 09:59:04 -04:00
Paul Kaplan
58ab51a629 Add messages for other rejected comment reasons 2018-10-09 09:36:42 -04:00
Paul Kaplan
9b122470f5 Fix formatting from review comments 2018-10-09 09:36:42 -04:00
Paul Kaplan
24fe4fef65 Use topLevelCommentId to simplify adding and deleting comments 
This fixes the nested comment deletion problem: https://github.com/LLK/scratch-www/issues/2151
 2018-10-09 09:36:41 -04:00
Paul Kaplan
744c90501e Add comments to projects and replies to comments 2018-10-09 09:36:41 -04:00
chrisgarrity
7af2c8a80a
Merge branch 'develop' into 2133/move-media-queries-to-frameless 2018-10-09 09:12:58 -04:00
Ray Schamp
ab08aa4281
Merge pull request #2152 from LiFaytheGoblin/2133/subactions-share-date-as-prop 
[new project page] share date is passed as a prop to subactions component
 2018-10-08 21:35:38 +01:00
Ray Schamp
3f5f224a76
Merge pull request #2107 from LiFaytheGoblin/responsive-project-page/container-width 
Make container smaller for mobile to allow for space left and right
 2018-10-08 18:13:40 +01:00
Linda
14741e1cb8 if the report or add to studio modals are open, don't switch to fulls… (#2145) 
* if the report or add to studio modals are open, don't switch to fullscreen on orientationchange landscape

* fix linting errors
 2018-10-05 18:00:52 -04:00
Linda
d358c45482 media queries used in responsive project page have been moved to frameless.css 2018-10-05 10:25:56 -04:00
Linda
8db5216f17 share date is passed as a prop to subactions 2018-10-05 09:15:09 -04:00
Linda
bf3977821a fixed linting errors 2018-10-04 10:51:26 -04:00
Linda
ad1531aff3 fixes to spacing around page content and a few other fixes 2018-10-04 10:41:10 -04:00
Linda
502ead072f Merge branch 'develop' into responsive-project-page/container-width 2018-10-04 10:25:48 -04:00
Linda
79afc55f26
Merge pull request #2108 from LiFaytheGoblin/responsive-project-page/modals 
Make modals responsive
 2018-10-04 10:23:35 -04:00
Linda
8476cd3152 solution from before was not working if combined with current develop branch 2018-10-04 09:47:28 -04:00
Paul Kaplan
24e1c92b74
Merge pull request #2141 from paulkaplan/comment-delete 
Add comment deleting for project owners on preview
 2018-10-03 16:26:50 -04:00
Linda
27d7a3bf59
Merge pull request #2135 from LiFaytheGoblin/responsive-project-page/header 
Make header of new project page look good on mobile
 2018-10-03 15:41:03 -04:00
Linda
1aa30fb10b
Merge pull request #2136 from LiFaytheGoblin/responsive-project-page/see-inside-remix-buttons 
New project page: See inside and remix buttons disappear on mobile
 2018-10-03 15:40:47 -04:00
Paul Kaplan
a3f1ccc132 Fix sass-lint 2018-10-03 14:00:56 -04:00
Paul Kaplan
24b456873b Add comment deleting for project owners 2018-10-03 13:31:54 -04:00
Linda
fc57218066 fix linting errors 2018-10-03 11:12:56 -04:00
Linda
a3df002b49 resolve mergin issues 2018-10-03 11:03:18 -04:00
Linda
437334b872 resolve merging conflicts 2018-10-03 10:54:53 -04:00
Linda
193a4ac70a
Merge branch 'develop' into responsive-project-page/see-inside-remix-buttons 2018-10-03 10:45:10 -04:00
Linda
38b8e2e97e on mobile, remix credit is still a flex row 2018-10-03 10:32:12 -04:00
Linda
f11d338d65 text gets vertically centered 2018-10-03 10:29:45 -04:00
Linda
57e147e110 remove commented out css 2018-10-03 10:09:44 -04:00
Linda
8009978c06 fixed linting errors 2018-10-03 10:09:44 -04:00
Linda
6f5b5c3278 extract css for new components and make some fixes to validation in report modal 2018-10-03 10:09:44 -04:00
Linda
5832969912 fixed linting errors 2018-10-03 10:09:44 -04:00
Linda
0895719f36 subactions getting own component 2018-10-03 10:09:44 -04:00
Linda
d85ca5d755 subactions getting their own component 2018-10-03 10:05:21 -04:00
Linda
b4a4ded822 share date positioning on small screens 2018-10-03 09:59:15 -04:00
Linda
8b10f3cba4 made project stats and action buttons responsive 2018-10-03 09:58:01 -04:00
Linda
2408568dda Merge branch 'develop' into responsive-project-page/see-inside-remix-buttons 2018-10-02 17:03:18 -04:00
Linda
a525e09cf6 Merge branch 'develop' into responsive-project-page/header 2018-10-02 16:59:01 -04:00
Linda
d0257ae43d
Merge pull request #2105 from LiFaytheGoblin/responsive-project-page/landscape-player 
If in landscape format on mobile, switch to fullscreen mode
 2018-10-02 16:38:57 -04:00
Linda
f55dd02665 never mind screen.orientation 2018-10-02 15:42:29 -04:00
Linda
06bb9c60c4 fixed problem where sometimes there would be two scrollbars 2018-10-02 15:33:15 -04:00
Linda
b03bd51f79 fixed linting error 2018-10-02 13:57:41 -04:00
Linda
7c8fdbfcc3 fixed height of studio buttons scrolling container to fill all modal 2018-10-02 13:49:56 -04:00
Linda
a0b190aa87
Merge pull request #2118 from LiFaytheGoblin/responsive-project-page/notes-section 
Made project notes look better on mobile
 2018-10-01 19:30:36 -04:00
Linda
3432d95cdb
Merge pull request #2117 from LiFaytheGoblin/responsive-project-page/comments 
Made comments look better on mobile
 2018-10-01 19:30:25 -04:00
Linda
ef1b7d8f9f checking for landscape browser proof 2018-10-01 16:58:05 -04:00
Linda
d5641daae6 improve solution for spacing in container and used desktop variable instead of hardcoded value 2018-10-01 13:56:11 -04:00
Linda
f1738ca384 improved the code stylewise 2018-10-01 09:52:50 -04:00
Linda
3010db684d
Merge pull request #2116 from LiFaytheGoblin/responsive-project-page/thumbnailcolumns 
Thumbnailcolumns appear at bottom on mobile
 2018-09-28 13:57:24 -04:00
Linda
ec067778f2
Merge pull request #2099 from LiFaytheGoblin/2067/project-page/comments-fade-out-safari 
Made comments fade out look nice in Safari too
 2018-09-28 13:57:11 -04:00
Ray Schamp
5278e77e0c
Merge pull request #2098 from chen-robert/gh1930-teacher-register-year 
Fix gh-1930: Teacher registration dates
 2018-09-28 10:58:26 -04:00
Linda
50c7eb9bfd added todo 2018-09-27 10:31:32 -04:00
Ray Schamp
1ad9a95a3d Add placeholder share handler 
Having the `onShare` prop defined to a function enables the button in the GUI
 2018-09-26 21:42:44 -04:00
Linda
e014906125 linting fixes 2018-09-26 17:26:19 -04:00
Linda
3d67488b29
Merge pull request #2106 from LiFaytheGoblin/responsive-project-page/extension-buttons 
Extension buttons are responsive
 2018-09-26 17:19:38 -04:00
Linda
fa049d79fc
Merge pull request #2112 from LiFaytheGoblin/2104/remove-mod-pos-from-jobs 
Removed moderator position from jobs page
 2018-09-26 17:19:14 -04:00
Linda
32ab0202bc made project notes look better on mobile 2018-09-26 17:16:17 -04:00
Linda
b5a49e6cf2 linting fixes 2018-09-26 16:45:42 -04:00
Linda
c18a073e17 some fixes 2018-09-26 16:39:37 -04:00
Linda
532e201f53 made comments roughly responsive 2018-09-26 16:36:48 -04:00
Linda
cc57d0f206 removed stuff that doesn't belong into this pr 2018-09-26 15:01:25 -04:00
Linda
4f3d77f42a some fixes and adapted remix and studio thumbnails 2018-09-26 14:55:17 -04:00
Linda
a4e7ee35e4 adapted show and remix button to mobile 2018-09-26 14:54:33 -04:00
Linda
4299afaec5 fixes to warning and thumbnailcolumns for mobile WIP 2018-09-26 14:35:36 -04:00
Robert Chen
a94b9d6c84 Fix gh-1934: Search bar special chars (#2075) 
* Fixed Issue 1934

The text was encoded once already by the search bar. That means we need to decode it twice in order to decode special characters.

* Rewrote search query parsing
 2018-09-26 14:16:56 -04:00
Linda
7465c2e85a removed sth that isn't part of the title issue 2018-09-26 12:02:00 -04:00
Linda
6445c7471e some fixes and adapted remix and studio thumbnails 2018-09-26 11:52:32 -04:00
Linda
6b2ddcd217 adapted title area for mobile 2018-09-26 11:48:29 -04:00
Linda
89aaaab4d3 removed moderator position from jobs page 2018-09-26 10:24:53 -04:00
Linda
35194803b4 fixed linting errors 2018-09-25 16:06:46 -04:00
Linda
a5d2ee18ef fixed validation message for modals 2018-09-25 15:58:10 -04:00
Linda
d061e2afe9 improve responsiveness for project page modals and also clean up the modals a bit 2018-09-25 15:40:27 -04:00
Linda
55cdeea04d wip refactored and responsive project page modals 2018-09-25 15:37:52 -04:00
Linda
f1c6f6c223 fixed linting errors 2018-09-25 15:31:31 -04:00
Linda
4983fb3f8c solution for container size for screen size between tablet and 942 according to design 2018-09-25 15:21:26 -04:00
Linda
51bb905381 extensions appear on correct place depending on media query 2018-09-25 15:04:31 -04:00
Linda
d066e73b91 extensions buttons made responsive 2018-09-25 14:49:37 -04:00
Linda
56f1b80f24 if in landscape format on mobile, switch to fullscreen mode 2018-09-25 14:36:34 -04:00
Benjamin Wheeler
eb9abd23a0
fixed errors in splash page that appear in develop (#2077) 2018-09-25 00:52:23 -04:00
Benjamin Wheeler
935eb0b15f
move login/registration functions and view state to session reducer, pass to gui (#2078) 
* move login/registration functions and view state to session reducer, pass to gui

* navigation reducer handles login; gui passed renderLogin function

* put back in join class to make smoke tests keep working
 2018-09-24 11:04:30 -04:00
Linda
a160180245 added transparent for ui primary for cross browser support to colors css 2018-09-21 13:26:49 -04:00
Linda
c047612d68
Merge pull request #2083 from LiFaytheGoblin/2082/project-page/project-notes-alignment 
Fix notfications box, player box, buttons and icons alignments
 2018-09-21 10:03:58 -04:00
Linda
0d894e3208 convention of writing hsl is with percentages 2018-09-21 09:57:49 -04:00
Linda
8bc158118e fixed color gradiant display in Safari 2018-09-21 09:53:58 -04:00
Robert Chen
86551baa94 Fixed Issue 1930 2018-09-20 22:15:24 -07:00
Linda
f721c9591a Ok, css that doesn't work in all browsers is not an option... 2018-09-20 10:33:00 -04:00
Linda
c9b2306827 removed some stuff that is not needed anymore 2018-09-19 16:17:14 -04:00
Linda
a9872a14ff fixed problem that occured with remix credits 2018-09-19 15:03:20 -04:00
Linda
d0d7bba70e
Merge pull request #2079 from LiFaytheGoblin/2065/title-too-long-warning 
Implemented design for title-too-long-warning
 2018-09-18 13:20:13 -04:00
Linda
42f0ed16e5
Merge pull request #2073 from LiFaytheGoblin/2005/animate-add-to-studio-buttons 
Animate add-to-studio-buttons on preview project page
 2018-09-14 12:28:44 -04:00
Linda
0a50c1fb34 align notes box and player box on same y pos and align buttons and icons below notifications and player at same y pos 2018-09-13 14:58:00 -04:00
Linda
497aae2a3c convention fixes 2018-09-13 11:04:14 -04:00
Linda
35558bfdba fixed linking problems 2018-09-13 10:49:59 -04:00