Commit graph

587 commits

Author SHA1 Message Date
Chris Garrity
501147060d Update generic message copy
Updated copy requres two paragraphs in the content. Modified the inputs to pass a content array and output one paragraph per item.
2020-12-11 09:52:30 -05:00
Chris Garrity
929e670d8f Internationalize the mute messages
Add formatted messages for comment status and mute modal
2020-12-11 08:44:17 -05:00
picklesrus
110077e8e8 Rename state's muteExpiresAt to muteExpiresAtMs so units are explicit.
Also, fix isMuted so it doesn't do an extra unit conversion.
2020-12-11 08:14:15 -05:00
picklesrus
2d5e9a6378 Fix merge conflicts and set default object for mute_status if props do not exist. 2020-12-08 08:00:01 -05:00
picklesrus
835a271be4 Show the comment status box on project page loads if the user is muted.
Don't show the compose box if they're muted, but do show it, but greyed 
out, if they just posted a comment that resulted in a mute.
2020-12-08 07:28:40 -05:00
picklesrus
f4f6b70f2e
Merge branch 'develop' into readable-time 2020-12-07 16:05:02 -05:00
picklesrus
b450d36a64 Redo time based on new requirements. 2020-11-30 16:16:52 -05:00
picklesrus
71521e2aa5 Fix lint and update text. 2020-11-18 14:48:15 -05:00
picklesrus
fe9d9078b2 Fix styling of disabled comment box. 2020-11-18 14:40:11 -05:00
picklesrus
aed0f024c0 Disable comment box functionality when you've just been muted.
Also, keep showing the blue comment status box based on when the mute 
expires rather than basing it on the status of the commet box itself.

TODO: css for disabled state.  The grey is there as a placeholder/proof 
of concept.
2020-11-17 17:04:54 -05:00
picklesrus
0470e0e56b Convert timestamp to always show in minutes.
This is minor step towards correct time formatting. More coming later.
2020-11-13 15:03:49 -05:00
picklesrus
6eb7504442 Initial time formatting pass. Does integer minutes, hours, days.
TODOS:
- set langauge appropriately
- do partial hours and days. e.g. 1 hour 5 minutes instead of just 1
hour.

Add a time formatting utility that formats a relative time in the future.
Use it in the mute modal & comment box.
2020-11-13 08:26:54 -05:00
picklesrus
e5f97d1f18 Skeleton of code to show mute modal and comment status.
Still todo:
- l10n
- Time needs formatting
- Compose box needs to be shown/formatted correctly based on mute status
- Blue comment status box need to be sticky
2020-11-09 11:01:42 -05:00
Maxi-Mouse
6120339d26 Fix Load more scrolling 2020-10-01 20:17:27 +02:00
Benjamin Wheeler
9460ccf982
Merge pull request #3799 from apple502j/fix-meta-without-login
Fix editor title when not logged in
2020-07-09 20:42:08 -04:00
Ben Wheeler
e46737cbc6 add overflow settings to css for remix credit 2020-07-08 15:55:02 -04:00
Ben Wheeler
374af98b3c revert guiPlayer switch to max-width 2020-06-26 15:25:10 -04:00
Ben Wheeler
3527e42529 use overflow auto in different place 2020-06-26 15:11:08 -04:00
Benjamin Wheeler
77494f0370
Merge pull request #2518 from benjiwheeler/small-player-project-page
Fix page width by hiding overflow, letting stage width be flexible
2020-06-08 16:50:37 -04:00
apple502j
93f9eaf718 Fix editor title when not logged in 2020-04-11 01:30:29 +09:00
Ben Wheeler
7655a08d7e improve breaking of long words 2020-03-31 22:08:13 -04:00
Paul Kaplan
e43cb7ab4e Reorder and de-red report action on project page 2020-03-03 08:56:25 -05:00
Chris Garrity
c95d087289 Ensure that the old scratchlanguage cookie is removed if it exists.
On init, remove the old cookie if it exists.
On the project page, make sure `handleSetLanguage` also sets the domain.
2020-01-29 16:11:58 -05:00
Ben Wheeler
be0617f69a use max-width to constrain player size 2019-12-30 22:13:03 -05:00
Ben Wheeler
b2d54da8ec Fix page width by hiding overflow, calculating 2019-12-30 21:46:38 -05:00
Ben Wheeler
ea1fea8b3d remove work-break: break-word, which is deprecated 2019-12-18 11:32:00 -05:00
Ben Wheeler
5ce878abbb added overflow-wrap 2019-12-17 12:18:16 -05:00
Ben Wheeler
325caf9424 break word in project description 2019-12-11 23:54:20 -05:00
picklesrus
73addf562f Hack to work around replication lag problems on project creation. This makes sure api can get the project before considering the project create to be complete. We ought to refactor gui and www so that we can use the project data we get back from the project create instead. 2019-11-22 12:15:44 -05:00
Ben Wheeler
226134bc81 renamed ErrorBoundary prop name to componentName 2019-10-11 17:17:50 -04:00
Ben Wheeler
91a05d636f redo sentry tag key and values, move ErrorBoundary around embed 2019-10-10 13:15:35 -04:00
Ben Wheeler
54f30fc944 set errorboundary name tag everywhere ErrorBoundary is used 2019-10-09 22:30:59 -04:00
Benjamin Wheeler
18fd960a6a
Merge pull request #3377 from benjiwheeler/embed-view
embed view with minimal functionality, route
2019-10-02 17:32:45 -04:00
Ben Wheeler
f9b436182b Revert "removing Page"
This reverts commit 06124331cc.
2019-10-01 18:21:14 -04:00
Ben Wheeler
06124331cc removing Page 2019-10-01 00:46:32 -04:00
Ben Wheeler
309e5a77e1 try adding Page to make build succeed 2019-09-30 23:57:11 -04:00
Ben Wheeler
60ad7e5125 removed unnecessary return statement 2019-09-30 10:56:42 -04:00
Ben Wheeler
6772dc3b6d refactor project view and embed view to not use shared hoc 2019-09-30 10:49:19 -04:00
Ben Wheeler
10e6685a15 remove console.log statements 2019-09-30 10:07:18 -04:00
Ben Wheeler
afb7957d04 moved Sentry init into ProjectViewHOC wrapper’s code 2019-09-30 10:06:33 -04:00
Ben Wheeler
df95f4f116 refactored getProjectData back into only project-view 2019-09-30 10:06:06 -04:00
Ben Wheeler
ae591857a4 removed unnecessary React.Fragment 2019-09-30 10:04:44 -04:00
Ben Wheeler
a2e045f8ef removed extra sentry init 2019-09-28 13:59:43 -04:00
Ben Wheeler
01a273b1f8 refactored project view and embed view to use hoc 2019-09-28 10:19:06 -04:00
Ben Wheeler
ca4a4bcbb3 added project view hoc, not hooked up yes 2019-09-28 10:18:19 -04:00
Ray Schamp
638b4dca5c
Merge pull request #3388 from LLK/hotfix/zalgo
[Develop] Contain zalgo text
2019-09-23 10:55:54 -04:00
rschamp
cc61683fa3 Contain zalgo text 2019-09-23 10:11:05 -04:00
Paul Kaplan
bbbe0f8836
Fix linter issues with prop ordering 2019-09-20 13:48:08 -04:00
Paul Kaplan
aa6e85d863
Include canonical link in project meta tags
This will tell crawlers that this page and all its exact duplicates (/fullscreen, /editor, /embed, etc...) should be considered the same and use the project page as the canonical crawled page. We had an issue before where by not selected a canonical, google was considering all the project pages duplicates :(
2019-09-20 08:59:26 -04:00
Ben Wheeler
775173661f embed view with minimal functionality, route 2019-09-19 18:06:52 -04:00
Ben Wheeler
37c2112a3e remove redundant use of redux registrationOpen 2019-08-26 14:19:08 -04:00
Ben Wheeler
4146a7a308 Move flag that controls which join flow we use to redux 2019-08-23 17:30:38 -04:00
Ben Wheeler
3ac1ef34ae Able to use scratch3 join flow in editor 2019-08-23 17:18:14 -04:00
Paul Kaplan
3467e96f1d Allow admins to delete comments without confirmation 2019-08-12 15:08:42 -04:00
Paul Kaplan
c2c165d6f2
Fix click not working on highlighted comment avatar
The absolutely positioned :before highlight was eating clicks from the relatively positioned elements after it, like the avatar image. Disable pointer events to prevent this background element from receiving clicks.

This is due to a subtle issue with element ordering, even elements that are before other elements get automatically promoted above siblings that are relatively positioned. That is why the reply/delete buttons still work on highlighted comments (they are also absolutely positioned) but the avatar user link did not work.
2019-08-08 16:01:41 -04:00
Paul Kaplan
706ba78879 Fix project thumbnails for reporting 2019-08-05 16:25:41 -04:00
Ben Wheeler
9b3c555078 provide key to comments 2019-07-22 21:54:45 -04:00
Ben Wheeler
2602a06fdc fix see all comments and load more replies, by passing author username 2019-06-27 11:29:29 -04:00
Ben Wheeler
43d1f23b44 pass owner username to comment endpoints 2019-06-20 15:06:24 -04:00
Benjamin Wheeler
4fe1bd907e
Merge pull request #2925 from benjiwheeler/retry-studios-for-project-endpoint
change studios for project API request to use admin status, owner status and token
2019-06-03 14:24:34 -04:00
Benjamin Wheeler
c16cb25df9
Merge pull request #3014 from benjiwheeler/fix-safari-remix-credit
set min-height of remix credit to max-content
2019-05-29 14:43:11 -04:00
Ben Wheeler
5a24e9d7d6 change studios for project API request to use admin status, owner status and token 2019-05-28 15:11:21 -04:00
Ben Wheeler
4f7791032c set min-height of remix credit to max-content 2019-05-25 10:08:39 -04:00
Ben Wheeler
6d8441dd03 fix firefox instructions height overflow issue 2019-05-25 09:37:54 -04:00
Ben Wheeler
c40422606f fix last instructions notes and credits alignment 2019-05-22 12:30:05 -04:00
Benjamin Wheeler
1af1eec9c0
Merge pull request #2973 from benjiwheeler/align-remix-credit
fix alignment of remix credit avatar, text
2019-05-22 10:21:18 -04:00
Ben Wheeler
69eca8ed49 defined player-header and redefined player-height to make project notes correct height 2019-05-21 23:37:10 -04:00
Ben Wheeler
1cb4bb5f7e adjust instructions column padding-top 2019-05-21 00:22:37 -04:00
Paul Kaplan
109549fd8f
Merge pull request #2957 from LLK/release/05-08-2019
[DEVELOP] Release 05/08/2019
2019-05-16 08:54:35 -04:00
Ben Wheeler
9afe46622b added comments about form height 2019-05-15 18:08:25 -04:00
Ben Wheeler
974203d325 fix alignment of remix credit avatar, text 2019-05-15 18:00:31 -04:00
Ben Wheeler
ec6f4c1715 for admins, handle markedbyfilter comments differently, color them yellow 2019-05-13 13:09:27 -04:00
Ben Wheeler
7562b16d8a only show copy link button if project is shared 2019-05-09 13:46:56 -04:00
Ben Wheeler
4ef73525c4 Revised modal title to Copy Link, use orig icon 2019-05-08 14:36:00 -04:00
Ben Wheeler
6a3110e24e moved and renamed linkUrl to keep url generation in one place 2019-05-06 18:49:57 -04:00
Ben Wheeler
d5e2ed69ad refined colors 2019-05-06 16:22:41 -04:00
Ben Wheeler
08f8e1c546 simplified embed modal to remove social links 2019-05-02 17:18:13 -04:00
Ben Wheeler
fdfa61649f removed copy link button on project page 2019-04-26 16:11:53 -04:00
Ben Wheeler
9622933ac7 fixed tests 2019-04-26 15:50:25 -04:00
Ben Wheeler
67e7a54413 renamed externalShare to social 2019-04-24 12:09:44 -04:00
Ben Wheeler
5d12f0f781 put social links section, copy project link button inside social share modal 2019-04-22 22:36:26 -04:00
Ben Wheeler
1e63b51565 first take on embed modal 2019-04-22 14:50:49 -04:00
Ben Wheeler
9587de480c first attempt at external share modal 2019-04-18 11:29:00 -04:00
Ben Wheeler
c3002be4a6 Revert "Merge pull request #2858 from benjiwheeler/studios-for-project-endpoint"
This reverts commit a3902acfd1, reversing
changes made to 9e7a14cb76.
2019-04-04 15:04:46 -04:00
Ben Wheeler
8d38d7d4e5 Revert "Merge pull request #2859 from benjiwheeler/comments-for-project-endpoint"
This reverts commit 07417846a9, reversing
changes made to 32484656ba.
2019-04-04 15:04:36 -04:00
Ben Wheeler
163741f34e add ownerUsername to comment API endpoint URIs; handle error responses from those endpoints 2019-03-25 13:40:12 -04:00
Ben Wheeler
49df9a6386 split admin and non-admin project studios endpoints 2019-03-23 10:03:51 -04:00
Ben Wheeler
4a20a09f52 change studios for project endpoint to include owner, token 2019-03-21 21:11:14 -04:00
Paul Kaplan
4e8ea5c3bd Get thumbnails from the project for reporting 2019-02-15 14:27:36 -05:00
Benjamin Wheeler
6ed66a7321
Merge pull request #2767 from benjiwheeler/autocensored-message
show autocensored message if API indicates project was autocensored
2019-02-12 10:31:41 -05:00
Ben Wheeler
902367ef05 show autocensored message if API indicates project was autocensored 2019-02-11 13:00:35 -05:00
Paul Kaplan
c6961aae36 Do not try to manage fullscreen mode URI for unsaved projects
This fixes the issue where you could go from /projects/editor => /projects/0/fullscreen by entering fullscreen mode on a new unsaved project.
2019-02-11 10:28:44 -05:00
Ben Wheeler
7aa1ba6c42 use slider toggle for turning comments on and off 2019-02-01 17:03:43 -05:00
Ben Wheeler
bf8dd81ce9 comment form buttons should stay in row in mobile 2019-01-30 11:52:53 -05:00
Ben Wheeler
1a39d82fbf reenable commenting on mobile, which was disabled in #2512 2019-01-30 09:56:04 -05:00
Benjamin Wheeler
f5134483a3
Merge pull request #2676 from apple502j/patch-8
Make internal URL clickable
2019-01-29 23:28:25 -05:00
Ben Wheeler
a8d4184b3f renamed frameless.js tablet var to mobileIntermediate, use tabletPortrait for breaks 2019-01-29 10:35:19 -05:00
Ben Wheeler
4b660b0176 constrain studio and remix thumbnails to a single column 2019-01-28 23:12:43 -05:00
Ben Wheeler
640d565207 made extension chip showing/hiding consistent 2019-01-28 23:12:36 -05:00
Ben Wheeler
7b19878d7f changed tablet width to 768; several responsive tweaks 2019-01-28 22:27:01 -05:00