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
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
Ben Wheeler
f2111eb5a3
updated number of languages
2020-11-13 14:11:25 -05:00
picklesrus
13369c3809
add spaces
2020-11-13 08:37:18 -05:00
picklesrus
6eb7504442
Initial time formatting pass. Does integer minutes, hours, days.
...
TODOS:
- set langauge appropriately
- do partial hours and days. e.g. 1 hour 5 minutes instead of just 1
hour.
Add a time formatting utility that formats a relative time in the future.
Use it in the mute modal & comment box.
2020-11-13 08:26:54 -05:00
Ben Wheeler
ccf0e92e98
removed communityblocks-interviews from routeAlias entries
2020-11-12 13:43:33 -05:00
Radman Siddiki
89c5ea324b
Remove Community Blocks Interviews Route
2020-11-12 13:43:33 -05:00
Radman Siddiki
b74d857ad9
Delete communityblocks-interviews.jsx
2020-11-12 13:43:33 -05:00
Karishma Chadha
e14b6d52f3
Add spinner while video is still loading
2020-11-10 14:37:18 -05:00
picklesrus
2005b23777
Merge pull request #4616 from picklesrus/mute-behavior
...
Skeleton of code to show mute modal and comment status.
2020-11-10 10:24:04 -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
