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
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
Paul Kaplan
4ca6e52233
Fix formatting
2021-01-13 09:29:40 -05:00
Paul Kaplan
2a0aa3b03e
Add the FAQ
2021-01-13 08:55:22 -05:00
Paul Kaplan
5883070647
Update SEC page content
2021-01-12 15:59:59 -05:00
Benjamin Wheeler
596343048a
Merge pull request #4748 from mxmou/fix-search-loadmore
...
Fix "Load more" scrolling on search results
2021-01-12 14:51:35 -05:00
picklesrus
19ef91d3d0
Merge pull request #4827 from picklesrus/mute-modal-vertical
...
Update vertical spacing on mute modal
2021-01-12 10:31:28 -05:00
Ben Wheeler
07f6639ef3
changed wording of no javascript message per design team input
2021-01-11 14:04:55 -05:00
apple502j
62d4db7796
Add noscript tag
2021-01-11 14:04:55 -05:00
seotts
1aa59edaa3
Remove use of FormattedHTMLMessage
2021-01-08 14:03:29 -05:00
seotts
31016df1f5
Don’t fail if mute_status isn’t available
2021-01-07 14:05:02 -05:00
seotts
c8373ab888
Revert "Revert "Add new mute message types""
...
This reverts commit 1575ed06cf
2021-01-07 14:04:48 -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
Sarah Otts
1575ed06cf
Revert "Add new mute message types"
2021-01-06 16:51:03 -05:00
Karishma Chadha
6d8cac4239
Merge pull request #4817 from LLK/hotfix/sec-google-nolink
...
[Develop] Hotfix sec google nolink
2021-01-06 10:56:41 -05:00
Karishma Chadha
3bdb5abdd5
Merge pull request #4814 from kchadha/annual-report-credits
...
Add Tracy to credits page and Annual Report team section.
2021-01-06 10:44:06 -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
Karishma Chadha
edca23f6ce
Add Tracy to credits page and Annual Report team section.
2021-01-05 15:51:38 -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
f3dbe23c5e
Fix syntax error from merge
2021-01-04 11:20:16 -05:00
Sarah Otts
b9892ff6d8
Merge branch 'develop' into automod-new-messaging
2021-01-04 11:09:29 -05:00
picklesrus
664ccc5d36
Update compose-comment.jsx
...
Fix missing comma from bad merge
2020-12-21 10:49:16 -05:00
picklesrus
15a16e5b58
Merge branch 'develop' into timeout-mute
2020-12-21 08:38:37 -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
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
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
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
19b260a4a5
Add a timeout to stop displaying the mute status when a mute expires.
2020-12-15 14:49:35 -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
MaxiMouse
8f4c67144a
Fix "Load more" scrolling on search results
2020-12-10 22:12:51 +01: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
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
picklesrus
b1d4c6d1b5
Add backup langauges and remove tests that aren't useful.
2020-12-07 15:38:58 -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
Paul Kaplan
591b3ce6a2
Add Google.org to intro paragraph on SEC
2020-12-04 09:13:02 -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
Karishma Chadha
760e303d30
Merge pull request #4617 from kchadha/annual-report-data-cleanup
...
Annual Report - Break out supporters list into separate JSON
2020-11-16 10:15:28 -05:00
Karishma Chadha
4728e3f50e
Merge pull request #4615 from kchadha/annual-report-link
...
Add link to annual report from about page
2020-11-16 10:15:02 -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
bfc4202d11
Use singular units so the library handles plurals.
2020-11-13 14:14:42 -05:00
Benjamin Wheeler
79d3d07dcc
Merge pull request #4284 from doc-han/patch-1
...
update translation URL
2020-11-13 14:13:16 -05:00
