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
Benjamin Wheeler
0c911da463
Merge pull request #4563 from GrahamSH-LLK/patch-1
...
Add "FloralSunset" to Credits Page
2020-12-18 20:54:41 -05:00
picklesrus
ad5dc31cc7
Have mute modal always show if you post a comment and showWarning is true.
2020-12-18 09:30:02 -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
picklesrus
a39244ea6c
Merge branch 'develop' into timeout-mute
2020-12-14 13:27:12 -05:00
chrisgarrity
17407f0fcf
Merge pull request #4752 from chrisgarrity/localize-mute
...
Localize mute
2020-12-11 16:19:27 -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
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
GrahamSH
88aee16cb7
Move to fix alphabetization
2020-12-10 16:59:07 -05:00
Benjamin Wheeler
8d4a5c2f91
Merge pull request #4526 from Purple-Hacker/patch-2
...
Updated addresses on DMCA
2020-12-10 14:21:28 -05:00
Benjamin Wheeler
0aa15b91c9
Merge pull request #2763 from apple502j/patch-10
...
Change min height
2020-12-10 14:15:19 -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
b1d4c6d1b5
Add backup langauges and remove tests that aren't useful.
2020-12-07 15:38:58 -05:00
Colby Gutierrez-Kraybill
6dc8d5ec74
Update routes.json
2020-12-02 14:18:47 -05:00
Colby Gutierrez-Kraybill
c92f161fa1
Merge pull request #4717 from LLK/hotfix/gh-4708
...
[release] gh-4708
2020-12-02 13:50:22 -05:00
Colby Gutierrez-Kraybill
f151f8dfeb
Missing end optional parameter regex in annual-report
2020-12-02 13:30:15 -05:00
Colby Gutierrez-Kraybill
4973ff4a5d
Follow the pattern of other routes, like contact-us for parameter ignoring in annual-report route
2020-12-02 12:16:44 -05:00
Colby Gutierrez-Kraybill
fd6018a92f
Allow extra parameters to match annual-report route
2020-12-02 12:07:12 -05:00
Paul Kaplan
f315ea2f15
Update the SeC page wording
...
Replace the phrase "historically underrepresented in computing” with “ historically excluded from computing.”
Change requested from KO.
2020-12-01 13:32:36 -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
picklesrus
0f83b0c7c8
Merge pull request #4655 from picklesrus/use-minutes
...
Disable comment box functionality when you've just been muted.
2020-11-25 10:18:41 -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
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
Zoë Bentley
dad5a34fbe
Changed Teacher Accounts Setup Guide link to PDF link on resources server
2020-11-18 12:50:22 -05:00
Zoë Bentley
1bfa0f20a3
Changed Teacher Account Setup Guide link from .doc to .PDF
2020-11-18 12:05:33 -05:00
Ray Schamp
433a5c7100
Merge pull request #4664 from LLK/hotfix/hoc-banner-2020
...
[Develop] HOC banner 2020
2020-11-18 10:23:56 -05:00
Ray Schamp
470620a12a
Merge pull request #4654 from LLK/hotfix/hoc-banner-2020
...
[Release] HOC banner 2020
2020-11-18 10:20:53 -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
Ben Wheeler
a4689fc159
Turn off middle banner and set HoC start and end times for 2020
2020-11-17 15:04:29 -05:00
Ben Wheeler
bd3ef208f6
added makeItFly image and text for HoC banner
2020-11-17 15:04:07 -05:00
Paul Kaplan
2292fc039d
Merge pull request #4649 from LLK/hotfix/sec-page
...
[Hotfix/Develop] SEC page
2020-11-17 11:17:43 -05:00
Paul Kaplan
b92b98bd19
Fix hyphens
2020-11-16 15:19:42 -05:00
Paul Kaplan
2799bc97f6
Fix lint error
2020-11-16 14:39:37 -05:00
seotts
cf9cbdf392
Hide iframe & show spinner until it begins playing
2020-11-16 14:33:46 -05:00
Paul Kaplan
ee645b250a
Add culturally sustaining link
2020-11-16 14:31:31 -05:00
Christopher Willis-Ford
35839ada12
remove version number from micro:bit firmware URL
...
This new URL will be a redirect to the actual file, including the
version number. This way we'll be able to deploy firmware updates
without needing to change any content in this repository.
2020-11-16 11:04:36 -08:00
seotts
cb01cb9321
use Wistia api to do callback
2020-11-16 12:36:07 -05:00
Paul Kaplan
550a661687
Add SEC page
2020-11-16 10:35:40 -05:00
picklesrus
b1f7a2be10
Merge pull request #4637 from picklesrus/use-minutes
...
Convert mute timestamp to always show in minutes.
2020-11-16 10:28:55 -05:00
