Commit graph

9346 commits

Author SHA1 Message Date
Renovate Bot
e7bcc7f04a
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211030111946 2021-10-30 12:16:34 +00:00
renovate[bot]
38bd7bc087
Merge pull request #6235 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211030054732
2021-10-30 08:50:33 +00:00
Renovate Bot
a700933d10
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211030054732 2021-10-30 08:43:00 +00:00
renovate[bot]
d3825bdc23
Merge pull request #6234 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20211030031545
2021-10-30 08:39:55 +00:00
Renovate Bot
28dfe5a3e1
chore(deps): update dependency scratch-l10n to v3.14.20211030031545 2021-10-30 04:43:02 +00:00
Karishma Chadha
c60705d8f5
Merge pull request #6229 from bocoup/annual-report-2020
Annual Report Fixes
2021-10-29 17:57:32 -04:00
caseymm
4bd6b239e2 set max width for tweets on small view -- fixes ios bug 2021-10-29 14:10:53 -07:00
BryceLTaylor
b5dc993689 Make project reply test match studio reply test 2021-10-29 16:18:55 -04:00
BryceLTaylor
bf9b14633f Add studio comment reply integration test 2021-10-29 16:18:18 -04:00
renovate[bot]
eb23ea9453
Merge pull request #6232 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211029174453
2021-10-29 20:13:05 +00:00
Renovate Bot
7c426b35e1
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211029174453 2021-10-29 18:16:21 +00:00
renovate[bot]
444db988eb
Merge pull request #6230 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211029113451
2021-10-29 13:55:32 +00:00
Renovate Bot
15831450f6
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211029113451 2021-10-29 12:33:21 +00:00
renovate[bot]
667813c23f
Merge pull request #6231 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20211029031547
2021-10-29 08:42:18 +00:00
Renovate Bot
2758ce9efa
chore(deps): update dependency scratch-l10n to v3.14.20211029031547 2021-10-29 05:00:46 +00:00
caseymm
f44ddbe7d3 fix video disappearing after fullscreen is entered and exited 2021-10-28 15:39:49 -07:00
Karishma Chadha
41b40810a1
Merge pull request #6228 from bocoup/annual-report-2020
Annual report 2020
2021-10-28 17:21:11 -04:00
caseymm
739c001f66 fix string and move a few things around. add better breakpoint for timeline 2021-10-28 14:04:29 -07:00
renovate[bot]
d62dbfb1aa
Merge pull request #6227 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211028182609
2021-10-28 20:47:37 +00:00
Renovate Bot
bf06ef03b9
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211028182609 2021-10-28 18:45:22 +00:00
caseymm
c883e0bfd6 remove comment 2021-10-28 10:44:28 -07:00
caseymm
fffcf17084 iframe project 2021-10-28 10:43:07 -07:00
caseymm
a94ea1b525 changes from bug hunt 2021-10-28 10:42:06 -07:00
chrisgarrity
e0cd40cdf2
Merge pull request #6218 from LLK/release/2021-10-27
[Develop] release/2021-10-27
2021-10-28 11:53:58 -04:00
chrisgarrity
a1ae15c4b4
Merge pull request #6219 from LLK/release/2021-10-27
[Master] release/2021-10-27
2021-10-28 11:53:42 -04:00
renovate[bot]
e4f8262d65
Merge pull request #6225 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211028102116
2021-10-28 13:13:38 +00:00
Renovate Bot
499e1c86ee
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211028102116 2021-10-28 11:21:45 +00:00
renovate[bot]
86acc70518
Merge pull request #6224 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20211028031720
2021-10-28 05:39:46 +00:00
Renovate Bot
2bdb95fb6b
chore(deps): update dependency scratch-l10n to v3.14.20211028031720 2021-10-28 05:30:27 +00:00
renovate[bot]
69b45a4023
Merge pull request #6223 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211028015033
2021-10-28 05:27:37 +00:00
Renovate Bot
92b17b1c37
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211028015033 2021-10-28 03:14:51 +00:00
renovate[bot]
a5aa387358
Merge pull request #6222 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211027205038
2021-10-27 23:47:40 +00:00
Renovate Bot
1ee10a3833
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211027205038 2021-10-27 21:47:25 +00:00
Karishma Chadha
8ad89f818d
Merge pull request #6212 from LLK/kchadha-annual-report-routes
Update Annual Report Routes - no redirects
2021-10-27 16:14:24 -04:00
BryceLTaylor
aa594a48fc look for comments actually left in integration tests 2021-10-27 14:47:35 -04:00
chrisgarrity
3419dab82e Merge remote-tracking branch 'origin/develop' into release/2021-10-27 2021-10-27 13:48:48 +00:00
renovate[bot]
a58cefa505
Merge pull request #6217 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211027094435
2021-10-27 13:43:46 +00:00
Renovate Bot
ec27b15e03
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211027094435 2021-10-27 11:19:56 +00:00
renovate[bot]
d51f84707c
Merge pull request #6216 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20211027031612
2021-10-27 09:41:05 +00:00
Renovate Bot
c379f2ee7e
chore(deps): update dependency scratch-l10n to v3.14.20211027031612 2021-10-27 04:38:54 +00:00
renovate[bot]
554eacef9f
Merge pull request #6215 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211027013916
2021-10-27 04:35:53 +00:00
Renovate Bot
0ba2c18199
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211027013916 2021-10-27 02:34:38 +00:00
renovate[bot]
b0a9daf76e
Merge pull request #6214 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211026204949
2021-10-26 23:55:58 +00:00
Renovate Bot
f5b4c1e658
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211026204949 2021-10-26 22:29:56 +00:00
Karishma Chadha
2916d7e4cf
Merge pull request #6206 from bocoup/annual-report-2020
Annual report 2020
2021-10-26 18:18:44 -04:00
Casey Miller
d35b008fe9
Update src/views/annual-report/2020/annual-report.jsx
Co-authored-by: Karishma Chadha <kchadha@scratch.mit.edu>
2021-10-26 15:16:38 -07:00
caseymm
6c1e6458de change max width 2021-10-26 15:02:58 -07:00
Karishma Chadha
1fe931482c
Update Annual Report Routes - no redirects
Update the /annual-report route to just point to the appropriate 2019 (or in the future, 2020) Annual Report instead of redirecting to a different route and updating the redirect.

@rschamp putting this PR up for discussion, we can talk about other alternatives as well.
2021-10-26 17:43:40 -04:00
caseymm
2e1bdd72cb fix spotight margin bug 2021-10-26 10:35:59 -07:00
tomlum
fa3fa3be63 updates string id and ethics link 2021-10-26 13:22:39 -04:00