Karishma Chadha
|
b287c5967f
|
Merge pull request #5434 from LLK/hotfix/donate-banner-analytics
[Master] Hotfix Donate Banner Update
|
2021-05-17 13:11:08 -04:00 |
|
Karishma Chadha
|
3094602235
|
Remove end time for donate banner.
|
2021-05-17 11:32:42 -04:00 |
|
Karishma Chadha
|
cdee0e74f9
|
Send analytics event when the donate button in the banner is clicked.
|
2021-05-17 11:31:49 -04:00 |
|
chrisgarrity
|
d6e2a43b92
|
Merge pull request #5387 from LLK/release/2021-05-12
[Master] Release 2021-05-12
|
2021-05-13 10:33:32 -04:00 |
|
Sarah Otts
|
f5c3b87d2b
|
Merge pull request #5399 from zoebentley/dev-page-fix-2
Fixed problem introduced by previous fix
|
2021-05-13 09:50:36 -04:00 |
|
Zoë Bentley
|
3fbfb6dfd1
|
Fixed problem introduced by previous fix
|
2021-05-13 09:39:08 -04:00 |
|
chrisgarrity
|
132cf487f4
|
Merge pull request #5391 from LLK/fix-intro-when-logged-in
fix logic for when to show intro to users
|
2021-05-13 09:35:32 -04:00 |
|
Sarah Otts
|
81c59b5620
|
Merge pull request #5392 from zoebentley/dev-page-fix
Fixes to Developers' Page
|
2021-05-12 16:57:19 -04:00 |
|
zoebentley
|
bf55d26e20
|
Merge branch 'release/2021-05-12' into dev-page-fix
|
2021-05-12 16:56:26 -04:00 |
|
Zoë Bentley
|
d5af535ea2
|
Fixes to Developers' Page
|
2021-05-12 16:52:16 -04:00 |
|
Ben Wheeler
|
d3685610f6
|
fix logic for when to show intro to users
|
2021-05-12 16:27:25 -04:00 |
|
Benjamin Wheeler
|
8827fca1ac
|
Merge pull request #5390 from LLK/fix-close-button
rename .close-button style to not conflict
|
2021-05-12 14:18:01 -04:00 |
|
Ben Wheeler
|
316f26bed5
|
rename .close-button style to not conflict
|
2021-05-12 14:14:34 -04:00 |
|
chrisgarrity
|
b2362204b3
|
Merge pull request #5385 from LLK/develop
Merge from develop into release branch
|
2021-05-12 12:46:54 -04:00 |
|
dependabot-preview[bot]
|
619f4400b8
|
Merge pull request #5384 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210512144423
|
2021-05-12 16:39:46 +00:00 |
|
dependabot-preview[bot]
|
2e96fc228c
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210512034627 to 0.1.0-prerelease.20210512144423.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210512034627...0.1.0-prerelease.20210512144423)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-12 16:26:29 +00:00 |
|
chrisgarrity
|
f90772f2ea
|
Merge pull request #5383 from LLK/revert-5382-update-gui
Revert "manually update gui"
|
2021-05-12 12:03:13 -04:00 |
|
chrisgarrity
|
f2038420a0
|
Revert "manually update gui"
|
2021-05-12 12:02:50 -04:00 |
|
chrisgarrity
|
800b193bf7
|
Merge pull request #5382 from chrisgarrity/update-gui
manually update gui
|
2021-05-12 11:08:04 -04:00 |
|
Chris Garrity
|
87187ec9f8
|
manually update gui
|
2021-05-12 11:06:37 -04:00 |
|
dependabot-preview[bot]
|
f0dda606d8
|
Merge pull request #5380 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210512034627
|
2021-05-12 10:54:31 +00:00 |
|
dependabot-preview[bot]
|
59dd48e0f4
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210510170231 to 0.1.0-prerelease.20210512034627.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210510170231...0.1.0-prerelease.20210512034627)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-12 10:41:16 +00:00 |
|
dependabot-preview[bot]
|
c4a031649a
|
Merge pull request #5379 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210512031514
|
2021-05-12 03:44:31 +00:00 |
|
dependabot-preview[bot]
|
3381101fda
|
Bump scratch-l10n from 3.11.20210511031531 to 3.11.20210512031514
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210511031531 to 3.11.20210512031514.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210511031531...3.11.20210512031514)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-12 03:31:12 +00:00 |
|
Paul Kaplan
|
0d3f10292b
|
Merge pull request #5375 from paulkaplan/studio-empty-states
Add empty states for curators and projects
|
2021-05-11 14:40:01 -04:00 |
|
Paul Kaplan
|
397ac7334a
|
Merge branch 'develop' into studio-empty-states
|
2021-05-11 14:10:56 -04:00 |
|
Paul Kaplan
|
2fe3948ef9
|
Merge pull request #5371 from paulkaplan/add-studio-activity-pagination
Add studio activity pagination
|
2021-05-11 14:09:52 -04:00 |
|
Paul Kaplan
|
f61047dda0
|
Merge branch 'develop' into add-studio-activity-pagination
|
2021-05-11 13:38:15 -04:00 |
|
Paul Kaplan
|
051fc1070b
|
Merge pull request #5367 from paulkaplan/feature/studio-project-modal
Add the user projects modal for browsing projects to add to a studio
|
2021-05-11 13:31:13 -04:00 |
|
Paul Kaplan
|
0fdf54339a
|
Merge branch 'develop' into add-studio-activity-pagination
|
2021-05-11 12:09:10 -04:00 |
|
Paul Kaplan
|
443dcc28e2
|
Merge branch 'develop' into feature/studio-project-modal
|
2021-05-11 12:04:05 -04:00 |
|
Eric Rosenbaum
|
aaff5ab0ce
|
Merge pull request #5372 from ericrosenbaum/activity-feed-styles
Styled studio activity feed
|
2021-05-11 11:45:24 -04:00 |
|
Paul Kaplan
|
669f701fd3
|
Fix wrapping on long activity text
|
2021-05-11 11:33:49 -04:00 |
|
Paul Kaplan
|
b4c9e31d30
|
Include removecurator notification
|
2021-05-11 11:33:38 -04:00 |
|
Paul Kaplan
|
02a5c0b4df
|
Fixup usernames
|
2021-05-11 10:57:26 -04:00 |
|
Eric Rosenbaum
|
4e580054fc
|
use import instead of require
|
2021-05-11 10:51:07 -04:00 |
|
Paul Kaplan
|
c25fb3a9e4
|
Add empty states for curators and projects
|
2021-05-11 09:50:34 -04:00 |
|
dependabot-preview[bot]
|
b8b2b260ae
|
Merge pull request #5374 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210510170231
|
2021-05-11 10:50:45 +00:00 |
|
dependabot-preview[bot]
|
593b342173
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210509040505 to 0.1.0-prerelease.20210510170231.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210509040505...0.1.0-prerelease.20210510170231)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-11 10:38:53 +00:00 |
|
dependabot-preview[bot]
|
e104be9a0b
|
Merge pull request #5373 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210511031531
|
2021-05-11 03:56:44 +00:00 |
|
dependabot-preview[bot]
|
47365ecf46
|
Bump scratch-l10n from 3.11.20210510031549 to 3.11.20210511031531
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210510031549 to 3.11.20210511031531.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210510031549...3.11.20210511031531)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-05-11 03:44:34 +00:00 |
|
Paul Kaplan
|
bf73950c16
|
Merge pull request #5346 from paulkaplan/bugfix/studio-playground-may5
Bug fixes from studio playground test on May 5 2021
|
2021-05-10 21:11:43 -04:00 |
|
Paul Kaplan
|
9904586a38
|
Merge branch 'develop' into bugfix/studio-playground-may5
|
2021-05-10 21:11:05 -04:00 |
|
Paul Kaplan
|
64ff2cffdd
|
Move max image size to constant
|
2021-05-10 21:09:08 -04:00 |
|
Paul Kaplan
|
fbd8908a83
|
Fix lint
|
2021-05-10 21:06:31 -04:00 |
|
Paul Kaplan
|
6ac3012b8c
|
Use formatted message
|
2021-05-10 21:02:20 -04:00 |
|
Paul Kaplan
|
62b1f8f3a5
|
Merge branch 'develop' into feature/studio-project-modal
|
2021-05-10 20:55:20 -04:00 |
|
Paul Kaplan
|
43eb9e4e91
|
Include if user projects are already in the studio
|
2021-05-10 20:46:38 -04:00 |
|
Karishma Chadha
|
a9d70b2cc0
|
Merge pull request #5370 from kchadha/studio-404-page
Set up studios view with 404 page
|
2021-05-10 17:49:30 -04:00 |
|
Sarah Otts
|
70f7a9ef73
|
Merge pull request #5331 from zoebentley/update-teacher-faq-and-devs-page-2021
Changed Developers and Teacher FAQ pages
|
2021-05-10 16:43:44 -04:00 |
|