Commit graph

2506 commits

Author SHA1 Message Date
Paul Kaplan
4f6a583277 Add placeholders for project and curator inputs 2021-05-13 09:04:39 -04:00
Paul Kaplan
3a59ea072c Prevent submission of blank curator/project fields 2021-05-13 08:35:46 -04:00
Paul Kaplan
397ac7334a
Merge branch 'develop' into studio-empty-states 2021-05-11 14:10:56 -04:00
Paul Kaplan
f61047dda0
Merge branch 'develop' into add-studio-activity-pagination 2021-05-11 13:38:15 -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
Paul Kaplan
9904586a38 Merge branch 'develop' into bugfix/studio-playground-may5 2021-05-10 21:11:05 -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
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
Karishma Chadha
51bf0d6c3d Fix lint error 2021-05-10 10:16:54 -04:00
Ben Wheeler
3dd69c287c Remove stale comments, remove extra space, add padding 2021-05-07 22:23:45 -04: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
Ben Wheeler
23f2135c17 add donate banner, make close button a mode of button component 2021-05-07 11:50:47 -04:00
Paul Kaplan
903eef969f Allow Enter key to submit curator and project adders 2021-05-06 09:21:32 -04:00
Paul Kaplan
3785108348 Promoted and added curators should go at the end of the list 2021-05-06 09:14:15 -04:00
Paul Kaplan
be088b9513 Fix tab ordering 2021-05-06 09:03:35 -04:00
Paul Kaplan
27bdabcfeb Fix trailing slash breaking tab navigation 2021-05-06 09:02:05 -04:00
Paul Kaplan
ec5d424719 Fix firefox mega follower button 2021-05-05 16:08:23 -04:00
Paul Kaplan
bf260acd88 Catch error from user who is already part of studio 2021-05-05 16:08:11 -04:00
Eric Rosenbaum
1232f98195 initial styling 2021-05-05 09:32:46 -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
Zoë Bentley
dc2b431f83 Changed Developers and Teacher FAQ pages 2021-05-03 16:08:36 -04:00
Paul Kaplan
699e30dedd Fix curator permissions for removing projects 2021-05-03 13:26:50 -04:00