caseymm
be9175aa64
misc timeline fixes
2021-10-18 14:00:11 -07:00
caseymm
0ed82b35c8
video buttons
2021-10-18 13:32:00 -07:00
Sarah Otts
e0a5ae5c68
Merge pull request #5884 from jeffalo/dont-search-empty-strings
...
Prevent searches for empty strings
2021-10-18 16:16:15 -04:00
caseymm
754510832c
fix some avatars
2021-10-18 11:36:31 -07:00
caseymm
af0454a747
clean out some css
2021-10-18 11:08:35 -07:00
caseymm
cb67a918d2
force autoplay on videos
2021-10-18 10:15:32 -07:00
rschamp
5d14efd9a0
Add remaining supported locales to intl-polyfill
2021-10-18 11:38:43 -04:00
caseymm
83760a522e
tutorial lines and tile links
2021-10-15 16:39:06 -07:00
caseymm
95b7d13d08
update people.json
2021-10-15 14:45:02 -07:00
caseymm
520bf41968
fix linting
2021-10-15 12:47:58 -07:00
caseymm
7160befa55
update map
2021-10-15 12:06:10 -07:00
caseymm
498b35a945
fix npm
2021-10-14 18:09:01 -07:00
caseymm
feebe8e486
more content for supporters
2021-10-14 16:43:48 -07:00
caseymm
220266d973
finish community content minus links
2021-10-14 11:24:02 -07:00
caseymm
a56631c267
bg images for year in review
2021-10-14 10:28:05 -07:00
caseymm
6366cbd4b2
spacing and bottom wave
2021-10-13 17:03:28 -07:00
caseymm
7d4621576f
year in review cards
2021-10-13 16:33:51 -07:00
caseymm
41ada2ce94
community section content
2021-10-13 13:50:21 -07:00
seotts
c25059bb4b
Redirect 3faq to /faq, not /info/faq
2021-10-13 15:35:22 -04:00
caseymm
6f1688d399
embed some projects
2021-10-13 10:55:29 -07:00
seotts
df46afbcf5
Add code of ethics page
2021-10-13 13:42:20 -04:00
caseymm
ac467b3cab
start community section
2021-10-12 17:38:23 -07:00
caseymm
bd4892da4a
get community header in
2021-10-12 15:55:30 -07:00
caseymm
19e65e9f0e
items in for adapation
2021-10-12 15:39:52 -07:00
Sarah Otts
c30252a4ed
Merge pull request #5882 from apple502j/move-faq-url
...
Move FAQ page to /faq
2021-10-12 16:34:41 -04:00
caseymm
2d86753907
more adaptation
2021-10-12 12:01:21 -07:00
Sarah Otts
6418bd95f0
Merge pull request #6057 from itta611/patch-1
...
Fix padding under grayed out comment compose box on studios after becoming muted
2021-10-12 09:04:01 -04:00
Itta
58dc901e0d
Update src/views/preview/comment/comment.scss
...
Thanks!
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-10-09 07:10:11 +09:00
Sarah Otts
e33832f8d7
Merge pull request #5997 from LankyBox01/patch-2
...
fix #5865
2021-10-07 13:20:36 -04:00
caseymm
352f31698e
add aaron
2021-10-05 17:11:53 -07:00
caseymm
d7295ae58a
redo one of the quotes
2021-10-05 16:53:30 -07:00
caseymm
a45c1b6700
finish content in connectivity section
2021-10-05 15:27:11 -07:00
caseymm
950c608217
create 2019 folder
2021-10-05 13:18:19 -07:00
caseymm
4dbe0d20f0
country sections
2021-10-05 11:52:50 -07:00
caseymm
1b84e3417b
world and video
2021-10-04 15:48:39 -07:00
caseymm
537704cf89
india css
2021-10-04 14:10:15 -07:00
caseymm
8c39865c4f
starting scratch in india
2021-10-01 15:47:10 -07:00
caseymm
8f73470276
themes blobs
2021-10-01 14:28:24 -07:00
caseymm
b3b3ab4126
more arrows and formatting
2021-09-30 16:52:40 -07:00
caseymm
03a2435863
style changes for top two sections
2021-09-30 16:23:15 -07:00
caseymm
9c83891a42
added assets folder and started swapping in assets
2021-09-30 11:17:15 -07:00
caseymm
da116acda0
a bit more
2021-09-29 17:17:34 -07:00
caseymm
2263ec4974
more content changes
2021-09-29 17:04:29 -07:00
caseymm
4277aa5db0
some content changes
2021-09-29 15:54:33 -07:00
seotts
1d4c7e8938
show "Studio Host" on manager tile
2021-09-29 16:00:52 -04:00
caseymm
743ccb0428
start to swap out nav
2021-09-28 16:41:30 -07:00
caseymm
845d7ed578
route and 2020 folder
2021-09-28 15:49:09 -07:00
seotts
ef3e861fc3
Allow admins to promote curators
2021-09-24 16:12:09 -04:00
Sarah Otts
705e8dba6e
Merge pull request #6085 from zoebentley/credits-page-update-9-21
...
Credits page update 9 21
2021-09-24 11:08:01 -04:00
Zoë Bentley
d2c3cce09b
Added Harakou
2021-09-24 10:39:51 -04:00
Sarah Otts
1ee64bf4d9
Merge branch 'develop' into remove-studio-feature-flag
2021-09-21 10:43:07 -04:00
Zoë Bentley
b078ec23bf
Added 1 more person
2021-09-21 10:41:56 -04:00
seotts
80a99bc0b6
Remove use of studio transfer feature flag
...
Remove another use
2021-09-21 10:40:18 -04:00
Sarah Otts
be0144618d
Merge pull request #6078 from seotts/use-host-in-api-response
...
Use studio "host" in state, and accept "host" from api
2021-09-21 10:10:59 -04:00
Zoë Bentley
e21208a196
Added 1 person who joined since last time I edited branch
2021-09-20 15:38:58 -04:00
Zoë Bentley
599cc12bd4
Updated team members on credits page september 21
2021-09-20 15:11:51 -04:00
Sarah Otts
23be853cb0
Merge pull request #5114 from benjiwheeler/shrink-splash-image
...
converted images around splash video to png, smaller file size
2021-09-20 14:06:25 -04:00
seotts
3ef41d2790
Remove use of new studios feature flag
2021-09-20 13:40:37 -04:00
seotts
2b1dfcda62
Fix a couple of comments
2021-09-20 12:09:47 -04:00
seotts
c70b67cde5
If studio response body has no host yet, use owner
2021-09-20 11:31:36 -04:00
seotts
dc241e1c6f
Accept studio "host" from api; use "host" in state
2021-09-17 15:50:16 -04:00
Ray Schamp
0a4bacd1d0
Merge pull request #6062 from rschamp/allow-querystrings
...
Make /educators routes robust to querystrings
2021-09-15 13:35:49 -04:00
rschamp
6a289fe6de
Make /educators routes robust to querystrings
2021-09-15 11:09:45 -04:00
seotts
92bad5b505
Change copy of rate-limit error
2021-09-14 16:16:30 -04:00
Itta
dcadc47e6e
fix #5890
2021-09-14 06:55:56 +09:00
seotts
b692b61812
Change default validation error
2021-09-07 14:08:25 -04:00
seotts
5d8d2a05c8
Add transfer error for too many password attempts
2021-09-07 12:24:02 -04:00
Sarah Otts
f21c91106e
Merge pull request #6022 from zoebentley/bengali-language-organizer
...
Added Nasir and reordered lang organizers alphabetically by first name
2021-09-03 14:12:38 -04:00
Eric Rosenbaum
466b6dfc2e
Merge pull request #5992 from ericrosenbaum/transfer-modal6
...
More transfer host modal fixes
2021-09-02 14:50:17 -04:00
Eric Rosenbaum
1d6c47d2a4
Revert "Revert "Transfer host modal updates""
2021-09-02 14:43:31 -04:00
Zoë Bentley
a49308c5f3
Added Nasir and reordered lang organizers alphabetically by first name
2021-09-02 11:48:28 -04:00
Eric Rosenbaum
ad2536e2c6
Revert "Transfer host modal updates"
2021-09-01 10:08:11 -04:00
Eric Rosenbaum
bb428a308d
put arrow fn wrapper for loadManagers into connect
2021-08-31 17:12:53 -04:00
Eric Rosenbaum
0d670b1087
Fix load more buttons
2021-08-30 15:50:04 -04:00
LankyBox01
6ffd1dbc66
fix #5865
...
yup
2021-08-28 22:36:32 +03:00
Eric Rosenbaum
5356f05d38
reject on error
2021-08-27 14:02:25 -04:00
Eric Rosenbaum
08b5383370
responsive style for transfer outcome tiles
2021-08-27 11:22:49 -04:00
Eric Rosenbaum
b1239e72fc
Merge pull request #5988 from ericrosenbaum/transfer-modal5
...
Transfer host modal updates
2021-08-27 11:05:17 -04:00
Eric Rosenbaum
5aa1b8c8e7
Store host info in state so the modal doesn't update after reloading managers
2021-08-27 10:20:37 -04:00
Eric Rosenbaum
a6b7ef3c4b
reload managers before closing modal
2021-08-26 19:49:46 -04:00
Eric Rosenbaum
65eddfe420
responsive style for password validation
2021-08-26 17:32:51 -04:00
Eric Rosenbaum
ad85a3d525
handle password error
2021-08-26 14:12:53 -04:00
Eric Rosenbaum
ffe1475401
Reload the managers list after transfer
2021-08-26 13:32:34 -04:00
Karishma Chadha
1991070a4d
Merge pull request #5980 from kchadha/host-transfer-message
...
Add new host transfer notification message.
2021-08-26 10:06:14 -04:00
Chris Garrity
cb968f3842
[WIP] preliminary intl polyfill
...
partial implementation of intl-polyfill. Doesn't include all the www langauges, and we don't want to have to update www each time there is a language added, so this needs to move into scratch-l10n somehow.
polyfill.min.js no longer needs the intl.js polyfill, so removed. Should still look at whether the other parts of polyfill.min are needed, but they're unrelated to intl.
2021-08-25 11:13:24 -04:00
Karishma Chadha
c3f7494b8d
Add new host transfer notification message.
2021-08-25 01:21:41 -04:00
Eric Rosenbaum
13e3a540f7
cursor pointer on member tile when selecting
2021-08-24 17:18:05 -04:00
Eric Rosenbaum
198ae5823d
prevent layout change due to validation alert
2021-08-24 15:21:33 -04:00
Eric Rosenbaum
95e43cabd2
"Studio Host" label on curator tab tile, behind feature flag
2021-08-24 15:05:00 -04:00
Eric Rosenbaum
6834d675b1
disable confirm button while submitting
2021-08-24 14:52:11 -04:00
Eric Rosenbaum
5d838ef659
Muted users cannot transfer studio host
2021-08-24 14:36:06 -04:00
Eric Rosenbaum
aecc9cec6e
disable confirm button if there is a password validation error
2021-08-24 10:42:28 -04:00
Eric Rosenbaum
7f4ef784c2
Merge pull request #5959 from ericrosenbaum/transfer-modal3
...
Studio host transfer modal additional work
2021-08-24 10:40:53 -04:00
Eric Rosenbaum
7810ba2d3e
update error code id
2021-08-22 15:28:32 -04:00
Eric Rosenbaum
a8b7961f66
alerts default to 6 seconds
2021-08-20 14:04:09 -04:00
Eric Rosenbaum
b00a2d34f7
Merge branch 'develop' of https://github.com/LLK/scratch-www into transfer-modal3
2021-08-20 13:02:08 -04:00
Sarah Otts
3ae87754a0
Merge pull request #5760 from LankyBox01/patch-1
...
Add line breaks to description
2021-08-20 11:07:27 -04:00
Eric Rosenbaum
76ec4c90d8
More error handling, moved to confirmation step
2021-08-19 18:05:18 -04:00
Eric Rosenbaum
a305a0963d
send password in body of request
2021-08-19 14:54:58 -04:00
Eric Rosenbaum
296506ff84
Merge pull request #5920 from ericrosenbaum/transfer-modal
...
Studio host transfer modal (work in progress)
2021-08-19 14:04:35 -04:00
Eric Rosenbaum
123b186e75
display password error tooltip inside modal
2021-08-19 10:50:50 -04:00
Eric Rosenbaum
7df5921381
remove unused part of transfer host tile
2021-08-18 11:40:59 -04:00
Sarah Otts
62858d050c
Merge pull request #5935 from seotts/becomehost-activity-feed
...
Add studio host transfer notification to the activity feed
2021-08-18 09:33:28 -04:00
Eric Rosenbaum
8a9999034e
use named color
2021-08-17 21:29:29 -04:00
Eric Rosenbaum
154bb93297
use named color
2021-08-17 21:27:42 -04:00
Eric Rosenbaum
b35f6859cb
Merge branch 'transfer-modal' of https://github.com/ericrosenbaum/scratch-www into transfer-modal
2021-08-17 21:16:03 -04:00
Eric Rosenbaum
f6d8d0331f
update error alert
2021-08-17 21:15:54 -04:00
Eric Rosenbaum
374e78e8c9
remove unused function
2021-08-17 21:15:11 -04:00
Eric Rosenbaum
16f6d83db0
update strings
2021-08-17 21:14:46 -04:00
Eric Rosenbaum
6253e71d70
change name of isHost selector helper
2021-08-17 21:14:36 -04:00
Eric Rosenbaum
3e2249c316
Update src/views/studio/modals/transfer-host-modal.scss
...
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-08-17 21:13:58 -04:00
Eric Rosenbaum
04ff4d173b
Update src/views/studio/modals/transfer-host-modal.scss
...
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-08-17 21:13:38 -04:00
Eric Rosenbaum
0f4fba7804
clarify comment
2021-08-17 20:47:56 -04:00
seotts
f635e14a17
remove period from message
2021-08-17 11:18:10 -04:00
seotts
aec365c8db
Add becomehost notification to the activity feed
2021-08-16 14:50:58 -04:00
Eric Rosenbaum
d797309d23
add load more button
2021-08-13 15:46:15 -04:00
Eric Rosenbaum
c928a21135
update permissions
2021-08-13 15:46:15 -04:00
Eric Rosenbaum
b4c96f3193
fix permissions and correctly select host when admins transfer
2021-08-13 15:46:15 -04:00
Eric Rosenbaum
596816d7d1
admin can transfer host
2021-08-13 15:46:15 -04:00
Eric Rosenbaum
f7e221a46c
revert change to "Studio Creator" label on manager tile
2021-08-11 09:44:21 -04:00
Eric Rosenbaum
ae3135bf04
Use "host" instead of "owner"
2021-08-11 09:34:55 -04:00
Eric Rosenbaum
f964d6a1b8
Merge branch 'develop' of https://github.com/LLK/scratch-www into transfer-modal
2021-08-10 17:10:11 -04:00
Ray Schamp
4bc4e62ca9
Merge pull request #5720 from paulkaplan/extract-css
...
Extract css from js into stylesheets
2021-08-10 10:49:51 -04:00
rschamp
e3d802e625
Remove /sec, redirect to version on sip site
2021-08-10 09:21:30 -04:00
rschamp
2d42c205ad
Content updates, resolves #5902
2021-08-10 09:18:04 -04:00
rschamp
378f1db783
Update link to download AIR, remove outdated content
...
Resolves #5132 . Thanks to @carljbowman for support
2021-08-09 13:42:59 -04:00
Eric Rosenbaum
e9045ceab2
info step style fix
2021-08-06 10:28:50 -04:00
jeffalo
feb80afb35
revert
2021-08-06 12:29:00 +02:00
jeffalo
992baf7745
see if returning null will fix errors
2021-08-06 12:26:56 +02:00
Eric Rosenbaum
3473b7d2e1
Enter key triggers submit instead of back button
2021-08-05 20:05:41 -04:00
Eric Rosenbaum
3846956ac9
cleanup and style fixes
2021-08-05 20:01:47 -04:00
Eric Rosenbaum
827ce37d26
disable confirm if password input is empty
2021-08-05 19:57:00 -04:00
Eric Rosenbaum
8327f382a2
add generic error alert
2021-08-05 19:56:36 -04:00
Eric Rosenbaum
572e36be21
new design for confirmation step
2021-08-05 15:56:09 -04:00
Eric Rosenbaum
5f98e35947
lint
2021-08-05 15:36:11 -04:00
Eric Rosenbaum
1b8ea3112e
send password with transfer request
2021-08-05 15:35:19 -04:00
jeffalo
dbf68ff9b4
satisfy eslint
2021-08-05 21:33:59 +02:00
jeffalo
e1afa432a2
also don't allow only whitespace
2021-08-05 21:18:36 +02:00
jeffalo
7e1aebf9b4
prevent searches for empty strings
2021-08-05 21:12:22 +02:00
apple502j
9a390eafeb
Move FAQ page to /faq
2021-08-06 02:55:11 +09:00
rschamp
f5fa49fa45
WIP: Use conditional importing for intl polyfills
2021-08-05 12:11:45 -04:00
Ray Schamp
5610e1b217
Merge pull request #5719 from paulkaplan/dynamic-import
...
Support dynamic imports to load code only when needed
2021-08-05 11:12:50 -04:00
rschamp
81ff3d6216
Revert "feat(annual-report): dynamically load the world map when it is scrolled to"
...
This reverts commit bc43ad7e29
.
2021-08-05 11:09:04 -04:00
Eric Rosenbaum
5a7a448c5c
fix transfer tile layout
2021-08-02 11:41:58 -04:00
Eric Rosenbaum
2cf68bbc07
style confirmation step
2021-08-02 11:21:47 -04:00
Eric Rosenbaum
fa63ca8c2d
styling confirmation step tiles
2021-08-02 10:20:36 -04:00
Eric Rosenbaum
59b98c5d3b
lint the lint
2021-07-29 11:18:33 -04:00
Eric Rosenbaum
acda9b88f0
styling selection scroll pane
2021-07-29 11:17:18 -04:00
Eric Rosenbaum
72aa0c2cf3
Styling for selection step
2021-07-29 11:04:58 -04:00
Eric Rosenbaum
bb8fe2de40
fix fake alert width
2021-07-29 10:37:43 -04:00
Eric Rosenbaum
2c7d6b4cd0
use arrow svg
2021-07-29 10:37:21 -04:00
Eric Rosenbaum
d0d32e81e9
style selection tiles
2021-07-27 11:21:14 -04:00
LankyBox01
a34c0c2a52
Add line breaks to description
...
https://github.com/LLK/scratch-www/issues/5710
It's been 10 days since the last comment lol
2021-07-25 12:49:09 +03:00
Eric Rosenbaum
5811332cd7
lint fixes
2021-07-23 13:57:25 -04:00
Eric Rosenbaum
4bf7a2d307
lint fixes
2021-07-23 13:34:22 -04:00
Eric Rosenbaum
c09bac2e41
working on styles
2021-07-23 12:01:47 -04:00
Eric Rosenbaum
083cff87d8
add disabled button style
2021-07-23 11:35:20 -04:00
Eric Rosenbaum
8910ba435b
update wording to use host
2021-07-23 10:38:29 -04:00
Eric Rosenbaum
d79acf1994
update route name
2021-07-23 10:38:05 -04:00
Eric Rosenbaum
bd5cf65692
move transferOwnership into the tile for error handling
2021-07-20 11:58:26 -04:00
Eric Rosenbaum
072e888c1d
use feature flag
2021-07-20 10:51:10 -04:00
Eric Rosenbaum
4d438d0cd6
add content to confirmation step
2021-07-19 11:17:52 -04:00
Eric Rosenbaum
d4253bdd2e
transfer ownership selection step uses its own grid
2021-07-19 11:17:27 -04:00
Eric Rosenbaum
1e99722801
use regular form instead of formik
2021-07-16 21:37:22 -04:00
Eric Rosenbaum
a55442d07f
make api request with auth
2021-07-15 15:20:28 -04:00
Eric Rosenbaum
d1fdf9556d
cleanup transfer ownership action
2021-07-15 14:41:52 -04:00
Eric Rosenbaum
236394550b
add password field
2021-07-15 14:41:38 -04:00
Eric Rosenbaum
09822abfc4
connect transferOwnership action to confirm button
2021-07-14 17:25:23 -04:00
Eric Rosenbaum
f6463ba538
add transfer ownership action
2021-07-14 17:12:25 -04:00
Eric Rosenbaum
43ee5896b5
show usernames in confirmation step
2021-07-14 16:27:00 -04:00
seotts
aa42941226
Fix locations in SEC page
2021-07-14 15:46:02 -04:00
Eric Rosenbaum
1b455d6fbd
add mock tiles to confirm step
2021-07-14 15:35:45 -04:00
Eric Rosenbaum
cbc5c68203
remove unused prop
2021-07-14 15:35:34 -04:00
Eric Rosenbaum
1dfb681def
add initial version of confirmation step
2021-07-14 12:01:22 -04:00
Sarah Otts
3bf403e3c1
Merge pull request #5718 from zoebentley/sec-participating-orgs
...
Update SEC landing page with list of participating orgs and partner orgs
2021-07-13 17:01:51 -04:00
Eric Rosenbaum
211ff1bb04
Add selectable user tile
2021-07-13 12:05:54 -04:00
Zoë Bentley
66148879b3
Made org names and letter titles non-translated, fixed a CSS error, and removed unused strings
2021-07-13 10:53:33 -04:00
Zoë Bentley
a9aeda17cf
lint 3
2021-07-13 09:30:03 -04:00
Zoë Bentley
69a383ceb2
Added links and locations for partner organizations
2021-07-12 17:19:30 -04:00
Paul Kaplan
f134dbf201
perf(styles): extract css from js into stylesheets
2021-07-12 14:48:08 -04:00
Paul Kaplan
bc43ad7e29
feat(annual-report): dynamically load the world map when it is scrolled to
2021-07-12 14:34:24 -04:00
Paul Kaplan
8e4ee5fb7a
feat(build): support dynamic import
...
add the babel plugin for dynamic import syntax and fixup the path references in webpack and template
so the chunks can be loaded dynamically
2021-07-12 14:34:17 -04:00
Zoë Bentley
0149718c8d
lint 2
2021-07-12 11:32:09 -04:00
Zoë Bentley
791b4c7cde
lint
2021-07-12 11:31:49 -04:00
Zoë Bentley
15ad33aa05
Added ILCE to list of orgs
2021-07-12 11:16:16 -04:00
Zoë Bentley
f660af26eb
Updated SEC page with 39 participating orgs and 6 partner orgs
2021-07-12 10:43:01 -04:00
Eric Rosenbaum
6fb1e7ccd2
do not show option to transfer ownership to yourself
2021-07-09 17:01:34 -04:00
Eric Rosenbaum
f8195d1024
only show ownership transfer option if there are >1 managers
2021-07-09 16:43:00 -04:00
Eric Rosenbaum
d7858e9a1a
initial work on transfer ownership selection step
2021-07-09 15:09:35 -04:00
Eric Rosenbaum
a16ef0c3d5
first step of transfer ownership modal
2021-07-09 11:42:56 -04:00
Paul Kaplan
dcf2682f09
Merge pull request #5662 from paulkaplan/test-studio-member-actions
...
Create detailed unit tests for studio-member-actions
2021-07-07 15:28:55 -04:00
Paul Kaplan
ad386714a9
fix(studios): remove duplicate css for full width load more buttons
...
Remove the `display: content;` way of making the load more button full width, and reuse the existing
shared css class instead. Also change the markup back to the way it was originally, with the load
more button within the grid, since that is how it is meant to be used
2021-07-06 15:06:26 -04:00
Paul Kaplan
d693beb1b3
fix(studios): share css to make load more buttons full width
...
Changes the markup and css classes used by activity, curators, managers and projects grids to use a
shared full-width load more button
2021-07-06 14:51:16 -04:00
Paul Kaplan
4866d96da1
fix(studios): change the curators, projects and managers load count to 24
...
Changing from 20 to 24 will fix the issue where we are loading rows that aren't "full" on a 3-tile
row. Now it will always fill a row no matter the display breakpoint (1,2 or 3 tiles per row)
2021-07-06 14:36:12 -04:00
Paul Kaplan
e719d25e3d
fix(studio): do not show mute error as if manager can edit info
2021-07-06 10:42:02 -04:00
Karishma Chadha
6dbf8d1bd5
Merge pull request #5692 from kchadha/manager-permissions
...
Update manager permissions for studios.
2021-07-06 09:22:59 -04:00
Paul Kaplan
54b9161dc0
fix(studio): prevent duplicate submissions on studio project browser modal
2021-07-01 13:36:29 -04:00
Paul Kaplan
e835cafc37
fix(studio): limit the max length of studio titles on the client side
2021-07-01 11:50:54 -04:00
Karishma Chadha
d0ad0a45d4
Update manager permissions for studios.
2021-06-25 12:41:36 -04:00
Paul Kaplan
b2c9c922d3
Use errors from project adder in the add to studio modal
2021-06-25 12:13:29 -04:00
apple502j
3b9383d930
Link community guidelines in project.defaultCensoredMessage
2021-06-26 00:18:34 +09:00
Paul Kaplan
e6d65c1364
Revert "Revert "Switch studios route to real version for testing on staging""
2021-06-25 10:53:00 -04:00
Paul Kaplan
1027b82f66
Include unit tests for more of the action creators
2021-06-25 10:43:33 -04:00
Paul Kaplan
ffb0e96f47
Merge pull request #5664 from LLK/revert-5660-revert-5630-reduce-reply-requests
...
Reduce reply requests, for real this time I promise
2021-06-24 14:51:39 -04:00
Sarah Otts
3958d9df7d
Merge pull request #5659 from seotts/manager-modal-padding
...
Change manager modal width
2021-06-24 14:33:10 -04:00
Sarah Otts
d5a94ae59c
Merge pull request #5658 from seotts/add-by-url-text
...
Match Add Project placeholder & button text to old studios
2021-06-24 14:33:02 -04:00
Paul Kaplan
975d24cd5d
Revert "Revert "Only request replies if reply_count > 0""
2021-06-24 10:59:09 -04:00
Paul Kaplan
c9ba9d443c
Add tests for all studio-member-actions
2021-06-23 21:28:33 -04:00
Paul Kaplan
a8ed7410a4
Separate studio reducers and initial state into a helper
2021-06-23 20:57:30 -04:00
Paul Kaplan
8a3e6155c4
Separate helper for creating the default redux store for www pages
2021-06-23 20:56:48 -04:00
Karishma Chadha
10f887f8ba
Revert "Only request replies if reply_count > 0"
2021-06-23 16:30:20 -04:00
seotts
29a818a5bc
Change http to https in placeholder
2021-06-23 14:26:03 -04:00
seotts
a3b3a66f7a
Rename button; change placeholder text
...
lint fix
lint
2021-06-23 14:13:49 -04:00
seotts
0f43addd10
Change manager modal width
2021-06-23 14:06:57 -04:00
Paul Kaplan
b3795c943f
Merge pull request #5630 from paulkaplan/reduce-reply-requests
...
Only request replies if reply_count > 0
2021-06-23 12:40:45 -04:00
Paul Kaplan
b5a68924c9
Merge pull request #5651 from paulkaplan/update-reply-count-for-new-replies
...
Update the reply_count when you leave a reply
2021-06-23 12:38:33 -04:00
Paul Kaplan
614cfdc4bb
Update src/redux/comments.js
...
Co-authored-by: Karishma Chadha <kchadha@scratch.mit.edu>
2021-06-23 12:37:15 -04:00
Paul Kaplan
810465bfcf
Merge branch 'develop' into no-report-own-comments
2021-06-23 09:49:38 -04:00
Paul Kaplan
96cb2f7959
Revert "Switch studios route to real version for testing on staging"
2021-06-23 09:29:04 -04:00
DD Liu
b7eb0b9026
Merge pull request #5653 from fsih/hoverState
...
Studio tab nav button styling
2021-06-22 20:01:16 -04:00
DD Liu
a85fb9c5dd
Merge pull request #5652 from fsih/replacePngs
...
Replace pngs with svgs
2021-06-22 19:44:23 -04:00
DD Liu
d3e400485e
Fix syntax
2021-06-22 19:37:41 -04:00
DD Liu
cf26eb9cb2
Increase the padding in and around tab nav buttons
2021-06-22 16:48:18 -04:00
Paul Kaplan
d1242f8f26
Merge pull request #5645 from paulkaplan/fix-admin-panel-spacing
2021-06-22 14:39:27 -04:00
DD Liu
2ebd1be1a8
Make the tab button hover states match the spec
2021-06-22 13:40:33 -04:00
Paul Kaplan
d575928ea1
Merge pull request #5646 from paulkaplan/fix-studio-grid-spacing
...
Make column and row gaps the same on studio tile grids
2021-06-22 12:11:41 -04:00
Paul Kaplan
581f4d0cac
Update the reply_count when you leave a reply
2021-06-22 12:03:13 -04:00
DD Liu
4ecffa885f
Replace pngs with svgs
2021-06-22 02:45:28 -04:00
Paul Kaplan
cfd52d9369
Pass a customized comment component for studios
2021-06-21 16:06:40 -04:00
Paul Kaplan
fced16b08c
Make Comment component a prop
2021-06-21 15:37:36 -04:00
Paul Kaplan
53b207e003
Only show reply button when comments are allowed
2021-06-21 12:56:29 -04:00
Paul Kaplan
547f5b959b
Make column and row gaps the same
2021-06-21 12:36:53 -04:00
Paul Kaplan
1cace60ebd
Fix admin panel space remaining after logging out
2021-06-21 12:25:19 -04:00
Eric Rosenbaum
303d800041
Merge pull request #5632 from ericrosenbaum/add-to-studio-fixes
...
Style fixes for "add to studio" modal
2021-06-18 15:43:33 -04:00
Paul Kaplan
1eb91e22b3
Merge pull request #5631 from paulkaplan/final-studio-routes
...
Switch studios route to real version for testing on staging
2021-06-18 15:41:32 -04:00
Paul Kaplan
6e43607a1d
Merge pull request #5633 from paulkaplan/remove-debug-errors
...
Improve errors around following studios
2021-06-18 15:01:23 -04:00
Paul Kaplan
10bcc2319a
Fix typo in translation string
2021-06-18 14:59:32 -04:00
Paul Kaplan
d5e9dd0829
Merge pull request #5609 from fsih/adjustResponsive
...
Adjust responsive boundaries for grid reflow
2021-06-18 14:52:32 -04:00
Paul Kaplan
48958ddba4
Merge pull request #5607 from fsih/textBoxGray
...
Make the border of editable fields dashed gray for studios. Otherwise, make them match the fields on project pages
2021-06-18 14:52:18 -04:00
Paul Kaplan
ae202c7bcd
Remove Debug component in studios
2021-06-18 11:49:57 -04:00
Paul Kaplan
fa8aff5837
Replace debug error on StudioFollow
2021-06-18 11:27:00 -04:00
Paul Kaplan
4c2b588926
Include react-hooks eslint plugin to prevent hooks usage errors.
...
I'm including this now because when implementing the studio follow
error messaging, I made a mistake (conditionally calling useState)
that was tough to track down, and this linter plugin prevents that.
2021-06-18 11:09:43 -04:00
Eric Rosenbaum
ffdf39282d
gray border above done button row
2021-06-18 10:35:19 -04:00
Eric Rosenbaum
06e074bbe8
fix bottom padding
2021-06-18 10:32:02 -04:00
Paul Kaplan
7330bc00f5
Update studios route to final version for testing
2021-06-18 10:29:24 -04:00
Paul Kaplan
2e976e0358
Only request replies if reply_count > 0
2021-06-18 10:14:50 -04:00
Eric Rosenbaum
b913d5f3ae
restyle nav buttons
2021-06-17 22:50:10 -04:00
seotts
ad3f50ac10
Revert "Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-page""
...
This reverts commit 5b7127a271
.
# Conflicts:
# src/views/preview/subactions.jsx
2021-06-17 17:19:51 -04:00
seotts
60b98908e0
use selectIsMuted to determine whether to show error
2021-06-17 17:18:40 -04:00
picklesrus
fe82cf3873
fix indentation
2021-06-17 15:48:38 -04:00
picklesrus
292bb02483
Merge branch 'develop' into studio-comments-off
2021-06-17 15:46:28 -04:00
Paul Kaplan
588ee63204
Merge pull request #5626 from ericrosenbaum/studio-single-comment
...
Studio single comment view
2021-06-17 15:01:32 -04:00
Paul Kaplan
cf0f4ee6b3
Merge pull request #5620 from paulkaplan/view-deleteted-studios
...
Admins can view deleted studios
2021-06-17 15:00:02 -04:00
Eric Rosenbaum
1605e23d5f
fix logic for single comment effect
2021-06-17 14:05:25 -04:00
Eric Rosenbaum
a5800cb8fb
revert change to comment limit
2021-06-17 14:04:34 -04:00
picklesrus
7d2d0cb3d9
Fix lint
2021-06-17 13:55:39 -04:00
picklesrus
d3e368bce2
Merge branch 'develop' into studio-comments-off
2021-06-17 13:47:03 -04:00
Eric Rosenbaum
bba5b69cb9
Merge pull request #5617 from LLK/release/2021-06-16
...
Develop release/2021-06-16
2021-06-17 13:17:50 -04:00
Paul Kaplan
23f7e563ab
Include deleted studio banner
2021-06-17 12:37:45 -04:00
Karishma Chadha
f4b0bc8aee
Merge pull request #5621 from kchadha/studio-permissions-audit
...
Studio creators and managers can delete their own comments
2021-06-17 12:21:40 -04:00
Eric Rosenbaum
8c9cc0e859
load more button style
2021-06-17 10:03:24 -04:00
Eric Rosenbaum
0e49452fc7
expand replies
2021-06-17 09:49:23 -04:00
seotts
5b7127a271
Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-page"
...
This reverts commit d468072552
, reversing
changes made to 469878a2fc
.
2021-06-17 09:02:31 -04:00
Eric Rosenbaum
48c3032f54
load single comment
2021-06-16 17:42:40 -04:00
Karishma Chadha
8821e0e865
Studio creators and managers can delete their own comments
2021-06-16 11:17:43 -04:00
Paul Kaplan
43b8b74d0c
Move studio info request to top level
2021-06-16 09:55:29 -04:00
Paul Kaplan
4db968970a
Use admin routes for studio info, curators, managers and activity
2021-06-16 09:54:40 -04:00
picklesrus
91f1c7ccf9
Merge branch 'studio-comments-off' of https://github.com/picklesrus/scratch-www into studio-comments-off
...
resolve conflicts
2021-06-15 17:25:22 -04:00
picklesrus
64f9d80c2a
Merge branch 'develop' into studio-comments-off
2021-06-15 17:24:43 -04:00
picklesrus
36516447cc
Fix up tests from refactor and fix bug from refactor.
2021-06-15 17:22:32 -04:00
Eric Rosenbaum
7c0ec57165
add loading spinner
2021-06-15 15:35:25 -04:00
Sarah Otts
d468072552
Merge pull request #5573 from seotts/muted-add-proj-via-proj-page
...
Muted users can’t add projects to studio via project page
2021-06-15 15:26:47 -04:00
Eric Rosenbaum
469878a2fc
Merge pull request #5608 from fsih/thumbWhiteBg
...
Adjust thumbnail css
2021-06-15 15:06:09 -04:00
Sarah Otts
a0ab492bd9
Merge branch 'develop' into muted-add-proj-via-proj-page
2021-06-15 14:50:15 -04:00
Eric Rosenbaum
6bbc62c5e3
thumbnail in report matches main thumbnail style
2021-06-15 12:16:33 -04:00
Eric Rosenbaum
a344f1280d
style fixes
2021-06-15 12:16:04 -04:00
Eric Rosenbaum
cbbd0ebdaf
style empty state
2021-06-15 10:51:45 -04:00
seotts
1a753dfde3
Put Add to Studio change behind session flag
2021-06-15 09:45:09 -04:00
seotts
56dc892ee5
Muted user can’t add proj to studio via proj page
2021-06-15 09:45:09 -04:00
DD Liu
f11cd55995
Adjust responsive boundaries for grid reflow
2021-06-15 04:30:39 -04:00
DD Liu
df19f1b421
Adjust thumbnail css
2021-06-15 03:49:41 -04:00
DD Liu
8ea97e4577
Make the border of editable fields dashed gray for studios. Otherwise, make them match the fields on project pages.
2021-06-15 01:58:04 -04:00
Eric Rosenbaum
a2169d71c4
responsive fixed height
2021-06-14 17:45:20 -04:00
picklesrus
6b4bab02d1
Move logic about whether session is fetched into selectors
2021-06-14 17:15:47 -04:00
Sarah Otts
a7dae0561b
Merge branch 'develop' into muted-errors-from-backend
2021-06-14 15:40:05 -04:00
Ray Schamp
a17919e561
Merge pull request #5496 from rschamp/rearrange-conference-2021
...
Bump Conference 2020 to 2021 (Take 2)
2021-06-14 09:01:51 -04:00
DD Liu
2d884eef64
Merge pull request #5578 from fsih/whiteButtons
...
Make the default nav button state white
2021-06-13 23:07:33 -04:00
DD Liu
deb1f5eb7e
Merge pull request #5580 from fsih/titleLimit
...
Make the title scroll after a certain length, and long words wrap
2021-06-13 23:07:23 -04:00
Karishma Chadha
8ab13436c0
Merge pull request #5588 from kchadha/manager-limit
...
Studio Manager Limit
2021-06-11 16:39:27 -04:00
Karishma Chadha
85beabad19
Remove unneded redux connect code
2021-06-11 15:58:22 -04:00
Karishma Chadha
c773018c8e
Update managerCount in redux when promoting a curator or removing a manager.
2021-06-11 15:55:28 -04:00
Karishma Chadha
75687e52f7
Remove commented out CSS styling
2021-06-11 14:17:21 -04:00
Karishma Chadha
6486f119a3
fix trailing space issue
2021-06-10 19:40:53 -04:00
Karishma Chadha
9fc2f8167d
Fix prop warning in the studio curator invite box.
2021-06-10 19:24:54 -04:00
Karishma Chadha
96aeabd255
Display info to managers/studio creator about how close the studio is to reaching the manager limit when over a threshold. Display info about removing managers when a studio has reached the limit.
2021-06-10 19:24:25 -04:00
Karishma Chadha
40b8f5a5c9
Update styling of promote modal so that if we get a network or other server error while trying to promote, we see the error message in the modal (and closer to the promote button).
2021-06-10 19:22:22 -04:00
Karishma Chadha
51858167c9
Display manager limit modal in two scenarios: if the frontend already knows that the manager limit has been reached, and if we have the promote modal up, but we got response from the server that the manager limit has been reached.
2021-06-10 19:20:51 -04:00
Karishma Chadha
e0e53b8d73
Create manager limit modal (modeled off of the promote-curator modal) which will be displayed if the user clicks promote when the manager limit has already been reached.
2021-06-10 19:17:07 -04:00
Karishma Chadha
ce8e270309
Set up state, tracking the number of managers the limits used to display info to the user. Handle new error response when trying to promote a curator.
2021-06-10 19:13:48 -04:00
picklesrus
17307cacd3
Add tests
2021-06-10 16:51:41 -04:00
picklesrus
fcbcef244b
Show a status message in place of the usual comment components when studio comments are turned off.
2021-06-10 15:36:48 -04:00
Eric Rosenbaum
c7ba97d291
Empty state styling
2021-06-10 10:52:23 -04:00
Eric Rosenbaum
b6a91adf78
add empty states and done button
2021-06-09 17:38:22 -04:00
DD Liu
ee95a708b5
Make the title scroll after a certain length, and long words wrap
2021-06-09 14:57:53 -04:00
seotts
4f25a2ae34
Don’t show errors for toggling openToAll or commentsAllowed
2021-06-09 14:08:52 -04:00
seotts
91d66cd20b
Display backend mute errors on studio edit
2021-06-09 14:08:51 -04:00
Eric Rosenbaum
b7eb303217
Merge pull request #5568 from ericrosenbaum/hide-validation
...
Hide validation message on click outside
2021-06-09 09:56:04 -04:00
picklesrus
b65ab82a89
Merge pull request #5561 from picklesrus/project-comments
...
handle project comments turned off
2021-06-09 09:41:44 -04:00
picklesrus
0edd946fee
Address review comments
2021-06-09 09:08:16 -04:00
DD Liu
af5f810212
Make the default nav button state white. Also remove that weird tiny bit of resizing when you click on them, was that intentional?
2021-06-08 22:26:05 -04:00
Eric Rosenbaum
d9169e1892
catch errors
2021-06-08 14:55:37 -04:00
Eric Rosenbaum
5ba6bb83b9
hide validation on click outside for description
2021-06-08 14:16:23 -04:00
Eric Rosenbaum
b0a9bab71a
hide validation on click outside for thumnbail image
2021-06-08 13:58:21 -04:00
seotts
3d6a789812
update session when user gets muted
2021-06-08 13:38:35 -04:00
Eric Rosenbaum
935ec7acad
simplify wrapping
2021-06-08 11:01:54 -04:00
Eric Rosenbaum
6af78c45e5
hide validation message on click outside
2021-06-08 10:53:47 -04:00
picklesrus
ef801112cd
Merge branch 'develop' into project-comments
2021-06-07 15:38:40 -04:00
picklesrus
1afbe4ad79
clean up
2021-06-07 15:31:20 -04:00
picklesrus
993dd36aa5
WIP of being able to turn off project comments.
2021-06-07 11:28:29 -04:00
Karishma Chadha
7e1eb3a2f8
Merge pull request #5539 from kchadha/reply-thread-refresh-fix
...
Use reply_count to check whether reply limit is reached
2021-06-03 11:09:04 -04:00
Karishma Chadha
9b323d99a0
Fix reply status box alignment.
2021-06-02 18:14:09 -04:00
Karishma Chadha
17ada7172d
Add totalReplyCount prop to check whether thread has reached limit instead of checking only the 20 we load on the first try
2021-06-02 17:38:10 -04:00
Karishma Chadha
c377af81f2
Fix l10n string ID where it previously got missed.
2021-06-02 15:45:07 -04:00
Karishma Chadha
e2db890814
Merge pull request #5495 from kchadha/comment-thread-limit
...
Comment thread limit
2021-06-02 14:08:03 -04:00
Eric Rosenbaum
be047a5a7b
Merge pull request #5503 from ericrosenbaum/promote-modal
...
Add "Promote to manager" modal
2021-06-02 10:51:05 -04:00
Karishma Chadha
da231ed3af
Change l10n string ID to match server error
2021-06-02 10:48:04 -04:00
Eric Rosenbaum
9ccbe94be1
add promote modal
2021-05-26 22:54:23 -04:00
DD Liu
2179ade65e
Fix lint
2021-05-26 15:00:52 -04:00
DD Liu
cd930046bb
Merge branch 'develop' into commentsNotAllowed
2021-05-26 14:47:20 -04:00
DD Liu
217c7ecafc
Add comments not allowed box
2021-05-26 14:45:47 -04:00
Paul Kaplan
8451e57a8a
Merge branch 'develop' into studio-curator-invite
2021-05-26 12:09:17 -04:00
Paul Kaplan
3ca94ee6cf
Merge branch 'develop' into studio-curator-invite
2021-05-26 12:07:05 -04:00
Paul Kaplan
dbf7522856
Merge branch 'develop' into editThumbnailButton
2021-05-26 12:02:54 -04:00
Paul Kaplan
3621cd24cf
Add edit icon
2021-05-26 11:59:58 -04:00
Paul Kaplan
f44cc23a98
Merge branch 'develop' into studio-meta
2021-05-26 11:55:35 -04:00
Paul Kaplan
60b154126d
Merge pull request #5467 from seotts/muted-users-cant-edit-studios
...
Prototype: muted users can't edit studios
2021-05-26 11:01:47 -04:00
Paul Kaplan
47560e5d5e
Use the correct l10n message for curator page
2021-05-26 10:58:28 -04:00
Paul Kaplan
cb8a869e4f
Merge branch 'develop' into muted-users-cant-edit-studios
2021-05-26 10:58:12 -04:00
rschamp
31e6616544
Rename all Conference 2020 folders to 2021
...
This is both to reduce confusion in the future, and so that Transifex sees what it expects, with the name of the resource corresponding to the path to the l10n file.
2021-05-26 10:22:12 -04:00
rschamp
232d9f3bbd
Revert "Merge pull request #5494 from LLK/revert-5476-rearrange-conference-2021"
...
This reverts commit 4edab6927e
, reversing
changes made to 7b7322c9f9
.
2021-05-26 09:40:41 -04:00
Ray Schamp
f902e25b0f
Revert "Bump conference URL one year"
2021-05-26 09:35:35 -04:00
Karishma Chadha
6870db418e
Track which comment thread has the thread limit status box so that only one status box is displayed in the whole studio comments view.
2021-05-25 23:19:36 -04:00
Karishma Chadha
e57cd9a111
Introduce comment thread limit on studio comments. When a user clicks reply on a thread that has reached the limit, display a comment status message in place of the comment composer. The user should only see one status box in a message thread.
2021-05-25 23:17:57 -04:00
DD Liu
eff5803b92
Fix lint issues
2021-05-25 17:35:18 -04:00
DD Liu
8f542fa5e5
Change file input to edit thumbnail icon"
2021-05-25 17:30:38 -04:00
rschamp
c52677ccc6
Update community guidelines
2021-05-25 11:05:17 -04:00
Paul Kaplan
0ccf28e388
Merge pull request #5466 from ericrosenbaum/load-24-projects-per-page
...
Small fixes for "add to studio" modal
2021-05-25 10:00:03 -04:00
Paul Kaplan
5903f57597
Merge pull request #5468 from cwillisf/studios-stats-and-icons
...
Studios stats and icons
2021-05-25 09:53:18 -04:00
Paul Kaplan
f50d8dbf66
Wrap counts in span for styling
2021-05-25 09:48:33 -04:00
Eric Rosenbaum
e5212234ac
lint
2021-05-24 17:22:20 -04:00
Eric Rosenbaum
a390c0655f
Merge branch 'develop' of https://github.com/LLK/scratch-www into load-24-projects-per-page
...
# Conflicts:
# src/views/studio/modals/user-projects-modal.jsx
2021-05-24 17:18:09 -04:00
Eric Rosenbaum
a194b48566
load more button is fill width
2021-05-24 17:12:20 -04:00
Paul Kaplan
832324ea83
Merge pull request #5451 from paulkaplan/studio-alerts
...
Alert component and studio error and success alerts
2021-05-24 15:33:10 -04:00
Paul Kaplan
f9702d9017
Merge pull request #5437 from paulkaplan/fix-studio-project-adding-errors
...
Handle more types of project add errors
2021-05-24 15:32:37 -04:00
Paul Kaplan
2c53c70307
Merge pull request #5436 from paulkaplan/fix-admin-studio-comments
...
Wait for session to be fetched before loading comments
2021-05-24 15:32:24 -04:00
Ray Schamp
460010e64f
Merge pull request #5476 from rschamp/rearrange-conference-2021
...
Bump conference URL one year
2021-05-24 13:53:22 -04:00
Bryce Taylor
bfe64aa313
Merge pull request #4540 from BryceLTaylor/move-navbar-tests
...
Move Navbar integration tests from Tap to Jest
2021-05-24 10:57:21 -04:00
rschamp
40295d3860
Bump conference URL one year
...
Resolves #5197
2021-05-24 09:36:47 -04:00
Eric Rosenbaum
b1b0d6b259
add/remove icons for project tiles
2021-05-21 17:01:08 -04:00
Christopher Willis-Ford
59e7490a46
fix nav tab size change on click
2021-05-21 12:53:14 -07:00
Christopher Willis-Ford
ad6675f64d
show '100+' if project/comment count is 100 or more
2021-05-21 12:43:57 -07:00
Christopher Willis-Ford
87f4fb3a9c
add icon & style to the StudioReport button
2021-05-21 12:43:57 -07:00
Christopher Willis-Ford
ddaa099cf0
add icons to StudioStats
2021-05-21 12:43:52 -07:00
Christopher Willis-Ford
594cd7a285
add tab icons to StudioTabNav
2021-05-21 12:41:52 -07:00
Christopher Willis-Ford
b21e55b5f3
add followers, last-updated date to studio sidebar
2021-05-21 10:31:35 -07:00
Christopher Willis-Ford
a0992bb5f7
add project and comment count to StudioTabNav
2021-05-21 10:31:30 -07:00
Eric Rosenbaum
0a9e465830
style border for added projects
2021-05-21 11:09:43 -04:00
seotts
6798380ca8
Fix conflicts
...
d
2021-05-21 10:29:38 -04:00
seotts
3212ccf7cb
Add a comment about shouldShow*MuteErrors
2021-05-21 10:02:16 -04:00
seotts
4f618336a8
Error should only shrink textarea on small screens
2021-05-21 10:02:16 -04:00
seotts
13739ae0bc
Minor changes to error messages
2021-05-21 10:01:07 -04:00
seotts
dbb258cf8b
Work on tests
...
remove failing tests
2021-05-21 10:00:15 -04:00
seotts
4f556785d3
Move whether to show mute both into selectors
2021-05-21 10:00:15 -04:00
seotts
9e8186808d
Correct projects message
2021-05-21 09:59:24 -04:00
seotts
db5358d79c
Show mute edit errors on hover
2021-05-21 09:59:23 -04:00
seotts
19a9997e0f
Muted users can’t edit studios
...
linting fixes
2021-05-21 09:46:19 -04:00
Eric Rosenbaum
15b31c689e
load 24 projects per page in add to studio modal
2021-05-21 09:20:51 -04:00
Eric Rosenbaum
a7ab994638
use buttons in subnav to make keyboard nav work
2021-05-20 17:12:27 -04:00
Paul Kaplan
ecd4fa9438
Merge pull request #5458 from ericrosenbaum/studio-report-responsive
...
Studio report modal style fixes
2021-05-20 10:04:23 -04:00
Paul Kaplan
29bb2f1f5a
Make the clickable items show a clickable cursor
2021-05-20 10:02:27 -04:00
Paul Kaplan
8832d31fd9
Merge pull request #5444 from paulkaplan/studio-admin-panel
...
Studio admin panel
2021-05-20 09:37:59 -04:00
Paul Kaplan
85172b78fa
Use log.error instead of console
2021-05-20 09:32:31 -04:00
Eric Rosenbaum
5acff71cf7
adjust size of thanks modal
2021-05-19 22:44:43 -04:00
Eric Rosenbaum
a621449153
add studio report thanks image
2021-05-19 17:01:15 -04:00
Eric Rosenbaum
39a54b0bd3
update studio report modal text
2021-05-19 15:57:45 -04:00
Paul Kaplan
d0465acb21
Merge pull request #5440 from apple502j/decorate-desc
...
Linkify studio descriptions
2021-05-19 15:43:02 -04:00
Paul Kaplan
a405908d0b
While I'm here, fixup the image styling too
2021-05-19 15:37:11 -04:00
Paul Kaplan
1d72806914
Also use a div for the title so it doesn't use scrollbars and fix the alignment
2021-05-19 15:36:56 -04:00
Paul Kaplan
c039a29189
Use the same class name, use tag selector for styling
2021-05-19 15:36:23 -04:00
Paul Kaplan
8a2cbc5ea4
Dont timeout error alerts
2021-05-19 15:09:06 -04:00
Eric Rosenbaum
70d22a0f1e
make studio report modal work on short or narrow screens
2021-05-19 14:27:53 -04:00
Paul Kaplan
64d4bd4fde
Do not use project name in duplicate message since we do not have it
2021-05-19 13:54:29 -04:00
Paul Kaplan
e2eb8611b1
Dont catch pointer events in the alert container
2021-05-19 13:46:06 -04:00
Paul Kaplan
9a931b026e
Add and use alert providers on curators, managers, projects and project modal
2021-05-19 13:36:16 -04:00
Paul Kaplan
5ee1c7c203
Add reusable alert component using context
2021-05-19 13:33:41 -04:00
apple502j
116d640fdd
Set background to studio-description-text
2021-05-20 00:44:46 +09:00
Paul Kaplan
b38a97adf3
Studio admin panel
2021-05-18 11:41:32 -04:00
Eric Rosenbaum
b37481a601
remove unused import
2021-05-18 11:22:46 -04:00
Eric Rosenbaum
f703578b6c
move studio report css into its own file
2021-05-18 11:20:51 -04:00
Eric Rosenbaum
47c12aefa3
move studio report modal into modals dir
2021-05-18 10:41:11 -04:00
Eric Rosenbaum
dc1316c8ff
Merge branch 'develop' of https://github.com/LLK/scratch-www into studio-report-modal
2021-05-18 10:08:30 -04:00
apple502j
536caf994a
Linkify studio descriptions
2021-05-18 05:22:02 +09:00
Paul Kaplan
ff2e321067
Add dynamic meta tags for studio pages
2021-05-17 15:47:51 -04:00
Eric Rosenbaum
33a0be0e35
add placeholder for error handling
2021-05-17 15:44:08 -04:00
Paul Kaplan
b0eae61d5b
Fix periods
2021-05-17 15:32:16 -04:00
Karishma Chadha
bc77b4b257
Merge pull request #5435 from LLK/hotfix/donate-banner-analytics
...
[Develop] Hotfix Donate Banner Update
2021-05-17 15:31:27 -04:00
Paul Kaplan
efe961e103
Handle more types of project add errors
2021-05-17 15:24:51 -04:00
Eric Rosenbaum
7bfb045c4f
style tiles and send button
2021-05-17 15:16:08 -04:00
Paul Kaplan
cc66341252
Wait for session to be fetched before loading comments
2021-05-17 14:53:02 -04:00
Eric Rosenbaum
a1c9744ee8
tile styling
2021-05-17 14:15:37 -04:00
Paul Kaplan
b6baedcbab
Merge pull request #5433 from paulkaplan/fix-thumbnail-caching
2021-05-17 13:55:30 -04:00
Eric Rosenbaum
3698e12c66
style tweaks
2021-05-17 13:43:20 -04:00
Eric Rosenbaum
c7df1227ff
constrain thumbnail size
2021-05-17 11:51:21 -04:00
Eric Rosenbaum
ba2ef16c0e
studio report tile text content size and overflow
2021-05-17 11:41:18 -04:00
Karishma Chadha
3094602235
Remove end time for donate banner.
2021-05-17 11:32:42 -04:00
Karishma Chadha
cdee0e74f9
Send analytics event when the donate button in the banner is clicked.
2021-05-17 11:31:49 -04:00
Paul Kaplan
168cd5a01b
Update the curator invitation component
2021-05-17 11:05:24 -04:00
Eric Rosenbaum
1281d043b7
styling selected state
2021-05-17 10:52:18 -04:00
Eric Rosenbaum
a76f0b3fac
styling studio report tiles
2021-05-14 17:08:08 -04:00
Eric Rosenbaum
df30f9bac6
add modal for report received
2021-05-14 16:03:22 -04:00
Paul Kaplan
5be42442f6
Use client-side image preview instead of server response
2021-05-14 16:00:15 -04:00
Eric Rosenbaum
20a342c0a2
Merge branch 'develop' of https://github.com/LLK/scratch-www into studio-report-modal
...
# Conflicts:
# src/views/studio/studio-report.jsx
2021-05-14 15:20:41 -04:00
Eric Rosenbaum
454ae1e92f
don’t use html form
2021-05-14 15:15:27 -04:00
Eric Rosenbaum
3a9742c77e
use radio button values in report
2021-05-14 14:51:17 -04:00
Paul Kaplan
789e15c3ab
Make enter submit title field instead of adding newlines
2021-05-14 12:53:11 -04:00
Paul Kaplan
5892f2e7ba
Allow space to trigger submit on project tiles in modal because they are buttons
2021-05-14 12:52:45 -04:00
Paul Kaplan
f222dec925
Trim whitespace from username input
2021-05-14 12:40:58 -04:00
Paul Kaplan
acc88069e9
Allow curators to remove themselves
2021-05-14 12:37:05 -04:00
Paul Kaplan
31655d7f11
Fix issue where multiple overflow menus could be opened at once
2021-05-14 12:25:04 -04:00
Paul Kaplan
6de19b0450
Fix awkward project thumbnail layout issues
2021-05-14 12:22:02 -04:00
Paul Kaplan
304c456de9
Fix loadMore not working for user-projects-modal
2021-05-14 12:02:42 -04:00
Eric Rosenbaum
28a5ee47aa
initial work on studio report modal
2021-05-14 11:46:37 -04:00
Paul Kaplan
44c51a7dc8
Minor style cleanups for studio page
2021-05-14 09:40:56 -04:00
Paul Kaplan
8bc026a958
Merge pull request #5381 from paulkaplan/studio-tile-overflow-menu
...
Studio tile overflow menu
2021-05-14 09:30:56 -04:00
Paul Kaplan
e9728b8a13
Merge pull request #5388 from paulkaplan/studio-project-errors
...
Add error display for studio curator and project adder inputs
2021-05-14 09:30:42 -04:00
Paul Kaplan
d847a57078
Merge branch 'develop' into studio-recent-students
2021-05-14 08:49:25 -04:00
Paul Kaplan
3fad1f6fef
Merge pull request #5397 from paulkaplan/bugfix/studio-playground-may12
...
Bug fixes from studio playground test on May 12
2021-05-14 08:48:43 -04:00
Paul Kaplan
d16042310b
Fixup header styling
2021-05-13 21:45:05 -04:00
Paul Kaplan
2962f78881
Merge pull request #5405 from fsih/avatarStyle
...
Outlines for avatars
2021-05-13 21:23:00 -04:00
Paul Kaplan
f9c1b429f0
Include avatar sizing
2021-05-13 21:22:27 -04:00
Paul Kaplan
a88feb5888
add mutating css class for project toggle and fix imports
2021-05-13 21:07:31 -04:00
Paul Kaplan
1b0b5a09b9
Use the correct l10n string, fix imports and add mutating css class
2021-05-13 21:02:54 -04:00
DD Liu
bd2bcd1331
Outlines for avatars
2021-05-13 17:49:23 -04:00
DD Liu
3d1bd3768e
Replace checkbox with toggle for whether studio is open to all
2021-05-13 16:20:35 -04:00
DD Liu
cccc3abd57
Adjust padding so that the class can be reused for other pages
2021-05-13 16:05:56 -04:00
DD Liu
dffcbebc37
Switch the checkbox to a toggle slider for studio comments allowed
2021-05-13 15:46:34 -04:00
Paul Kaplan
26704990d7
Bonus: update the loadmore style to match other loader sections
2021-05-13 13:24:24 -04:00
Paul Kaplan
e73312c0d2
Show students filter for educators viewing a classroom studio
2021-05-13 13:23:47 -04:00
Paul Kaplan
134cd927ec
Add classroomId to studio reducer
2021-05-13 13:20:26 -04:00
Paul Kaplan
d35c539529
Add validation messages for title, image and description
2021-05-13 10:36:40 -04:00
Zoë Bentley
3fbfb6dfd1
Fixed problem introduced by previous fix
2021-05-13 09:39:08 -04:00
chrisgarrity
132cf487f4
Merge pull request #5391 from LLK/fix-intro-when-logged-in
...
fix logic for when to show intro to users
2021-05-13 09:35:32 -04:00
Paul Kaplan
a190424f7e
Make sure modal always fits inside the screen
2021-05-13 09:22:50 -04:00
Paul Kaplan
231fba944a
Check for duplicates locally before trying to add the project to the studio
2021-05-13 09:06:04 -04:00
Paul Kaplan
4fcdf9b99f
Allow URLs to be passed for the project input
2021-05-13 09:05:23 -04:00
Paul Kaplan
4f6a583277
Add placeholders for project and curator inputs
2021-05-13 09:04:39 -04:00
Paul Kaplan
3a59ea072c
Prevent submission of blank curator/project fields
2021-05-13 08:35:46 -04:00
zoebentley
bf55d26e20
Merge branch 'release/2021-05-12' into dev-page-fix
2021-05-12 16:56:26 -04:00
Zoë Bentley
d5af535ea2
Fixes to Developers' Page
2021-05-12 16:52:16 -04:00
Ben Wheeler
d3685610f6
fix logic for when to show intro to users
2021-05-12 16:27:25 -04:00
Ben Wheeler
316f26bed5
rename .close-button style to not conflict
2021-05-12 14:14:34 -04:00
Paul Kaplan
827dad461e
Add error display for curator and project adder inputs
2021-05-12 13:37:59 -04:00
Paul Kaplan
d265e45b62
Use OverflowMenu for project and curator tile menus
2021-05-12 10:55:23 -04:00
Paul Kaplan
8dddb393a7
Add overflow menu and show example on components page
2021-05-12 10:53:52 -04:00
Paul Kaplan
397ac7334a
Merge branch 'develop' into studio-empty-states
2021-05-11 14:10:56 -04:00
Paul Kaplan
f61047dda0
Merge branch 'develop' into add-studio-activity-pagination
2021-05-11 13:38:15 -04:00
Paul Kaplan
0fdf54339a
Merge branch 'develop' into add-studio-activity-pagination
2021-05-11 12:09:10 -04:00
Paul Kaplan
443dcc28e2
Merge branch 'develop' into feature/studio-project-modal
2021-05-11 12:04:05 -04:00
Eric Rosenbaum
aaff5ab0ce
Merge pull request #5372 from ericrosenbaum/activity-feed-styles
...
Styled studio activity feed
2021-05-11 11:45:24 -04:00
Paul Kaplan
669f701fd3
Fix wrapping on long activity text
2021-05-11 11:33:49 -04:00
Paul Kaplan
b4c9e31d30
Include removecurator notification
2021-05-11 11:33:38 -04:00
Paul Kaplan
02a5c0b4df
Fixup usernames
2021-05-11 10:57:26 -04:00
Eric Rosenbaum
4e580054fc
use import instead of require
2021-05-11 10:51:07 -04:00
Paul Kaplan
c25fb3a9e4
Add empty states for curators and projects
2021-05-11 09:50:34 -04:00
Paul Kaplan
9904586a38
Merge branch 'develop' into bugfix/studio-playground-may5
2021-05-10 21:11:05 -04:00
Paul Kaplan
64ff2cffdd
Move max image size to constant
2021-05-10 21:09:08 -04:00
Paul Kaplan
6ac3012b8c
Use formatted message
2021-05-10 21:02:20 -04:00
Paul Kaplan
62b1f8f3a5
Merge branch 'develop' into feature/studio-project-modal
2021-05-10 20:55:20 -04:00
Paul Kaplan
43eb9e4e91
Include if user projects are already in the studio
2021-05-10 20:46:38 -04:00
Karishma Chadha
a9d70b2cc0
Merge pull request #5370 from kchadha/studio-404-page
...
Set up studios view with 404 page
2021-05-10 17:49:30 -04:00
Sarah Otts
70f7a9ef73
Merge pull request #5331 from zoebentley/update-teacher-faq-and-devs-page-2021
...
Changed Developers and Teacher FAQ pages
2021-05-10 16:43:44 -04:00
zoebentley
dfa9b99728
Update src/views/developers/developers.jsx
...
Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>
2021-05-10 16:40:48 -04:00
Benjamin Wheeler
4591c65e6f
Merge pull request #5345 from benjiwheeler/donate-banner
...
add donate banner, make close button a mode of button component
2021-05-10 16:14:26 -04:00
Eric Rosenbaum
790e433313
lint
2021-05-10 15:13:02 -04:00
Eric Rosenbaum
94d0f30b71
fix missing comma from merge
2021-05-10 14:45:00 -04:00
Eric Rosenbaum
f55d34aab8
Merge branch 'develop' of https://github.com/LLK/scratch-www into activity-feed-styles
...
# Conflicts:
# src/views/studio/l10n.json
# src/views/studio/studio.scss
2021-05-10 14:41:14 -04:00
Karishma Chadha
7876bc4fba
Merge pull request #5359 from kchadha/studio-translation-setup
...
Add l10n file to studios view and replace text with formatted message.
2021-05-10 14:19:40 -04:00
Paul Kaplan
f474525398
Remove unused loadMore functionality from infinite list because it was overly specific, now it is no longer being used by any component
2021-05-10 14:14:46 -04:00
Paul Kaplan
600e5846d0
Move activity loading to studio-activity-actions, include pagination
2021-05-10 14:14:19 -04:00
Karishma Chadha
1b2b595338
Get rid of extra piece of state being tracked in redux and update selector to tell if studio load failed. Use that to display 404 page instead.
2021-05-10 14:01:17 -04:00
Karishma Chadha
040350314b
Set up studios view with 404 page
2021-05-10 13:16:15 -04:00
Eric Rosenbaum
cb3ba550d5
add alt text for icons
2021-05-10 13:01:20 -04:00
Eric Rosenbaum
188b51bbbe
add icons
2021-05-10 12:14:51 -04:00
Paul Kaplan
e2dafff5b7
Include rate limit and 404 error types
2021-05-10 11:59:37 -04:00
Eric Rosenbaum
de85a25db1
use formatted messages for each activity notification
2021-05-10 11:44:39 -04:00
Paul Kaplan
968afdb412
Fix whitespace
2021-05-10 10:29:24 -04:00
Paul Kaplan
35dbcb07ba
Add user projects modal
2021-05-10 10:24:21 -04:00
Paul Kaplan
f1fde9e5f8
Ensure project ID is always a number
2021-05-10 10:23:13 -04:00
Paul Kaplan
95766fd68a
Add clear to infinite list, fixup tests
2021-05-10 10:22:18 -04:00
Karishma Chadha
51bf0d6c3d
Fix lint error
2021-05-10 10:16:54 -04:00
Ben Wheeler
3dd69c287c
Remove stale comments, remove extra space, add padding
2021-05-07 22:23:45 -04:00
Benjamin Wheeler
33e9c88217
Merge pull request #5252 from benjiwheeler/remove-unnecessary-page
...
removed unnecessary Page component
2021-05-07 18:37:32 -04:00
Karishma Chadha
b065ff86d4
Add l10n file to studios view and replace text with formatted message.
2021-05-07 17:04:14 -04:00
Ben Wheeler
3156976fee
update method of checking goodlist of pages for banned user to see
2021-05-07 13:14:53 -04:00
Ben Wheeler
23f2135c17
add donate banner, make close button a mode of button component
2021-05-07 11:50:47 -04:00
Paul Kaplan
7c021b6ac5
Catch too large thumbnails before trying to upload
2021-05-06 09:30:43 -04:00
Paul Kaplan
903eef969f
Allow Enter key to submit curator and project adders
2021-05-06 09:21:32 -04:00
Paul Kaplan
3785108348
Promoted and added curators should go at the end of the list
2021-05-06 09:14:15 -04:00
Paul Kaplan
be088b9513
Fix tab ordering
2021-05-06 09:03:35 -04:00
Paul Kaplan
27bdabcfeb
Fix trailing slash breaking tab navigation
2021-05-06 09:02:05 -04:00
Benjamin Wheeler
732b596c61
Revert "Add privacy policy and terms of use to allowlist"
2021-05-05 16:17:22 -04:00
Paul Kaplan
ec5d424719
Fix firefox mega follower button
2021-05-05 16:08:23 -04:00
Paul Kaplan
bf260acd88
Catch error from user who is already part of studio
2021-05-05 16:08:11 -04:00
Eric Rosenbaum
1232f98195
initial styling
2021-05-05 09:32:46 -04:00
Paul Kaplan
757f95f89c
Merge branch 'develop' into studio-report
2021-05-04 15:13:04 -04:00
Paul Kaplan
2936bc72db
Render the error from reporting
...
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-05-04 15:12:11 -04:00
Zoë Bentley
dc2b431f83
Changed Developers and Teacher FAQ pages
2021-05-03 16:08:36 -04:00
Paul Kaplan
699e30dedd
Fix curator permissions for removing projects
2021-05-03 13:26:50 -04:00
Paul Kaplan
0f8baaaa45
Add tests for new studio permissions
2021-05-03 10:52:04 -04:00
Paul Kaplan
29f6006b40
Add functionality for adding/removing projects and managing curators
2021-05-03 10:20:24 -04:00
Paul Kaplan
4f54e14e63
Merge pull request #5306 from paulkaplan/studio-info-styling
...
Studio info styling
2021-05-03 10:19:17 -04:00
Benjamin Wheeler
7242fbfbf0
Merge pull request #5220 from apple502j/patch-23
...
Add privacy policy and terms of use to allowlist
2021-04-29 13:53:01 -04:00
Ben Wheeler
ec710a1d98
removed redundant goodlist page paths
2021-04-29 13:48:30 -04:00
Paul Kaplan
2f5a01eb1e
Studio reporting using legacy endpoint
2021-04-29 11:14:35 -04:00
Paul Kaplan
ef9318463e
Reset comments when admin logs in
2021-04-29 09:00:50 -04:00
Paul Kaplan
8c104ed351
Remove unused component
2021-04-29 08:50:15 -04:00
Paul Kaplan
1c31d7cf65
Refactor layout and add styling for studio info
2021-04-28 13:44:25 -04:00
Paul Kaplan
129d87642c
Remove unuseable NOT_FETCHED state for studio info
2021-04-28 13:44:24 -04:00
Paul Kaplan
83c896246e
Merge pull request #5274 from paulkaplan/studio-mutations
...
Add client-side editing of studio info
2021-04-27 09:45:30 -04:00
Paul Kaplan
26de328bfe
Handle additional error responses
2021-04-27 09:14:34 -04:00
Paul Kaplan
5827aaab8f
Update permissions for editing open_to_all to match current backend
2021-04-27 09:06:40 -04:00
Paul Kaplan
dec9f96eed
Replace loading with fetching in new components
2021-04-27 09:01:19 -04:00
Paul Kaplan
f9419ac8fc
Fix comment toggling and add permissions test
2021-04-26 15:11:06 -04:00
Paul Kaplan
aab4c9aca6
Update proptypes
2021-04-26 14:52:05 -04:00
Paul Kaplan
c9684b52d3
Add actions for studio open to commenting or project adding
2021-04-26 14:34:12 -04:00
Paul Kaplan
430f67c0e1
Include modifying the studio image
2021-04-26 09:58:34 -04:00
Paul Kaplan
2e029f8966
Move comment mute strings to general l10n file
2021-04-22 09:53:56 -04:00
Paul Kaplan
647575e4a8
Move permissions into its own reducer
2021-04-21 14:52:56 -04:00
Paul Kaplan
82da633e61
Add title, description and following editors
2021-04-21 14:52:56 -04:00
Paul Kaplan
c789a27018
Fix logged in selector with test
2021-04-21 14:52:53 -04:00
Ben Wheeler
e80a343211
removed unnecessary Page component
2021-04-12 15:15:17 -04:00
Paul Kaplan
7c4871c19b
Remove unused reference
2021-04-08 10:57:28 -04:00
Paul Kaplan
74a29a62a0
Hook up delete restore and report actions for studio comments
2021-04-08 10:38:34 -04:00
Paul Kaplan
810eadd258
Remove params from studio comment actions that can be retrieved from state
2021-04-08 10:37:45 -04:00
Paul Kaplan
11794d885a
Add permissions selectors and tests for studio comments
2021-04-08 10:36:56 -04:00
BryceLTaylor
7a5bdc0400
Change class for search input wrapper to search-wrapper
2021-04-06 14:19:05 -04:00
BryceLTaylor
0cd1f6e6be
Add class to searchbar for automated tests
2021-04-06 14:19:05 -04:00
Paul Kaplan
bd279fe557
Stop passing around admin/token info in studio comment component.
...
Instead of getting data out of redux just to pass it back to a dispatch,
use getState in the thunk to get the data we need. This allows the
component to not care about admin/token info, since it is not related
to rendering.
2021-04-05 10:41:19 -04:00
Paul Kaplan
c6b0493e08
Stop passing around studio id and user info for getting studio data
...
Insteaad of passing in the studio id and user data into the component
just to have it used for fetching data, get that data directly from
the redux store from within the thunk. This simplifies the components
and lets them be concerned more with what they render.
2021-04-05 10:32:47 -04:00
Paul Kaplan
f0adda4e3b
Include studio id in the store default data
2021-04-05 10:31:19 -04:00
Paul Kaplan
6ea071e8df
Reorder and add selector for studio id
2021-04-05 10:30:35 -04:00
Paul Kaplan
8267dcf16a
Fix TODO and add selector for studio comment capability
2021-04-02 12:43:32 -04:00
Paul Kaplan
dc460fffde
Merge branch 'develop' into studio-selectors
2021-04-02 12:36:44 -04:00
Paul Kaplan
cd8ae4b197
Use lodash.get to simplify permissions, move test data into fixtures for better testing
2021-04-02 12:33:18 -04:00
apple502j
9a3fc9876c
Add privacy policy and terms of use to allowlist
2021-04-02 04:28:27 +09:00
Paul Kaplan
3a9dde404e
Include onAddComment for studio comments
2021-04-01 14:05:22 -04:00
Benjamin Wheeler
3a62fa3a51
Merge pull request #5017 from JoelGritter/patch-1
...
Fix gh-4913: MacOS version string update
2021-04-01 13:31:57 -04:00
Karishma Chadha
7eb583a867
Merge pull request #5217 from kchadha/studio-comments-fetching
...
Studio Comments Fetching & Initial UI
2021-04-01 12:36:55 -04:00
Paul Kaplan
6026ededd3
Only pass explicit props to prepare for better permission selectors
2021-04-01 09:41:52 -04:00
Paul Kaplan
8434a06a90
Remove extra check for logged in
2021-04-01 09:29:52 -04:00
Paul Kaplan
8bc6e4ee77
Remove unneeded debug info
2021-04-01 09:24:13 -04:00
Paul Kaplan
1ad53aeb23
Add postURI which was left off by mistake
2021-04-01 09:23:59 -04:00
Paul Kaplan
ead57013e3
Use useCallback instead of binding anonymous function
2021-04-01 09:23:42 -04:00
Paul Kaplan
b8b56fff61
Destructure props to clean up the code
2021-04-01 09:23:16 -04:00
Karishma Chadha
073c14e6da
Add UI for composing a comment and seeing the list of comments on the studio comments tab. Starting to fill in some additional state information like logged in state
2021-03-31 16:38:44 -04:00
BryceLTaylor
11c773deb4
Move the studio route from routes-dev.json to routes.json
2021-03-31 16:23:00 -04:00
Karishma Chadha
4d5fdf6094
Generalize comment components for use with projects and studios by taking passing in the POST URI as a prop. Update project page to accommodate the new prop.
2021-03-31 16:19:19 -04:00
Karishma Chadha
9c83271af7
Create studio comment action creators. Add comments reducer and initial studio comment actions to studio comments view. Display preliminary data fetching.
2021-03-31 14:41:49 -04:00
Eric Rosenbaum
4a7d909671
Merge pull request #5211 from ericrosenbaum/more-components
...
Add more components to the components page
2021-03-31 11:36:56 -04:00
Ben Wheeler
491735b9f0
use smaller svgs instead of pngs
2021-03-30 21:32:54 -04:00
Eric Rosenbaum
542c416ea7
lint
2021-03-30 15:49:33 -04:00
Eric Rosenbaum
ec0f41286d
lint
2021-03-30 15:44:41 -04:00
Eric Rosenbaum
eec9b29516
add text area
2021-03-30 15:41:52 -04:00
Eric Rosenbaum
2ff5e8d8fb
styling
2021-03-30 10:53:06 -04:00
Eric Rosenbaum
33b7d87840
update grid json
2021-03-30 10:52:57 -04:00
Eric Rosenbaum
8b98820495
Add nav bubbles
2021-03-24 16:12:47 -04:00
Eric Rosenbaum
82d759e30a
grid displays “Project Title”
2021-03-24 16:12:37 -04:00
Paul Kaplan
8a33d1c5a5
Re-export missing base comment actions to simplify
2021-03-24 14:48:05 -04:00
Paul Kaplan
9252d56376
Merge branch 'develop' into comments-reducer
2021-03-24 14:35:12 -04:00
Eric Rosenbaum
9466a7b75b
add grid
2021-03-23 16:58:38 -04:00
seotts
f6f1095d93
add justMuted variable, fix linting
2021-03-23 16:33:24 -04:00
seotts
60bf05fbbf
Reuse l10n strings instead of duplicating them
2021-03-23 15:45:16 -04:00
Paul Kaplan
8144b0c2e1
Display permissions selectors in the playground
2021-03-23 15:19:28 -04:00
Paul Kaplan
99195d6df3
Add studio selector and tests
2021-03-23 15:19:01 -04:00
Paul Kaplan
f03fbb503b
Add session selector and tests
2021-03-23 15:18:36 -04:00
Paul Kaplan
2265cd0d90
Add permissions selector and tests
2021-03-23 15:18:17 -04:00
seotts
ccab9566b8
Show different modal message when muted in the past
2021-03-23 11:00:01 -04:00
Eric Rosenbaum
6080facb66
Merge pull request #5171 from ericrosenbaum/fix-components-page
...
Fix components page
2021-03-23 10:04:17 -04:00
Zoë Bentley
138ed7339e
Fixed other place where date appears
2021-03-23 09:57:50 -04:00
Eric Rosenbaum
2330553765
re-add the carousel component in a box
2021-03-22 17:27:52 -04:00
Eric Rosenbaum
10f9194f61
fix form and carousel enough to display them
2021-03-22 17:24:18 -04:00
Paul Kaplan
cd0ab5dbc8
Merge pull request #5164 from paulkaplan/studio-roles
...
Fetch studio info and roles in redux
2021-03-22 11:09:44 -04:00
Sarah Otts
a087ac4f18
Merge pull request #5165 from zoebentley/conference-update-followup-march-2021
...
Made small updates to Scratch 2021 Conference page
2021-03-22 10:47:53 -04:00
Sarah Otts
059b6bf2c5
Merge pull request #5166 from seotts/message-already-muted
...
When a user is already muted, show a different message in the blue box
2021-03-22 10:20:15 -04:00
Zoë Bentley
bb46884667
replaced header image and modified strings
2021-03-19 15:23:12 -04:00
seotts
5d7d1cde3d
Add comments; fix reply logic
2021-03-19 15:18:36 -04:00
Paul Kaplan
57495259cf
Fix lint and remove unused code
2021-03-19 15:12:45 -04:00
Paul Kaplan
a97263cb91
Fetch studio info and roles in redux
2021-03-19 14:56:39 -04:00
seotts
94eb3dc6de
Continued work
2021-03-18 16:15:11 -04:00
Paul Kaplan
fd7b2ce41b
Replace remixes which was removed by mistake
2021-03-18 15:18:55 -04:00
Paul Kaplan
183a31d5ed
Merge pull request #5149 from paulkaplan/studio-redux-modules
...
Reusable redux module for fetching paginated data
2021-03-18 11:56:27 -04:00
Paul Kaplan
4029f431b3
Fix linting
2021-03-18 11:42:01 -04:00
Paul Kaplan
96589f4066
Comment the useEffect usage
2021-03-18 11:38:38 -04:00
Paul Kaplan
f40f3fa7c7
Rename variables
2021-03-18 11:31:28 -04:00
Paul Kaplan
ac6b4616ba
Split project specific comment actions
2021-03-18 11:21:41 -04:00
Paul Kaplan
296c04ff99
Merge branch 'develop' into comments-reducer
2021-03-18 11:20:47 -04:00
seotts
23da1e2781
Continued work
2021-03-17 16:07:30 -04:00
Sarah Otts
c3342d9224
Merge pull request #5121 from zoebentley/conference-update-march-2021-fixed-dependencies
...
Made changes to conf 2020 page (fixed dependencies)
2021-03-16 15:05:48 -04:00
Paul Kaplan
eb3bdfee56
Fix linting
2021-03-16 14:58:54 -04:00
Zoë Bentley
9e74481db4
Changed the date to be only one day, July 22
2021-03-16 14:57:04 -04:00
Paul Kaplan
acedd550da
Use the infinite loading module for all the data
2021-03-16 14:18:22 -04:00
Paul Kaplan
6b87429e65
Create a redux module for infinitely loading editable lists
2021-03-16 14:17:52 -04:00
Paul Kaplan
560379f9fb
Simple data fetching using react hooks
2021-03-16 14:17:52 -04:00
seotts
cf71b77622
Work on adding messaging for previous mute
2021-03-15 15:42:12 -04:00
Paul Kaplan
7b7266c5b4
Merge pull request #5117 from paulkaplan/studio-route
...
Add dev route with very bare studio playground
2021-03-15 12:03:24 -04:00
chrisgarrity
8271bb62bb
Merge pull request #5141 from seotts/prevent-feedback-when-not-just-muted
...
Prevent feedback when not just muted
2021-03-15 09:10:48 -04:00
Sarah Otts
da64706b0d
Remove unused FlexRow
2021-03-12 09:10:25 -05:00
seotts
936172d70b
only show feedback link for new mute
...
Add variable for isBad string
2021-03-11 13:06:51 -05:00
seotts
f78a683b09
Update link to LLK to new Media Lab url
2021-03-10 16:16:06 -05:00
Paul Kaplan
fb4370b412
Remove dev routes on staging
2021-03-10 15:09:07 -05:00
Zoë Bentley
eabab89bd5
Made changes to conf 2020 page (fixed dependencies)
2021-03-10 11:13:46 -05:00
Paul Kaplan
24cdd291ca
Add staging route for studio playground
2021-03-09 15:32:35 -05:00
Sarah Otts
dc9d079e4b
Merge pull request #5116 from seotts/revert-revert-zoe-content-update
...
Revert "Revert "Content updates march 2021""
2021-03-09 15:10:48 -05:00
seotts
a1759f42b3
Revert "Revert "Content updates march 2021""
...
This reverts commit 65f69d1201
.
2021-03-09 14:38:36 -05:00
Ben Wheeler
4533c983fd
converted images around splash video to png, smaller file size
2021-03-09 10:15:44 -05:00
Paul Kaplan
49e62afa8b
Fix typo in mapStateToProps
2021-03-08 12:27:32 -05:00
Paul Kaplan
27dafac7f0
Move comments out of project reducer
2021-03-08 12:01:22 -05:00
Sarah Otts
cfb0a00414
Copy update on spam header
2021-03-04 16:19:39 -05:00
seotts
2cb9189b44
Add spam mute message
2021-03-04 13:49:38 -05:00
Sarah Otts
65f69d1201
Revert "Content updates march 2021"
2021-03-03 15:39:25 -05:00
Sarah Otts
4a625a634a
Merge pull request #5078 from zoebentley/content-updates-jan-2021
...
Content updates march 2021
2021-03-02 16:57:26 -05:00
Zoë Bentley
e2c98762fa
Updated people.json
2021-03-02 15:02:23 -05:00
zoebentley
e756d751c6
Update src/views/credits/credits.jsx
...
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-03-02 14:40:57 -05:00
zoebentley
43e2eb22dd
Update src/views/about/about.jsx
...
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-03-02 14:31:46 -05:00
zoebentley
695efb77c0
Update src/views/about/about.jsx
...
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-03-02 14:28:38 -05:00
zoebentley
eb93e2dd9a
Update src/views/about/about.jsx
...
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-03-02 14:28:12 -05:00
zoebentley
d2ec8e804e
Update src/views/credits/credits.scss
...
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-03-02 14:19:29 -05:00
Zoë Bentley
d41a230e83
Added newline at end of file and changed languages count to be rounded down to 60
2021-03-02 14:09:52 -05:00
seotts
ec3a205dea
Create Plotly bundle to load only choropleth
...
lint
2021-03-01 16:22:02 -05:00
Zoë Bentley
559f3d412c
Updated list of usernames
2021-03-01 14:48:01 -05:00
Paul Kaplan
dce9b99a62
Merge pull request #5058 from paulkaplan/split-phone-bundle
...
Don't require a big phone number validation library on every page
2021-03-01 08:43:43 -05:00
Paul Kaplan
b0390f36a2
Fix lint and missing components
2021-02-26 11:01:13 -05:00
Paul Kaplan
0353135cc4
Split phone number step to reduce bundle for other registration pages
2021-02-26 10:31:20 -05:00
Paul Kaplan
da2ca40ccf
Only require libphonenumber when rendering phone inputs
2021-02-26 10:31:19 -05:00
Sarah Otts
faf9fcd26c
Merge pull request #5022 from zoebentley/sec-update-feb-2021
...
Change wording and image size on SEC page
2021-02-23 09:27:24 -05:00
Zoë Bentley
bc7063a65d
Made updates to wording on SEC page and changed size of image
2021-02-19 14:48:43 -05:00
Zoë Bentley
3fd4337f6e
lint
2021-02-19 12:04:14 -05:00
Zoë Bentley
118ffadb76
Changed images on About page and changed many text strings
2021-02-19 12:04:13 -05:00
Zoë Bentley
1caa1da81f
Began making changes to Credits page
2021-02-19 12:04:13 -05:00
Paul Kaplan
d79ae074b2
Update eslintrc for new UNSAFE_ rule
2021-02-19 11:39:21 -05:00
Paul Kaplan
56345874e3
Mark deprecated methods with UNSAFE_ prefix
2021-02-19 11:12:00 -05:00
Joel Gritter
e0e3a0c342
MacOS version string update
...
"Mac OSX 10.4 or later" -> "Mac OSX 10.4 through 10.14"
Fixes gh-4913
2021-02-18 13:37:12 -05:00
picklesrus
41f7fcd68d
Update relative-time-polyfill.js
2021-02-16 14:07:26 -05:00
picklesrus
14db1428f1
Update relative-time-polyfill.js
2021-02-16 14:06:10 -05:00
picklesrus
91c256ad75
Fix pluralrules polyfill
...
This should hopefully fix the Safari 12 issues we were having.
2021-02-16 14:06:02 -05:00
picklesrus
d22049a22e
update feedback mistaake message
2021-02-16 14:05:12 -05:00
seotts
7bd6c98b0a
Fix proptype of startStep
2021-02-16 14:04:24 -05:00
seotts
e98e90dd4e
send automod feedback to api
2021-02-16 14:04:17 -05:00
Karishma Chadha
ca392e6d5b
Fix lint errors related to eslint-config-scratch update
2021-02-16 10:54:50 -05:00
picklesrus
4e97e7c60e
Merge pull request #4943 from picklesrus/reply-mute
...
Open mute modal from reply button if you're muted.
2021-02-08 13:28:21 -05:00
picklesrus
7c382a73fa
Fix double reply button click bug by "cancelling" the reply when you click it and are already muted.
2021-02-08 07:38:39 -05:00
picklesrus
de5a8026c1
Show the blue box on replies that got the user muted.
2021-02-05 08:16:00 -05:00
picklesrus
9a3fe8f222
Show the correct step of the modal based on whether the reply was just a click to try to reply while already muted or whether they replied and got muted.
2021-02-05 08:01:33 -05:00
picklesrus
92667c097d
Add tests and expose steps enum so it can be referenced from outside MuteModal
2021-02-04 11:13:30 -05:00
chrisgarrity
baba146ffb
Merge pull request #4895 from chrisgarrity/relative-time-polyfill
...
Add @formatjs/relativetimeformat-polyfill
2021-02-02 11:35:52 -05:00
picklesrus
f7bf204924
Draft: open mute modal from reply button if you're muted.
2021-02-02 11:34:27 -05:00
Chris Garrity
ae2bc24ffd
Add @formatjs/relativetimeformat-polyfill
...
Safari < 14 does not support Intl.RelativeTimeFormat which is used in the moderation messaging. Adding this polyfill to support it. RelativeTimeFormat depends on Locale, which is also not available in Safari <14, and PluralRules, not available in Safari < 13.
There is a trade off between adding locale-data for all users that load the page regardless of what browser they’re using and whether they get muted, and only localizing the most common languages.
In the last 30 days only ~3% of users on scratch use a version of Safari (13.x) that doesn’t support Intl. Of that 3%, these 7 locales would cover over 60% of the users. English will be used by default if the locale data is not available.
2021-02-02 09:07:38 -05:00
Sarah Otts
f60a8c71a0
Merge pull request #4901 from seotts/automod-feedback-modal
...
Automod feedback modal steps
2021-02-02 08:58:47 -05:00
picklesrus
6d53018486
Merge pull request #4938 from picklesrus/zero-minutes-fix
...
Change time library to default to 1 minute when the time remaining is less than 30 seconds.
2021-02-01 15:56:37 -05:00
seotts
ba99d49298
Fix FeedbackForm tests + other small fixes
...
Add strings
2021-02-01 15:50:55 -05:00
picklesrus
e6f056b178
Add message at the top of file mentioning the version in scratchr2
2021-02-01 15:35:02 -05:00
Karishma Chadha
26d3bb73c6
Merge pull request #4932 from LLK/hotfix/sec-text-update
...
[Develop] Hotfix SEC Page Text Update
2021-02-01 10:32:27 -05:00
picklesrus
b8cc0b2b83
Change time library to default to 1 minute when the time remaining is less than 30 seconds.
2021-02-01 09:53:46 -05:00
Zoë Bentley
e51591620f
Changed text on SEC page (for hotfix)
2021-01-29 14:56:47 -05:00
seotts
42eb195b57
move feedback form to its own component
2021-01-28 15:45:00 -05:00
picklesrus
259446ed8e
Set buttons to be disabled (and not just look disabled) when the user was just muted. They were clickable before.
2021-01-28 15:07:20 -05:00
Chris Garrity
64c89b1716
Update to the general moderation message.
2021-01-28 12:11:35 -05:00
Chris Garrity
d639c2d7a9
Fix typo
2021-01-28 11:01:09 -05:00
Sarah Otts
90e0f40886
Merge branch 'develop' into automod-feedback-modal
2021-01-26 15:30:26 -05:00
seotts
a037395689
Merge branch 'automod-feedback-modal' of https://github.com/seotts/scratch-www into seotts-automod-feedback-modal
...
# Conflicts:
# src/components/modal/mute/modal.jsx
# src/components/modal/mute/modal.scss
# src/l10n.json
2021-01-26 15:27:05 -05:00
Chris Garrity
1afa2a3e33
Adjust formatting of the comment status box
...
Reduce the width of the comment status paragraphs to make them easier to read. Ensure that the bottom text is still below all other text by making it 100% width.
2021-01-26 08:58:01 -05:00
Chris Garrity
eac7552841
Revise messaging when scratchers are muted
...
We want folks to use comments appropriately, not punish them. Reword the messaging to be more friendly and encourage positive uses of comments.
2021-01-26 08:42:41 -05:00
seotts
9df36b0fcf
add tests for feedback form, clean-up form
2021-01-25 17:52:59 -05:00
Benjamin Wheeler
0155d28ea5
Merge pull request #4831 from GrahamSH-LLK/develop
...
Update 1.4 Copytext
2021-01-25 13:32:48 -05:00
Ben Wheeler
7810eab73b
slight change to wording about newer versions of scratch
2021-01-25 13:31:59 -05:00
seotts
f2a3dfda1b
Revert "Revert "Use formik for feedback form""
...
This reverts commit c22c2c967b
.
2021-01-22 15:14:21 -05:00
seotts
037f91e76c
Revert "Revert "Add feedback step using a Formsy textarea""
...
This reverts commit 1bc3aaf0ee
.
2021-01-22 15:14:06 -05:00
seotts
1bc3aaf0ee
Revert "Add feedback step using a Formsy textarea"
...
This reverts commit 5e4fc154c6
.
2021-01-22 15:12:14 -05:00
seotts
c22c2c967b
Revert "Use formik for feedback form"
...
This reverts commit 512358e9af
.
2021-01-22 15:12:14 -05:00
seotts
b42966ac6a
Revert "Add feedback step using a Formsy textarea"
...
This reverts commit 5e4fc154c6
.
2021-01-22 12:13:40 -05:00
seotts
af56e2389c
Revert "Use formik for feedback form"
...
This reverts commit 512358e9af
.
2021-01-22 12:13:03 -05:00
seotts
512358e9af
Use formik for feedback form
...
cleanup
2021-01-22 11:58:56 -05:00
seotts
5e4fc154c6
Add feedback step using a Formsy textarea
2021-01-22 11:58:56 -05:00
seotts
9d08b69bed
show correct messaging instead of always General
2021-01-20 13:03:39 -05:00
picklesrus
a5f436a4c0
Update compose-comment.jsx
...
Fix whitespace
2021-01-14 08:05:47 -05:00
picklesrus
6eca07a413
Fix syntax error from merge
2021-01-14 07:55:54 -05:00
picklesrus
1326f71abe
Merge branch 'develop' into timeout-mute
2021-01-14 07:47:47 -05:00
picklesrus
55d69b0e7b
merge
2021-01-14 07:43:53 -05:00
picklesrus
47d63cb529
Reset more of the state when a mute expires.
...
This allows the comment box to show up again in a normal state with no
errors.
2021-01-14 07:42:53 -05:00
Paul Kaplan
e1d0329633
Fix lint issues again
2021-01-13 09:39:36 -05:00