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 |
|
zoebentley
|
dfa9b99728
|
Update src/views/developers/developers.jsx
Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>
|
2021-05-10 16:40:48 -04:00 |
|
Benjamin Wheeler
|
4591c65e6f
|
Merge pull request #5345 from benjiwheeler/donate-banner
add donate banner, make close button a mode of button component
|
2021-05-10 16:14:26 -04:00 |
|
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 |
|
Paul Kaplan
|
f474525398
|
Remove unused loadMore functionality from infinite list because it was overly specific, now it is no longer being used by any component
|
2021-05-10 14:14:46 -04:00 |
|
Paul Kaplan
|
600e5846d0
|
Move activity loading to studio-activity-actions, include pagination
|
2021-05-10 14:14:19 -04:00 |
|
Karishma Chadha
|
1b2b595338
|
Get rid of extra piece of state being tracked in redux and update selector to tell if studio load failed. Use that to display 404 page instead.
|
2021-05-10 14:01:17 -04:00 |
|
Karishma Chadha
|
040350314b
|
Set up studios view with 404 page
|
2021-05-10 13:16:15 -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 |
|
Paul Kaplan
|
e2dafff5b7
|
Include rate limit and 404 error types
|
2021-05-10 11:59:37 -04:00 |
|
Eric Rosenbaum
|
de85a25db1
|
use formatted messages for each activity notification
|
2021-05-10 11:44:39 -04:00 |
|
Paul Kaplan
|
968afdb412
|
Fix whitespace
|
2021-05-10 10:29:24 -04:00 |
|
Paul Kaplan
|
35dbcb07ba
|
Add user projects modal
|
2021-05-10 10:24:21 -04:00 |
|
Paul Kaplan
|
f1fde9e5f8
|
Ensure project ID is always a number
|
2021-05-10 10:23:13 -04:00 |
|
Paul Kaplan
|
95766fd68a
|
Add clear to infinite list, fixup tests
|
2021-05-10 10:22:18 -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 |
|