Eric Rosenbaum
|
790e433313
|
lint
|
2021-05-10 15:13:02 -04:00 |
|
Eric Rosenbaum
|
94d0f30b71
|
fix missing comma from merge
|
2021-05-10 14:45:00 -04:00 |
|
Eric Rosenbaum
|
f55d34aab8
|
Merge branch 'develop' of https://github.com/LLK/scratch-www into activity-feed-styles
# Conflicts:
# src/views/studio/l10n.json
# src/views/studio/studio.scss
|
2021-05-10 14:41:14 -04:00 |
|
Karishma Chadha
|
7876bc4fba
|
Merge pull request #5359 from kchadha/studio-translation-setup
Add l10n file to studios view and replace text with formatted message.
|
2021-05-10 14:19:40 -04:00 |
|
Eric Rosenbaum
|
cb3ba550d5
|
add alt text for icons
|
2021-05-10 13:01:20 -04:00 |
|
Eric Rosenbaum
|
188b51bbbe
|
add icons
|
2021-05-10 12:14:51 -04:00 |
|
Eric Rosenbaum
|
de85a25db1
|
use formatted messages for each activity notification
|
2021-05-10 11:44:39 -04:00 |
|
Karishma Chadha
|
51bf0d6c3d
|
Fix lint error
|
2021-05-10 10:16:54 -04:00 |
|
dependabot-preview[bot]
|
dbec1c7a97
|
Merge pull request #5366 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210509040505
|
2021-05-10 12:18:57 +00:00 |
|
dependabot-preview[bot]
|
36cb172108
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210507041109 to 0.1.0-prerelease.20210509040505.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210507041109...0.1.0-prerelease.20210509040505)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-10 12:06:16 +00:00 |
|
dependabot-preview[bot]
|
1942e840b7
|
Merge pull request #5362 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.24
|
2021-05-10 04:58:11 +00:00 |
|
dependabot-preview[bot]
|
01d30818a3
|
Merge pull request #5364 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210510031549
|
2021-05-10 04:43:51 +00:00 |
|
dependabot-preview[bot]
|
e46429a02a
|
Merge pull request #5363 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.18
|
2021-05-10 04:37:32 +00:00 |
|
dependabot-preview[bot]
|
174a94a381
|
Merge pull request #5361 from LLK/dependabot/npm_and_yarn/formatjs/intl-relativetimeformat-8.1.8
|
2021-05-10 04:36:47 +00:00 |
|
dependabot-preview[bot]
|
07f7de504f
|
Bump scratch-l10n from 3.11.20210509031637 to 3.11.20210510031549
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210509031637 to 3.11.20210510031549.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210509031637...3.11.20210510031549)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-10 04:27:15 +00:00 |
|
dependabot-preview[bot]
|
97959c489b
|
Bump @formatjs/intl-pluralrules from 4.0.17 to 4.0.18
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.17 to 4.0.18.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.17...@formatjs/intl-pluralrules@4.0.18)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-10 04:25:30 +00:00 |
|
dependabot-preview[bot]
|
5692b72e1e
|
Bump @formatjs/intl-locale from 2.4.23 to 2.4.24
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.23 to 2.4.24.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.23...@formatjs/intl-locale@2.4.24)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-10 04:24:59 +00:00 |
|
dependabot-preview[bot]
|
8cfa2fecf6
|
Bump @formatjs/intl-relativetimeformat from 8.1.7 to 8.1.8
Bumps [@formatjs/intl-relativetimeformat](https://github.com/formatjs/formatjs) from 8.1.7 to 8.1.8.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-relativetimeformat@8.1.7...@formatjs/intl-relativetimeformat@8.1.8)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-10 04:24:28 +00:00 |
|
dependabot-preview[bot]
|
70d53e3e4c
|
Merge pull request #5360 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210509031637
|
2021-05-09 03:35:04 +00:00 |
|
dependabot-preview[bot]
|
b20a19e0fc
|
Bump scratch-l10n from 3.11.20210507031517 to 3.11.20210509031637
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210507031517 to 3.11.20210509031637.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210507031517...3.11.20210509031637)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-09 03:22:30 +00:00 |
|
Benjamin Wheeler
|
33e9c88217
|
Merge pull request #5252 from benjiwheeler/remove-unnecessary-page
removed unnecessary Page component
|
2021-05-07 18:37:32 -04:00 |
|
Karishma Chadha
|
b065ff86d4
|
Add l10n file to studios view and replace text with formatted message.
|
2021-05-07 17:04:14 -04:00 |
|
dependabot-preview[bot]
|
fa5c56c47a
|
Merge pull request #5358 from LLK/dependabot/npm_and_yarn/hosted-git-info-2.8.9
|
2021-05-07 20:08:03 +00:00 |
|
dependabot-preview[bot]
|
2df83577cd
|
[Security] Bump hosted-git-info from 2.7.1 to 2.8.9
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.7.1 to 2.8.9. **This update includes a security fix.**
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.7.1...v2.8.9)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-07 19:56:20 +00:00 |
|
Benjamin Wheeler
|
6cc59b9b9a
|
Merge pull request #5357 from benjiwheeler/banned-page-list-2nd-try
update method of checking goodlist of pages for banned user to see (2nd try)
|
2021-05-07 13:19:30 -04:00 |
|
Ben Wheeler
|
3156976fee
|
update method of checking goodlist of pages for banned user to see
|
2021-05-07 13:14:53 -04:00 |
|
dependabot-preview[bot]
|
fdf05f9430
|
Merge pull request #5356 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210507041109
|
2021-05-07 10:56:58 +00:00 |
|
dependabot-preview[bot]
|
94d3baf7ca
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210505040706 to 0.1.0-prerelease.20210507041109.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210505040706...0.1.0-prerelease.20210507041109)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-07 10:40:23 +00:00 |
|
dependabot-preview[bot]
|
c2887e34bc
|
Merge pull request #5355 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210507031517
|
2021-05-07 03:57:46 +00:00 |
|
dependabot-preview[bot]
|
5336f3ab42
|
Bump scratch-l10n from 3.11.20210505031459 to 3.11.20210507031517
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210505031459 to 3.11.20210507031517.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210505031459...3.11.20210507031517)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-07 03:44:58 +00:00 |
|
Eric Rosenbaum
|
288302d0c7
|
Merge pull request #5341 from LLK/release/2021-05-05
[Develop] Release 2021-05-05
|
2021-05-06 17:03:30 -04:00 |
|
dependabot-preview[bot]
|
2dea608594
|
Merge pull request #5349 from LLK/dependabot/npm_and_yarn/ua-parser-js-0.7.28
|
2021-05-06 18:44:29 +00:00 |
|
dependabot-preview[bot]
|
56b02fabc6
|
[Security] Bump ua-parser-js from 0.7.20 to 0.7.28
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.20 to 0.7.28. **This update includes a security fix.**
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.20...0.7.28)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-06 18:08:55 +00:00 |
|
dependabot-preview[bot]
|
583834d357
|
Merge pull request #5348 from LLK/dependabot/npm_and_yarn/handlebars-4.7.7
|
2021-05-06 16:40:56 +00:00 |
|
dependabot-preview[bot]
|
755089c2f6
|
[Security] Bump handlebars from 4.7.6 to 4.7.7
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.7.6 to 4.7.7. **This update includes a security fix.**
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.7.6...v4.7.7)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-06 16:23:17 +00:00 |
|
Benjamin Wheeler
|
8e1103a634
|
Merge pull request #5343 from LLK/revert-5220-patch-23
Revert "Add privacy policy and terms of use to allowlist"
|
2021-05-05 16:18:07 -04:00 |
|
Benjamin Wheeler
|
732b596c61
|
Revert "Add privacy policy and terms of use to allowlist"
|
2021-05-05 16:17:22 -04:00 |
|
Eric Rosenbaum
|
3cc3997450
|
Merge pull request #5339 from LLK/develop
merge from develop to release branch
|
2021-05-05 09:57:07 -04:00 |
|
Eric Rosenbaum
|
1232f98195
|
initial styling
|
2021-05-05 09:32:46 -04:00 |
|
dependabot-preview[bot]
|
cb7c60e8aa
|
Merge pull request #5338 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210505040706
|
2021-05-05 10:55:33 +00:00 |
|
dependabot-preview[bot]
|
ae31fafe36
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210504042834 to 0.1.0-prerelease.20210505040706.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210504042834...0.1.0-prerelease.20210505040706)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-05 10:43:07 +00:00 |
|
dependabot-preview[bot]
|
a25c6315aa
|
Merge pull request #5337 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210505031459
|
2021-05-05 03:50:31 +00:00 |
|
dependabot-preview[bot]
|
1b0b67234c
|
Bump scratch-l10n from 3.11.20210504031549 to 3.11.20210505031459
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210504031549 to 3.11.20210505031459.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210504031549...3.11.20210505031459)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-05 03:39:04 +00:00 |
|
Paul Kaplan
|
7fa90cd889
|
Merge pull request #5316 from paulkaplan/studio-report
Studio reporting using legacy endpoint
|
2021-05-04 15:13:36 -04:00 |
|
Paul Kaplan
|
757f95f89c
|
Merge branch 'develop' into studio-report
|
2021-05-04 15:13:04 -04:00 |
|
Paul Kaplan
|
2936bc72db
|
Render the error from reporting
Co-authored-by: Sarah Otts <se0042@gmail.com>
|
2021-05-04 15:12:11 -04:00 |
|
Bryce Taylor
|
0719530142
|
Merge pull request #5336 from BryceLTaylor/fix-circle-translation-cron
Run npm ci in update-translations cron on circle
|
2021-05-04 13:24:11 -04:00 |
|
Paul Kaplan
|
aef18e1abc
|
Merge pull request #5330 from paulkaplan/features/manage-projects-members
Add functionality for adding/removing projects and managing curators
|
2021-05-04 11:55:58 -04:00 |
|
BryceLTaylor
|
a1230654cd
|
Run npm ci in update-translations cron on circle
|
2021-05-04 11:20:47 -04:00 |
|
dependabot-preview[bot]
|
d240351e5c
|
Merge pull request #5335 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210504042834
|
2021-05-04 11:05:52 +00:00 |
|