Sarah Otts
f60a8c71a0
Merge pull request #4901 from seotts/automod-feedback-modal
...
Automod feedback modal steps
2021-02-02 08:58:47 -05:00
seotts
ba99d49298
Fix FeedbackForm tests + other small fixes
...
Add strings
2021-02-01 15:50:55 -05:00
seotts
42eb195b57
move feedback form to its own component
2021-01-28 15:45:00 -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
seotts
9df36b0fcf
add tests for feedback form, clean-up form
2021-01-25 17:52: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
picklesrus
4879570561
Update vertical spacing on mute modal
...
This reduces the vertical padding in the mute modal to better fit on shorter screens.
2021-01-07 11:07:39 -05:00
Karishma Chadha
090312bf56
Merge pull request #4736 from seotts/world-map-fix
...
World map fixes - Border thickness, Eswatini, remove unused css
2021-01-06 10:43:50 -05:00
Sarah Otts
78d001e127
Merge pull request #4737 from seotts/team-new-tabs
...
In the Annual Report Team section, open link to Scratch Team members in new tab
2021-01-05 14:38:03 -05:00
Sarah Otts
b9892ff6d8
Merge branch 'develop' into automod-new-messaging
2021-01-04 11:09:29 -05:00
picklesrus
9037f8817a
Merge pull request #4774 from picklesrus/warning-mute
...
Show warning message when user has been muted several times.
2020-12-21 08:36:21 -05:00
seotts
7e140b3832
add new mute messages
...
Get correct mute message info for modal
remove extra spapce
2020-12-18 10:24:43 -05:00
picklesrus
d8ad0c38ea
Show warning message when user has been muted several times.
2020-12-17 15:43:07 -05:00
picklesrus
1aca3c0f25
Merge pull request #4768 from picklesrus/fix-prop-warning
...
Fix prop type. muteStepContent is an array not a string.
2020-12-17 10:00:26 -05:00
Benjamin Wheeler
aeaca81fb7
Merge pull request #4686 from benjiwheeler/api-check-username
...
switch educator registration checkusername endpoint from scratchr2 to api
2020-12-16 20:43:19 -05:00
picklesrus
760082d2d7
Fix prop type. muteStepContent is an array not a string.
2020-12-16 07:54:20 -05:00
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
seotts
b7cf82494b
Remove unused variable and fix spacing
2020-12-07 16:16:42 -05:00
picklesrus
f4f6b70f2e
Merge branch 'develop' into readable-time
2020-12-07 16:05:02 -05:00
seotts
1d70ee243c
Make borders smaller, show data for Eswatini
2020-12-07 12:45:01 -05:00
seotts
86650e1ce9
open link to Scratch Team member in new tab
2020-12-07 12:43:43 -05:00
picklesrus
b450d36a64
Redo time based on new requirements.
2020-11-30 16:16:52 -05:00
Sarah Otts
fec148ac74
Merge pull request #4682 from LLK/annual-report-video-spinner
...
Add loading spinner in Annual Report
2020-11-25 15:29:11 -05:00
Ben Wheeler
590873c765
switch educator registration checkusername endpoint from scratchr2 to api
2020-11-24 13:54:11 -05:00
seotts
246798b69d
Use “play” event listener; clean-up code
2020-11-23 12:17:12 -05:00
seotts
785386b1c7
add newline to end of file
2020-11-23 11:15:44 -05:00
seotts
f75337dafd
preload spinner image
2020-11-19 10:27:01 -05:00
seotts
cf9cbdf392
Hide iframe & show spinner until it begins playing
2020-11-16 14:33:46 -05:00
seotts
cb01cb9321
use Wistia api to do callback
2020-11-16 12:36:07 -05:00
Karishma Chadha
e14b6d52f3
Add spinner while video is still loading
2020-11-10 14:37:18 -05:00
picklesrus
b8b0f5d10c
Merge pull request #4580 from picklesrus/modal-image-updates
...
A few small upates to the muting modal
2020-11-10 09:52:41 -05:00
picklesrus
495edd1820
A few small upates:
...
- Add images and update styles to match.
- Add timeMuted prop so it can display how long the user is muted for.
- Text updates
This still needs localization.
2020-10-30 10:07:43 -04:00
seotts
a8058aa0bf
remove comments; add new lines
2020-10-27 15:29:50 -04:00
Karishma Chadha
da1e8c00c5
Update translation image in reach section. Fix remaining world map prop type warning.
2020-10-27 01:20:04 -04:00
seotts
d68691de40
add map key
2020-10-26 17:36:23 -04:00
rschamp
59f0f2c093
Make the map always 100% width with 2:1 aspect ratio
2020-10-22 15:20:31 -04:00
Karishma Chadha
df27950a31
Remove mapHeight and mapWidth prop validation since they're no longer in use
2020-10-22 12:20:26 -04:00
rschamp
67ff392776
Start on responsive map
2020-10-22 11:50:48 -04:00
seotts
551eea91b5
Revert "Add CPS video"
...
This reverts commit ec97646bf7430e874b0045a61a5f9d39d4c862de.
2020-10-22 11:50:48 -04:00
seotts
be49e209bb
Revert "Add ability to display YouTube in addition to Wistia"
...
This reverts commit 8d758f0420b967aa5d3f9e9c14b9f9201c2702a6.
2020-10-22 11:50:48 -04:00
seotts
ff6a3eb30f
Add CPS video
2020-10-22 11:50:48 -04:00
