5090 commits

Author	SHA1	Message	Date
tomlum	497862d45c	Merge remote-tracking branch 'scratch/develop' into scratcher-onboarding	2022-02-04 14:41:40 -05:00
tomlum	3ec8a7fba8	Merge remote-tracking branch 'origin' into scratcher-onboarding	2022-02-04 14:33:54 -05:00
tomlum	b388929865	lint line fix	2022-02-02 16:54:42 -05:00
tomlum	c83d01f843	scratcher onboarding page	2022-02-02 16:22:39 -05:00
Sarah Otts	eacdcdb870	Merge pull request #6471 from zoebentley/ethics-update-jan-2022 ... Updated text on Code of Ethics page	2022-02-01 11:02:24 -05:00
zoebentley	18a1f5f55f	Update src/views/ethics/l10n.json ... Leave email on translated Co-authored-by: Sarah Otts <se0042@gmail.com>	2022-02-01 10:30:04 -05:00
zoebentley	d55185eb1c	Update src/views/ethics/ethics.jsx ... Leave email untranslated Co-authored-by: Sarah Otts <se0042@gmail.com>	2022-02-01 10:29:35 -05:00
Sarah Otts	1dc4881080	Merge pull request #6446 from mxmou/teacher-registration-label-font-weight ... Use font weight bold consistently for teacher registration form labels	2022-01-27 17:11:26 -05:00
Joel Gritter	a1504a1733	fix(gh-6002): fix cursor for ideas tile images ... - update styling the TTTTile object to make the cursor a pointer on hover of the TTTTile image	2022-01-27 07:03:50 -05:00
webdev03	6b4c138c2e	Fix typo in FAQ ... There is a topic in Suggestions for this: https://scratch.mit.edu/discuss/topic/560654/	2022-01-25 21:38:20 +13:00
tomlum	024f97ddb2	work on promote	2022-01-24 11:48:15 -05:00
Maximouse	55fa30e904	Use bold instead	2022-01-23 11:23:42 +01:00
Zoë Bentley	1143821dab	Updated text on Code of Ethics page	2022-01-21 10:18:26 -05:00
tomlum	cfe63c5b75	confetti and misc refactors	2022-01-20 16:34:58 -05:00
Joel Gritter	0d659b5d18	fix(gh-4969): add missing period to l10n string ... Adds missing period to the end of the `comment.unconstructive.header` string.	2022-01-20 06:49:38 -05:00
Karishma Chadha	00f243250c	Forward fix for regression introduced by changing the number of replies we fetch. This change updates the number of comment replies we fetch on project comments from 20 to 25 to be consistent with studio page. Also updates the code that controls whether to display the 'See more replies' button on comment threads.	2022-01-12 14:45:20 -05:00
Maximouse	1887b4dac7	Make author username alignment consistent on Explore and search	2022-01-10 11:09:21 +01:00
Maximouse	2bd58a32ce	Use className	2022-01-09 16:50:42 +01:00
Maximouse	dec4fc7ec4	Left-align project instructions and notes on medium window widths	2022-01-09 16:00:38 +01:00
Maximouse	cdf44e0219	Increase max-width of studio titles on Explore and search	2022-01-09 14:30:45 +01:00
Maximouse	7157057bab	Use font weight 500 consistently for teacher registration form labels	2022-01-09 14:15:29 +01:00
Maximouse	c89f93ce60	Focus comment reply textarea when it appears	2022-01-09 11:27:48 +01:00
Karishma Chadha	f272af1034	Revert "Revert "Unconfirmed user link hotfix""	2022-01-06 17:21:32 -05:00
Tom Lum	816d68de73	Revert "Unconfirmed user link hotfix"	2022-01-05 16:25:40 -05:00
Tom Lum	5477fbdbc1	Updates link in email confirmation modal	2022-01-05 16:18:45 -05:00
Tom Lum	e15741e5f2	Merge pull request #6365 from LLK/unconfirmed-scratcher-project-share ... Email Confirmation on Project Page	2022-01-04 17:25:16 -05:00
Karishma Chadha	d737196b2b	Merge pull request #6311 from JoelGritter/patch-1 ... fix(gh-5989): adjust comment load batch size	2021-12-22 13:25:00 -05:00
Ray Schamp	372681ade1	Merge pull request #6375 from LLK/hotfix/gtm ... [Develop] Add configuration for GTM	2021-12-20 09:34:53 -05:00
tomlum	62c9d1b46f	css class refactor	2021-12-17 14:22:46 -05:00
seotts	0239276644	Change class name to "modal-text-content"	2021-12-17 13:30:49 -05:00
seotts	4496e4fa5e	Remove modal opening/closing logic from splash page	2021-12-17 13:13:36 -05:00
tomlum	1364e4400f	css fixes and refactors	2021-12-17 13:13:36 -05:00
seotts	cb3864c67a	Update ids in modal tests	2021-12-17 13:13:36 -05:00
seotts	938f3f4dbf	Put tips in a list	2021-12-17 13:13:36 -05:00
seotts	fa42938247	Rename l10n ids to refer to components	2021-12-17 13:13:36 -05:00
seotts	7f2b756aba	Localize email confirmation banner	2021-12-17 13:13:36 -05:00
tomlum	a2938d18eb	fixes line length lint	2021-12-17 13:13:36 -05:00
seotts	6126ffa24c	Fix prop-related linted errors	2021-12-17 13:13:36 -05:00
seotts	cf92ecca46	Add missing PropTypes	2021-12-17 13:13:36 -05:00
seotts	6814c8f5b1	Wire up banner dismissal	2021-12-17 13:13:36 -05:00
seotts	92824f43aa	Use onRequestClose instead of handleClose	2021-12-17 13:13:36 -05:00
seotts	2af9b673ff	Wire up EmailConfirmationModal's close button	2021-12-17 13:13:30 -05:00
seotts	8b62fb9f63	Give EmailConfirmModal email address prop	2021-12-17 13:13:30 -05:00
seotts	f7008f533d	Make all banners sticky	2021-12-17 13:09:46 -05:00
seotts	7a51bded90	Add banner css; make sticky	2021-12-17 13:09:46 -05:00
tomlum	85e5342748	email confirmation modal styling	2021-12-17 13:09:46 -05:00
tomlum	94b7a81863	fixes showEmailConfirmationBanner	2021-12-17 13:09:46 -05:00
tomlum	5b58c3822c	in progress, tests, banner, modal	2021-12-17 13:09:46 -05:00
tomlum	058edef86a	adds modal progress and new logic for showing share button on project page	2021-12-17 13:09:46 -05:00
tomlum	f17ee45ceb	basic pages and profile picture and confetti	2021-12-14 12:31:26 -05:00
Sarah Otts	bcdc3125a3	Merge pull request #6368 from hello-smile6/patch-1 ... Correct link href for studio host transfer message	2021-12-13 07:19:16 -05:00
rschamp	42b88faa3f	Add configuration for GTM	2021-12-10 13:49:43 -05:00
Sarah Otts	eebe3e1eb0	Merge pull request #6355 from seotts/privacy-policy-apps ... App privacy policy	2021-12-08 10:35:05 -05:00
seotts	abc5ababd4	Correct update date	2021-12-07 15:59:02 -05:00
seotts	8c890d5fd3	Define contact info at top of file; consolodate requires	2021-12-07 13:30:48 -05:00
seotts	4ce5656508	Remove l10n string typos	2021-12-07 13:30:08 -05:00
hello-smile6	bd788182e0	Correct link href for studio host transfer message ... Fixes https://github.com/LLK/scratch-www/issues/6367	2021-12-05 12:15:14 -08:00
seotts	5c813a3480	Privacy policy for apps	2021-12-01 14:39:53 -05:00
tomlum	5da297f0de	progress on onboarding	2021-11-30 16:09:24 -05:00
zoebentley	8ff2f5bbd4	Update src/views/parents/l10n.json ... Co-authored-by: Sarah Otts <se0042@gmail.com>	2021-11-30 09:58:47 -05:00
Zoë Bentley	2f9e2905cb	updated parents page with information about scratch foundation	2021-11-24 10:38:40 -05:00
Karishma Chadha	0ae445d32f	Fix layout of HOC banner on tablets.	2021-11-29 20:48:40 -05:00
Karishma Chadha	1155b17358	Show donate banner while showing HOC banner. Fix donate banner to use 'sticky' positioning.	2021-11-29 20:40:29 -05:00
Karishma Chadha	a6e9c51ad2	Update HOC banner timing and tutorials.	2021-11-22 20:38:00 -05:00
seotts	d7bfa2ed6f	Remove 2019 from Annual Report 2019	2021-11-17 16:08:21 -05:00
Joel Gritter	ebb975d948	fix(gh-5989): use separate limit values ... - use separate COMMENT_LIMIT and REPLY_LIMIT values - use 25 as REPLY_LIMIT value - restore original COMMENT_LIMIT value of 20	2021-11-17 06:50:21 -05:00
Joel Gritter	ac670f7749	fix(gh-5989): adjust comment load batch size ... - adjust the studio reply comment load batch size to 25 instead of 20	2021-11-17 06:39:29 -05:00
Karishma Chadha	78688203b1	Merge pull request #6301 from kchadha/annual-report-fixes ... [Develop] Annual report fixes	2021-11-16 11:47:36 -05:00
Karishma Chadha	7baa676a5c	Update /annual-report route to point to 2020 report.	2021-11-15 17:25:08 -05:00
Sarah Otts	91d0d9be4e	Delete commented out line	2021-11-15 17:07:56 -05:00
Sarah Otts	814a31236b	Remove commented out code	2021-11-15 17:07:56 -05:00
Karishma Chadha	753b422d25	More layout fixes.	2021-11-15 17:07:56 -05:00
Karishma Chadha	0373dd578e	Update copy	2021-11-15 17:07:56 -05:00
Karishma Chadha	0b958cb0f3	Update blurry image of scratch editor.	2021-11-15 17:07:56 -05:00
Karishma Chadha	f864e12da2	Update links to embedded projects.	2021-11-15 17:07:56 -05:00
Karishma Chadha	d09e7628f9	Copy changes for annual report	2021-11-15 17:07:56 -05:00
Karishma Chadha	1d68765c48	More layout, and font-size fixes for annual report.	2021-11-15 17:07:56 -05:00
Karishma Chadha	f427e4a2b0	Update font sizes, pill styling, and country blurb font sizing and layout.	2021-11-15 17:07:56 -05:00
Karishma Chadha	c835c67fe7	Updates to TextAndMediaSnippet layout, spacing, and some font sizing. Fix width of components of other sections e.g. Scratch in India.	2021-11-15 17:07:56 -05:00
Sarah Otts	ca8d9187d3	Merge pull request #6254 from seotts/about-copy-changes ... Update About page copy	2021-11-09 09:50:00 -05:00
rschamp	dcc7fa2008	Transform async/await syntax for Safari <= 10	2021-11-08 12:00:56 -05:00
rschamp	735042c414	Revert "Merge pull request #6245 from LLK/revert-6243-hotfix/dynamic-intl-polyfill" ... This reverts commit 42712bd636, reversing changes made to f152df774f.	2021-11-08 11:50:18 -05:00
Sarah Otts	f3d2e69442	Merge pull request #6204 from zoebentley/parents-page-oct-2021 ... Removed a broken link from the For Parents page	2021-11-03 13:40:17 -04:00
seotts	5607626e64	Update About page copy	2021-11-03 11:32:38 -04:00
Sarah Otts	eeb198bf94	Merge pull request #6179 from tomlum/research-page-copy-change ... Copy changes to research page	2021-11-01 16:00:37 -04:00
chrisgarrity	55d2a389e4	Revert "Replace static plural rule and relative time polyfills with a dynamic import"	2021-11-01 13:33:30 -04:00
chrisgarrity	f152df774f	Merge pull request #6243 from LLK/hotfix/dynamic-intl-polyfill ... Replace static plural rule and relative time polyfills with a dynamic import	2021-11-01 12:14:37 -04:00
rschamp	a6be8aea1c	Fix lint	2021-11-01 11:10:22 -04: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
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
caseymm	c883e0bfd6	remove comment	2021-10-28 10:44:28 -07:00
caseymm	a94ea1b525	changes from bug hunt	2021-10-28 10:42:06 -07: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
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
Zoë Bentley	0bdd7dd8b0	Removed a broken link from the For Parents page	2021-10-25 12:40:05 -04:00
caseymm	3d44e562d3	iframe sizing	2021-10-22 15:25:56 -07:00
caseymm	7c65b5fd73	padding/margin, tweets, other sizing	2021-10-22 14:48:48 -07:00
caseymm	0f12bd2571	start mobile issues	2021-10-22 14:22:36 -07:00
Karishma Chadha	0d5a44aa2c	Merge pull request #6131 from bocoup/annual-report-2020 ... Annual report 2020	2021-10-22 16:51:20 -04:00
Sarah Otts	468e4c0a7f	Merge pull request #6163 from seotts/code-of-ethics ... Add Code of Ethics page	2021-10-22 16:33:43 -04:00
caseymm	7557655a06	remove paragraph prop	2021-10-22 13:28:17 -07:00
caseymm	60a98a7a92	fix string links and rename splashes	2021-10-22 12:53:33 -07:00
seotts	0f86ce4671	Fix ethics page route styling	2021-10-22 15:11:41 -04:00
Sarah Otts	ee562799bf	Merge pull request #6172 from seotts/transferring-typo ... Fix "transferring" misspelling	2021-10-22 09:41:09 -04:00
caseymm	f8bdd8948b	spinner color and correcting other errors	2021-10-21 16:42:22 -07:00
caseymm	55ea8ea083	aaron text	2021-10-21 16:15:30 -07:00
caseymm	ae4ecca386	i10n changes	2021-10-21 16:12:54 -07:00
caseymm	37dba60b1c	links in paragraphs	2021-10-21 15:41:10 -07:00
caseymm	b460e9bb80	replace some images and start adding links to paragraphs	2021-10-21 15:10:47 -07:00
caseymm	ed03927efd	padding and other things	2021-10-21 11:21:18 -07:00
Tom Lum	d419e8958b	Update src/views/research/research.jsx ... Co-authored-by: Sarah Otts <se0042@gmail.com>	2021-10-21 14:20:49 -04:00
caseymm	e9ba8cf238	fix wave	2021-10-21 11:04:53 -07:00
Sarah Otts	d01d66101e	Merge pull request #5669 from apple502j/add-cg-link ... Link community guidelines in project.defaultCensoredMessage	2021-10-21 13:50:37 -04:00
caseymm	9f2c4a29cf	reconfigure video layout	2021-10-21 10:46:37 -07:00
caseymm	acc8cdab3c	fix avatar on juneteenth illo	2021-10-20 15:46:43 -07:00
caseymm	522e2335fa	adjust some of the timeline bg images	2021-10-20 15:30:16 -07:00
caseymm	283f7c2630	fix timeline dots	2021-10-20 15:22:53 -07:00
caseymm	c3c04a32e3	add pull quote	2021-10-20 15:00:03 -07:00
caseymm	4d1b3ab184	remove unneeded images	2021-10-20 13:39:22 -07:00
caseymm	fc47304527	finish all alt tags	2021-10-20 12:38:40 -07:00
caseymm	0e32b6c9c3	alts for video previews and country blurb sections	2021-10-20 11:22:52 -07:00
tomlum	ec10992338	copy changes to research page	2021-10-20 14:19:15 -04:00
caseymm	2016380b34	add alts for india grid	2021-10-20 10:55:24 -07:00
caseymm	ddb1aaec8c	update images	2021-10-19 17:40:36 -07:00
caseymm	d3aa437444	styling	2021-10-19 16:27:42 -07:00
caseymm	f09e3e51c4	a bunch of color and linting fixes	2021-10-19 15:58:14 -07:00
caseymm	e12ff6a67a	lots of alt text for images in the main page	2021-10-19 14:27:34 -07:00
caseymm	dbd5005cee	start alts for images	2021-10-19 12:23:23 -07:00
seotts	1c01842a24	Fix "transferring" misspelling	2021-10-19 10:36:39 -04:00
caseymm	4c29cb5dcc	misc styling changes	2021-10-18 15:37:37 -07:00
caseymm	33132818c0	lint	2021-10-18 14:03:38 -07:00
caseymm	be9175aa64	misc timeline fixes	2021-10-18 14:00:11 -07:00
caseymm	0ed82b35c8	video buttons	2021-10-18 13:32:00 -07:00
Sarah Otts	e0a5ae5c68	Merge pull request #5884 from jeffalo/dont-search-empty-strings ... Prevent searches for empty strings	2021-10-18 16:16:15 -04:00
caseymm	754510832c	fix some avatars	2021-10-18 11:36:31 -07:00
caseymm	af0454a747	clean out some css	2021-10-18 11:08:35 -07:00
caseymm	cb67a918d2	force autoplay on videos	2021-10-18 10:15:32 -07:00
rschamp	5d14efd9a0	Add remaining supported locales to intl-polyfill	2021-10-18 11:38:43 -04:00
caseymm	83760a522e	tutorial lines and tile links	2021-10-15 16:39:06 -07:00
caseymm	95b7d13d08	update people.json	2021-10-15 14:45:02 -07:00
caseymm	520bf41968	fix linting	2021-10-15 12:47:58 -07:00
caseymm	7160befa55	update map	2021-10-15 12:06:10 -07:00
caseymm	498b35a945	fix npm	2021-10-14 18:09:01 -07:00
caseymm	feebe8e486	more content for supporters	2021-10-14 16:43:48 -07:00
caseymm	220266d973	finish community content minus links	2021-10-14 11:24:02 -07:00
caseymm	a56631c267	bg images for year in review	2021-10-14 10:28:05 -07:00
caseymm	6366cbd4b2	spacing and bottom wave	2021-10-13 17:03:28 -07:00
caseymm	7d4621576f	year in review cards	2021-10-13 16:33:51 -07:00
caseymm	41ada2ce94	community section content	2021-10-13 13:50:21 -07:00
seotts	c25059bb4b	Redirect 3faq to /faq, not /info/faq	2021-10-13 15:35:22 -04:00
caseymm	6f1688d399	embed some projects	2021-10-13 10:55:29 -07:00
seotts	df46afbcf5	Add code of ethics page	2021-10-13 13:42:20 -04:00
caseymm	ac467b3cab	start community section	2021-10-12 17:38:23 -07:00
caseymm	bd4892da4a	get community header in	2021-10-12 15:55:30 -07:00
caseymm	19e65e9f0e	items in for adapation	2021-10-12 15:39:52 -07:00
Sarah Otts	c30252a4ed	Merge pull request #5882 from apple502j/move-faq-url ... Move FAQ page to /faq	2021-10-12 16:34:41 -04:00
caseymm	2d86753907	more adaptation	2021-10-12 12:01:21 -07:00
Sarah Otts	6418bd95f0	Merge pull request #6057 from itta611/patch-1 ... Fix padding under grayed out comment compose box on studios after becoming muted	2021-10-12 09:04:01 -04:00
Itta	58dc901e0d	Update src/views/preview/comment/comment.scss ... Thanks! Co-authored-by: Sarah Otts <se0042@gmail.com>	2021-10-09 07:10:11 +09:00
Sarah Otts	e33832f8d7	Merge pull request #5997 from LankyBox01/patch-2 ... fix #5865	2021-10-07 13:20:36 -04:00
caseymm	352f31698e	add aaron	2021-10-05 17:11:53 -07:00
caseymm	d7295ae58a	redo one of the quotes	2021-10-05 16:53:30 -07:00
caseymm	a45c1b6700	finish content in connectivity section	2021-10-05 15:27:11 -07:00
caseymm	950c608217	create 2019 folder	2021-10-05 13:18:19 -07:00
caseymm	4dbe0d20f0	country sections	2021-10-05 11:52:50 -07:00
caseymm	1b84e3417b	world and video	2021-10-04 15:48:39 -07:00
caseymm	537704cf89	india css	2021-10-04 14:10:15 -07:00
caseymm	8c39865c4f	starting scratch in india	2021-10-01 15:47:10 -07:00
caseymm	8f73470276	themes blobs	2021-10-01 14:28:24 -07:00
caseymm	b3b3ab4126	more arrows and formatting	2021-09-30 16:52:40 -07:00
caseymm	03a2435863	style changes for top two sections	2021-09-30 16:23:15 -07:00
caseymm	9c83891a42	added assets folder and started swapping in assets	2021-09-30 11:17:15 -07:00
caseymm	da116acda0	a bit more	2021-09-29 17:17:34 -07:00
caseymm	2263ec4974	more content changes	2021-09-29 17:04:29 -07:00
caseymm	4277aa5db0	some content changes	2021-09-29 15:54:33 -07:00
seotts	1d4c7e8938	show "Studio Host" on manager tile	2021-09-29 16:00:52 -04:00
caseymm	743ccb0428	start to swap out nav	2021-09-28 16:41:30 -07:00
caseymm	845d7ed578	route and 2020 folder	2021-09-28 15:49:09 -07:00
seotts	ef3e861fc3	Allow admins to promote curators	2021-09-24 16:12:09 -04:00
Sarah Otts	705e8dba6e	Merge pull request #6085 from zoebentley/credits-page-update-9-21 ... Credits page update 9 21	2021-09-24 11:08:01 -04:00
Zoë Bentley	d2c3cce09b	Added Harakou	2021-09-24 10:39:51 -04:00
Sarah Otts	1ee64bf4d9	Merge branch 'develop' into remove-studio-feature-flag	2021-09-21 10:43:07 -04:00
Zoë Bentley	b078ec23bf	Added 1 more person	2021-09-21 10:41:56 -04:00
seotts	80a99bc0b6	Remove use of studio transfer feature flag ... Remove another use	2021-09-21 10:40:18 -04:00
Sarah Otts	be0144618d	Merge pull request #6078 from seotts/use-host-in-api-response ... Use studio "host" in state, and accept "host" from api	2021-09-21 10:10:59 -04:00
Zoë Bentley	e21208a196	Added 1 person who joined since last time I edited branch	2021-09-20 15:38:58 -04:00
Zoë Bentley	599cc12bd4	Updated team members on credits page september 21	2021-09-20 15:11:51 -04:00
Sarah Otts	23be853cb0	Merge pull request #5114 from benjiwheeler/shrink-splash-image ... converted images around splash video to png, smaller file size	2021-09-20 14:06:25 -04:00
seotts	3ef41d2790	Remove use of new studios feature flag	2021-09-20 13:40:37 -04:00
seotts	2b1dfcda62	Fix a couple of comments	2021-09-20 12:09:47 -04:00
seotts	c70b67cde5	If studio response body has no host yet, use owner	2021-09-20 11:31:36 -04:00
seotts	dc241e1c6f	Accept studio "host" from api; use "host" in state	2021-09-17 15:50:16 -04:00
Ray Schamp	0a4bacd1d0	Merge pull request #6062 from rschamp/allow-querystrings ... Make /educators routes robust to querystrings	2021-09-15 13:35:49 -04:00
rschamp	6a289fe6de	Make /educators routes robust to querystrings	2021-09-15 11:09:45 -04:00
seotts	92bad5b505	Change copy of rate-limit error	2021-09-14 16:16:30 -04:00
Itta	dcadc47e6e	fix #5890	2021-09-14 06:55:56 +09:00
seotts	b692b61812	Change default validation error	2021-09-07 14:08:25 -04:00
seotts	5d8d2a05c8	Add transfer error for too many password attempts	2021-09-07 12:24:02 -04:00
Sarah Otts	f21c91106e	Merge pull request #6022 from zoebentley/bengali-language-organizer ... Added Nasir and reordered lang organizers alphabetically by first name	2021-09-03 14:12:38 -04:00
Eric Rosenbaum	466b6dfc2e	Merge pull request #5992 from ericrosenbaum/transfer-modal6 ... More transfer host modal fixes	2021-09-02 14:50:17 -04:00
Eric Rosenbaum	1d6c47d2a4	Revert "Revert "Transfer host modal updates""	2021-09-02 14:43:31 -04:00
Zoë Bentley	a49308c5f3	Added Nasir and reordered lang organizers alphabetically by first name	2021-09-02 11:48:28 -04:00
Eric Rosenbaum	ad2536e2c6	Revert "Transfer host modal updates"	2021-09-01 10:08:11 -04:00
Eric Rosenbaum	bb428a308d	put arrow fn wrapper for loadManagers into connect	2021-08-31 17:12:53 -04:00
Eric Rosenbaum	0d670b1087	Fix load more buttons	2021-08-30 15:50:04 -04:00
LankyBox01	6ffd1dbc66	fix #5865 ... yup	2021-08-28 22:36:32 +03:00
Eric Rosenbaum	5356f05d38	reject on error	2021-08-27 14:02:25 -04:00
Eric Rosenbaum	08b5383370	responsive style for transfer outcome tiles	2021-08-27 11:22:49 -04:00
Eric Rosenbaum	b1239e72fc	Merge pull request #5988 from ericrosenbaum/transfer-modal5 ... Transfer host modal updates	2021-08-27 11:05:17 -04:00
Eric Rosenbaum	5aa1b8c8e7	Store host info in state so the modal doesn't update after reloading managers	2021-08-27 10:20:37 -04:00
Eric Rosenbaum	a6b7ef3c4b	reload managers before closing modal	2021-08-26 19:49:46 -04:00
Eric Rosenbaum	65eddfe420	responsive style for password validation	2021-08-26 17:32:51 -04:00
Eric Rosenbaum	ad85a3d525	handle password error	2021-08-26 14:12:53 -04:00
Eric Rosenbaum	ffe1475401	Reload the managers list after transfer	2021-08-26 13:32:34 -04:00
Karishma Chadha	1991070a4d	Merge pull request #5980 from kchadha/host-transfer-message ... Add new host transfer notification message.	2021-08-26 10:06:14 -04:00
Chris Garrity	cb968f3842	[WIP] preliminary intl polyfill ... partial implementation of intl-polyfill. Doesn't include all the www langauges, and we don't want to have to update www each time there is a language added, so this needs to move into scratch-l10n somehow. polyfill.min.js no longer needs the intl.js polyfill, so removed. Should still look at whether the other parts of polyfill.min are needed, but they're unrelated to intl.	2021-08-25 11:13:24 -04:00
Karishma Chadha	c3f7494b8d	Add new host transfer notification message.	2021-08-25 01:21:41 -04:00
Eric Rosenbaum	13e3a540f7	cursor pointer on member tile when selecting	2021-08-24 17:18:05 -04:00
Eric Rosenbaum	198ae5823d	prevent layout change due to validation alert	2021-08-24 15:21:33 -04:00
Eric Rosenbaum	95e43cabd2	"Studio Host" label on curator tab tile, behind feature flag	2021-08-24 15:05:00 -04:00
Eric Rosenbaum	6834d675b1	disable confirm button while submitting	2021-08-24 14:52:11 -04:00
Eric Rosenbaum	5d838ef659	Muted users cannot transfer studio host	2021-08-24 14:36:06 -04:00
Eric Rosenbaum	aecc9cec6e	disable confirm button if there is a password validation error	2021-08-24 10:42:28 -04:00
Eric Rosenbaum	7f4ef784c2	Merge pull request #5959 from ericrosenbaum/transfer-modal3 ... Studio host transfer modal additional work	2021-08-24 10:40:53 -04:00
Eric Rosenbaum	7810ba2d3e	update error code id	2021-08-22 15:28:32 -04:00
Eric Rosenbaum	a8b7961f66	alerts default to 6 seconds	2021-08-20 14:04:09 -04:00
Eric Rosenbaum	b00a2d34f7	Merge branch 'develop' of https://github.com/LLK/scratch-www into transfer-modal3	2021-08-20 13:02:08 -04:00
Sarah Otts	3ae87754a0	Merge pull request #5760 from LankyBox01/patch-1 ... Add line breaks to description	2021-08-20 11:07:27 -04:00
Eric Rosenbaum	76ec4c90d8	More error handling, moved to confirmation step	2021-08-19 18:05:18 -04:00
Eric Rosenbaum	a305a0963d	send password in body of request	2021-08-19 14:54:58 -04:00
Eric Rosenbaum	296506ff84	Merge pull request #5920 from ericrosenbaum/transfer-modal ... Studio host transfer modal (work in progress)	2021-08-19 14:04:35 -04:00
Eric Rosenbaum	123b186e75	display password error tooltip inside modal	2021-08-19 10:50:50 -04:00
Eric Rosenbaum	7df5921381	remove unused part of transfer host tile	2021-08-18 11:40:59 -04:00
Sarah Otts	62858d050c	Merge pull request #5935 from seotts/becomehost-activity-feed ... Add studio host transfer notification to the activity feed	2021-08-18 09:33:28 -04:00
Eric Rosenbaum	8a9999034e	use named color	2021-08-17 21:29:29 -04:00
Eric Rosenbaum	154bb93297	use named color	2021-08-17 21:27:42 -04:00
Eric Rosenbaum	b35f6859cb	Merge branch 'transfer-modal' of https://github.com/ericrosenbaum/scratch-www into transfer-modal	2021-08-17 21:16:03 -04:00
Eric Rosenbaum	f6d8d0331f	update error alert	2021-08-17 21:15:54 -04:00
Eric Rosenbaum	374e78e8c9	remove unused function	2021-08-17 21:15:11 -04:00
Eric Rosenbaum	16f6d83db0	update strings	2021-08-17 21:14:46 -04:00
Eric Rosenbaum	6253e71d70	change name of isHost selector helper	2021-08-17 21:14:36 -04:00
Eric Rosenbaum	3e2249c316	Update src/views/studio/modals/transfer-host-modal.scss ... Co-authored-by: Sarah Otts <se0042@gmail.com>	2021-08-17 21:13:58 -04:00
Eric Rosenbaum	04ff4d173b	Update src/views/studio/modals/transfer-host-modal.scss ... Co-authored-by: Sarah Otts <se0042@gmail.com>	2021-08-17 21:13:38 -04:00
Eric Rosenbaum	0f4fba7804	clarify comment	2021-08-17 20:47:56 -04:00
seotts	f635e14a17	remove period from message	2021-08-17 11:18:10 -04:00
seotts	aec365c8db	Add becomehost notification to the activity feed	2021-08-16 14:50:58 -04:00
Eric Rosenbaum	d797309d23	add load more button	2021-08-13 15:46:15 -04:00
Eric Rosenbaum	c928a21135	update permissions	2021-08-13 15:46:15 -04:00
Eric Rosenbaum	b4c96f3193	fix permissions and correctly select host when admins transfer	2021-08-13 15:46:15 -04:00
Eric Rosenbaum	596816d7d1	admin can transfer host	2021-08-13 15:46:15 -04:00
Eric Rosenbaum	f7e221a46c	revert change to "Studio Creator" label on manager tile	2021-08-11 09:44:21 -04:00
Eric Rosenbaum	ae3135bf04	Use "host" instead of "owner"	2021-08-11 09:34:55 -04:00
Eric Rosenbaum	f964d6a1b8	Merge branch 'develop' of https://github.com/LLK/scratch-www into transfer-modal	2021-08-10 17:10:11 -04:00
Ray Schamp	4bc4e62ca9	Merge pull request #5720 from paulkaplan/extract-css ... Extract css from js into stylesheets	2021-08-10 10:49:51 -04:00
rschamp	e3d802e625	Remove /sec, redirect to version on sip site	2021-08-10 09:21:30 -04:00
rschamp	2d42c205ad	Content updates, resolves #5902	2021-08-10 09:18:04 -04:00
rschamp	378f1db783	Update link to download AIR, remove outdated content ... Resolves #5132. Thanks to @carljbowman for support	2021-08-09 13:42:59 -04:00
Eric Rosenbaum	e9045ceab2	info step style fix	2021-08-06 10:28:50 -04:00
jeffalo	feb80afb35	revert	2021-08-06 12:29:00 +02:00
jeffalo	992baf7745	see if returning null will fix errors	2021-08-06 12:26:56 +02:00
Eric Rosenbaum	3473b7d2e1	Enter key triggers submit instead of back button	2021-08-05 20:05:41 -04:00
Eric Rosenbaum	3846956ac9	cleanup and style fixes	2021-08-05 20:01:47 -04:00
Eric Rosenbaum	827ce37d26	disable confirm if password input is empty	2021-08-05 19:57:00 -04:00
Eric Rosenbaum	8327f382a2	add generic error alert	2021-08-05 19:56:36 -04:00
Eric Rosenbaum	572e36be21	new design for confirmation step	2021-08-05 15:56:09 -04:00
Eric Rosenbaum	5f98e35947	lint	2021-08-05 15:36:11 -04:00
Eric Rosenbaum	1b8ea3112e	send password with transfer request	2021-08-05 15:35:19 -04:00
jeffalo	dbf68ff9b4	satisfy eslint	2021-08-05 21:33:59 +02:00
jeffalo	e1afa432a2	also don't allow only whitespace	2021-08-05 21:18:36 +02:00
jeffalo	7e1aebf9b4	prevent searches for empty strings	2021-08-05 21:12:22 +02:00
apple502j	9a390eafeb	Move FAQ page to /faq	2021-08-06 02:55:11 +09:00
rschamp	f5fa49fa45	WIP: Use conditional importing for intl polyfills	2021-08-05 12:11:45 -04:00
Ray Schamp	5610e1b217	Merge pull request #5719 from paulkaplan/dynamic-import ... Support dynamic imports to load code only when needed	2021-08-05 11:12:50 -04:00
rschamp	81ff3d6216	Revert "feat(annual-report): dynamically load the world map when it is scrolled to" ... This reverts commit bc43ad7e29.	2021-08-05 11:09:04 -04:00
Eric Rosenbaum	5a7a448c5c	fix transfer tile layout	2021-08-02 11:41:58 -04:00
Eric Rosenbaum	2cf68bbc07	style confirmation step	2021-08-02 11:21:47 -04:00
Eric Rosenbaum	fa63ca8c2d	styling confirmation step tiles	2021-08-02 10:20:36 -04:00
Eric Rosenbaum	59b98c5d3b	lint the lint	2021-07-29 11:18:33 -04:00
Eric Rosenbaum	acda9b88f0	styling selection scroll pane	2021-07-29 11:17:18 -04:00
Eric Rosenbaum	72aa0c2cf3	Styling for selection step	2021-07-29 11:04:58 -04:00
Eric Rosenbaum	bb8fe2de40	fix fake alert width	2021-07-29 10:37:43 -04:00
Eric Rosenbaum	2c7d6b4cd0	use arrow svg	2021-07-29 10:37:21 -04:00
Eric Rosenbaum	d0d32e81e9	style selection tiles	2021-07-27 11:21:14 -04:00
LankyBox01	a34c0c2a52	Add line breaks to description ... https://github.com/LLK/scratch-www/issues/5710 It's been 10 days since the last comment lol	2021-07-25 12:49:09 +03:00
Eric Rosenbaum	5811332cd7	lint fixes	2021-07-23 13:57:25 -04:00
Eric Rosenbaum	4bf7a2d307	lint fixes	2021-07-23 13:34:22 -04:00
Eric Rosenbaum	c09bac2e41	working on styles	2021-07-23 12:01:47 -04:00
Eric Rosenbaum	083cff87d8	add disabled button style	2021-07-23 11:35:20 -04:00
Eric Rosenbaum	8910ba435b	update wording to use host	2021-07-23 10:38:29 -04:00
Eric Rosenbaum	d79acf1994	update route name	2021-07-23 10:38:05 -04:00
Eric Rosenbaum	bd5cf65692	move transferOwnership into the tile for error handling	2021-07-20 11:58:26 -04:00
Eric Rosenbaum	072e888c1d	use feature flag	2021-07-20 10:51:10 -04:00
Eric Rosenbaum	4d438d0cd6	add content to confirmation step	2021-07-19 11:17:52 -04:00
Eric Rosenbaum	d4253bdd2e	transfer ownership selection step uses its own grid	2021-07-19 11:17:27 -04:00
Eric Rosenbaum	1e99722801	use regular form instead of formik	2021-07-16 21:37:22 -04:00
Eric Rosenbaum	a55442d07f	make api request with auth	2021-07-15 15:20:28 -04:00
Eric Rosenbaum	d1fdf9556d	cleanup transfer ownership action	2021-07-15 14:41:52 -04:00
Eric Rosenbaum	236394550b	add password field	2021-07-15 14:41:38 -04:00
Eric Rosenbaum	09822abfc4	connect transferOwnership action to confirm button	2021-07-14 17:25:23 -04:00
Eric Rosenbaum	f6463ba538	add transfer ownership action	2021-07-14 17:12:25 -04:00
Eric Rosenbaum	43ee5896b5	show usernames in confirmation step	2021-07-14 16:27:00 -04:00
seotts	aa42941226	Fix locations in SEC page	2021-07-14 15:46:02 -04:00
Eric Rosenbaum	1b455d6fbd	add mock tiles to confirm step	2021-07-14 15:35:45 -04:00
Eric Rosenbaum	cbc5c68203	remove unused prop	2021-07-14 15:35:34 -04:00
Eric Rosenbaum	1dfb681def	add initial version of confirmation step	2021-07-14 12:01:22 -04:00
Sarah Otts	3bf403e3c1	Merge pull request #5718 from zoebentley/sec-participating-orgs ... Update SEC landing page with list of participating orgs and partner orgs	2021-07-13 17:01:51 -04:00
Eric Rosenbaum	211ff1bb04	Add selectable user tile	2021-07-13 12:05:54 -04:00
Zoë Bentley	66148879b3	Made org names and letter titles non-translated, fixed a CSS error, and removed unused strings	2021-07-13 10:53:33 -04:00
Zoë Bentley	a9aeda17cf	lint 3	2021-07-13 09:30:03 -04:00
Zoë Bentley	69a383ceb2	Added links and locations for partner organizations	2021-07-12 17:19:30 -04:00
Paul Kaplan	f134dbf201	perf(styles): extract css from js into stylesheets	2021-07-12 14:48:08 -04:00
Paul Kaplan	bc43ad7e29	feat(annual-report): dynamically load the world map when it is scrolled to	2021-07-12 14:34:24 -04:00
Paul Kaplan	8e4ee5fb7a	feat(build): support dynamic import ... add the babel plugin for dynamic import syntax and fixup the path references in webpack and template so the chunks can be loaded dynamically	2021-07-12 14:34:17 -04:00
Zoë Bentley	0149718c8d	lint 2	2021-07-12 11:32:09 -04:00
Zoë Bentley	791b4c7cde	lint	2021-07-12 11:31:49 -04:00
Zoë Bentley	15ad33aa05	Added ILCE to list of orgs	2021-07-12 11:16:16 -04:00
Zoë Bentley	f660af26eb	Updated SEC page with 39 participating orgs and 6 partner orgs	2021-07-12 10:43:01 -04:00
Eric Rosenbaum	6fb1e7ccd2	do not show option to transfer ownership to yourself	2021-07-09 17:01:34 -04:00
Eric Rosenbaum	f8195d1024	only show ownership transfer option if there are >1 managers	2021-07-09 16:43:00 -04:00
Eric Rosenbaum	d7858e9a1a	initial work on transfer ownership selection step	2021-07-09 15:09:35 -04:00
Eric Rosenbaum	a16ef0c3d5	first step of transfer ownership modal	2021-07-09 11:42:56 -04:00
Paul Kaplan	dcf2682f09	Merge pull request #5662 from paulkaplan/test-studio-member-actions ... Create detailed unit tests for studio-member-actions	2021-07-07 15:28:55 -04:00
Paul Kaplan	ad386714a9	fix(studios): remove duplicate css for full width load more buttons ... Remove the `display: content;` way of making the load more button full width, and reuse the existing shared css class instead. Also change the markup back to the way it was originally, with the load more button within the grid, since that is how it is meant to be used	2021-07-06 15:06:26 -04:00
Paul Kaplan	d693beb1b3	fix(studios): share css to make load more buttons full width ... Changes the markup and css classes used by activity, curators, managers and projects grids to use a shared full-width load more button	2021-07-06 14:51:16 -04:00
Paul Kaplan	4866d96da1	fix(studios): change the curators, projects and managers load count to 24 ... Changing from 20 to 24 will fix the issue where we are loading rows that aren't "full" on a 3-tile row. Now it will always fill a row no matter the display breakpoint (1,2 or 3 tiles per row)	2021-07-06 14:36:12 -04:00
Paul Kaplan	e719d25e3d	fix(studio): do not show mute error as if manager can edit info	2021-07-06 10:42:02 -04:00
Karishma Chadha	6dbf8d1bd5	Merge pull request #5692 from kchadha/manager-permissions ... Update manager permissions for studios.	2021-07-06 09:22:59 -04:00
Paul Kaplan	54b9161dc0	fix(studio): prevent duplicate submissions on studio project browser modal	2021-07-01 13:36:29 -04:00
Paul Kaplan	e835cafc37	fix(studio): limit the max length of studio titles on the client side	2021-07-01 11:50:54 -04:00
Karishma Chadha	d0ad0a45d4	Update manager permissions for studios.	2021-06-25 12:41:36 -04:00
Paul Kaplan	b2c9c922d3	Use errors from project adder in the add to studio modal	2021-06-25 12:13:29 -04:00
apple502j	3b9383d930	Link community guidelines in project.defaultCensoredMessage	2021-06-26 00:18:34 +09:00
Paul Kaplan	e6d65c1364	Revert "Revert "Switch studios route to real version for testing on staging""	2021-06-25 10:53:00 -04:00
Paul Kaplan	1027b82f66	Include unit tests for more of the action creators	2021-06-25 10:43:33 -04:00
Paul Kaplan	ffb0e96f47	Merge pull request #5664 from LLK/revert-5660-revert-5630-reduce-reply-requests ... Reduce reply requests, for real this time I promise	2021-06-24 14:51:39 -04:00
Sarah Otts	3958d9df7d	Merge pull request #5659 from seotts/manager-modal-padding ... Change manager modal width	2021-06-24 14:33:10 -04:00
Sarah Otts	d5a94ae59c	Merge pull request #5658 from seotts/add-by-url-text ... Match Add Project placeholder & button text to old studios	2021-06-24 14:33:02 -04:00
Paul Kaplan	975d24cd5d	Revert "Revert "Only request replies if reply_count > 0""	2021-06-24 10:59:09 -04:00
Paul Kaplan	c9ba9d443c	Add tests for all studio-member-actions	2021-06-23 21:28:33 -04:00
Paul Kaplan	a8ed7410a4	Separate studio reducers and initial state into a helper	2021-06-23 20:57:30 -04:00
Paul Kaplan	8a3e6155c4	Separate helper for creating the default redux store for www pages	2021-06-23 20:56:48 -04:00
Karishma Chadha	10f887f8ba	Revert "Only request replies if reply_count > 0"	2021-06-23 16:30:20 -04:00
seotts	29a818a5bc	Change http to https in placeholder	2021-06-23 14:26:03 -04:00
seotts	a3b3a66f7a	Rename button; change placeholder text ... lint fix lint	2021-06-23 14:13:49 -04:00
seotts	0f43addd10	Change manager modal width	2021-06-23 14:06:57 -04:00
Paul Kaplan	b3795c943f	Merge pull request #5630 from paulkaplan/reduce-reply-requests ... Only request replies if reply_count > 0	2021-06-23 12:40:45 -04:00
Paul Kaplan	b5a68924c9	Merge pull request #5651 from paulkaplan/update-reply-count-for-new-replies ... Update the reply_count when you leave a reply	2021-06-23 12:38:33 -04:00
Paul Kaplan	614cfdc4bb	Update src/redux/comments.js ... Co-authored-by: Karishma Chadha <kchadha@scratch.mit.edu>	2021-06-23 12:37:15 -04:00
Paul Kaplan	810465bfcf	Merge branch 'develop' into no-report-own-comments	2021-06-23 09:49:38 -04:00
Paul Kaplan	96cb2f7959	Revert "Switch studios route to real version for testing on staging"	2021-06-23 09:29:04 -04:00
DD Liu	b7eb0b9026	Merge pull request #5653 from fsih/hoverState ... Studio tab nav button styling	2021-06-22 20:01:16 -04:00
DD Liu	a85fb9c5dd	Merge pull request #5652 from fsih/replacePngs ... Replace pngs with svgs	2021-06-22 19:44:23 -04:00
DD Liu	d3e400485e	Fix syntax	2021-06-22 19:37:41 -04:00
DD Liu	cf26eb9cb2	Increase the padding in and around tab nav buttons	2021-06-22 16:48:18 -04:00
Paul Kaplan	d1242f8f26	Merge pull request #5645 from paulkaplan/fix-admin-panel-spacing	2021-06-22 14:39:27 -04:00
DD Liu	2ebd1be1a8	Make the tab button hover states match the spec	2021-06-22 13:40:33 -04:00
Paul Kaplan	d575928ea1	Merge pull request #5646 from paulkaplan/fix-studio-grid-spacing ... Make column and row gaps the same on studio tile grids	2021-06-22 12:11:41 -04:00
Paul Kaplan	581f4d0cac	Update the reply_count when you leave a reply	2021-06-22 12:03:13 -04:00
DD Liu	4ecffa885f	Replace pngs with svgs	2021-06-22 02:45:28 -04:00
Paul Kaplan	cfd52d9369	Pass a customized comment component for studios	2021-06-21 16:06:40 -04:00
Paul Kaplan	fced16b08c	Make Comment component a prop	2021-06-21 15:37:36 -04:00
Paul Kaplan	53b207e003	Only show reply button when comments are allowed	2021-06-21 12:56:29 -04:00
Paul Kaplan	547f5b959b	Make column and row gaps the same	2021-06-21 12:36:53 -04:00
Paul Kaplan	1cace60ebd	Fix admin panel space remaining after logging out	2021-06-21 12:25:19 -04:00
Eric Rosenbaum	303d800041	Merge pull request #5632 from ericrosenbaum/add-to-studio-fixes ... Style fixes for "add to studio" modal	2021-06-18 15:43:33 -04:00
Paul Kaplan	1eb91e22b3	Merge pull request #5631 from paulkaplan/final-studio-routes ... Switch studios route to real version for testing on staging	2021-06-18 15:41:32 -04:00
Paul Kaplan	6e43607a1d	Merge pull request #5633 from paulkaplan/remove-debug-errors ... Improve errors around following studios	2021-06-18 15:01:23 -04:00
Paul Kaplan	10bcc2319a	Fix typo in translation string	2021-06-18 14:59:32 -04:00
Paul Kaplan	d5e9dd0829	Merge pull request #5609 from fsih/adjustResponsive ... Adjust responsive boundaries for grid reflow	2021-06-18 14:52:32 -04:00
Paul Kaplan	48958ddba4	Merge pull request #5607 from fsih/textBoxGray ... Make the border of editable fields dashed gray for studios. Otherwise, make them match the fields on project pages	2021-06-18 14:52:18 -04:00
Paul Kaplan	ae202c7bcd	Remove Debug component in studios	2021-06-18 11:49:57 -04:00
Paul Kaplan	fa8aff5837	Replace debug error on StudioFollow	2021-06-18 11:27:00 -04:00
Paul Kaplan	4c2b588926	Include react-hooks eslint plugin to prevent hooks usage errors. ... I'm including this now because when implementing the studio follow error messaging, I made a mistake (conditionally calling useState) that was tough to track down, and this linter plugin prevents that.	2021-06-18 11:09:43 -04:00
Eric Rosenbaum	ffdf39282d	gray border above done button row	2021-06-18 10:35:19 -04:00
Eric Rosenbaum	06e074bbe8	fix bottom padding	2021-06-18 10:32:02 -04:00
Paul Kaplan	7330bc00f5	Update studios route to final version for testing	2021-06-18 10:29:24 -04:00
Paul Kaplan	2e976e0358	Only request replies if reply_count > 0	2021-06-18 10:14:50 -04:00
Eric Rosenbaum	b913d5f3ae	restyle nav buttons	2021-06-17 22:50:10 -04:00
seotts	ad3f50ac10	Revert "Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-page"" ... This reverts commit 5b7127a271. # Conflicts: # src/views/preview/subactions.jsx	2021-06-17 17:19:51 -04:00
seotts	60b98908e0	use selectIsMuted to determine whether to show error	2021-06-17 17:18:40 -04:00
picklesrus	fe82cf3873	fix indentation	2021-06-17 15:48:38 -04:00
picklesrus	292bb02483	Merge branch 'develop' into studio-comments-off	2021-06-17 15:46:28 -04:00
Paul Kaplan	588ee63204	Merge pull request #5626 from ericrosenbaum/studio-single-comment ... Studio single comment view	2021-06-17 15:01:32 -04:00
Paul Kaplan	cf0f4ee6b3	Merge pull request #5620 from paulkaplan/view-deleteted-studios ... Admins can view deleted studios	2021-06-17 15:00:02 -04:00
Eric Rosenbaum	1605e23d5f	fix logic for single comment effect	2021-06-17 14:05:25 -04:00
Eric Rosenbaum	a5800cb8fb	revert change to comment limit	2021-06-17 14:04:34 -04:00
picklesrus	7d2d0cb3d9	Fix lint	2021-06-17 13:55:39 -04:00
picklesrus	d3e368bce2	Merge branch 'develop' into studio-comments-off	2021-06-17 13:47:03 -04:00
Eric Rosenbaum	bba5b69cb9	Merge pull request #5617 from LLK/release/2021-06-16 ... Develop release/2021-06-16	2021-06-17 13:17:50 -04:00
Paul Kaplan	23f7e563ab	Include deleted studio banner	2021-06-17 12:37:45 -04:00
Karishma Chadha	f4b0bc8aee	Merge pull request #5621 from kchadha/studio-permissions-audit ... Studio creators and managers can delete their own comments	2021-06-17 12:21:40 -04:00
Eric Rosenbaum	8c9cc0e859	load more button style	2021-06-17 10:03:24 -04:00
Eric Rosenbaum	0e49452fc7	expand replies	2021-06-17 09:49:23 -04:00
seotts	5b7127a271	Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-page" ... This reverts commit d468072552, reversing changes made to 469878a2fc.	2021-06-17 09:02:31 -04:00
Eric Rosenbaum	48c3032f54	load single comment	2021-06-16 17:42:40 -04:00
Karishma Chadha	8821e0e865	Studio creators and managers can delete their own comments	2021-06-16 11:17:43 -04:00
Paul Kaplan	43b8b74d0c	Move studio info request to top level	2021-06-16 09:55:29 -04:00
Paul Kaplan	4db968970a	Use admin routes for studio info, curators, managers and activity	2021-06-16 09:54:40 -04:00
picklesrus	91f1c7ccf9	Merge branch 'studio-comments-off' of https://github.com/picklesrus/scratch-www into studio-comments-off ... resolve conflicts	2021-06-15 17:25:22 -04:00
picklesrus	64f9d80c2a	Merge branch 'develop' into studio-comments-off	2021-06-15 17:24:43 -04:00
picklesrus	36516447cc	Fix up tests from refactor and fix bug from refactor.	2021-06-15 17:22:32 -04:00
Eric Rosenbaum	7c0ec57165	add loading spinner	2021-06-15 15:35:25 -04:00
Sarah Otts	d468072552	Merge pull request #5573 from seotts/muted-add-proj-via-proj-page ... Muted users can’t add projects to studio via project page	2021-06-15 15:26:47 -04:00
Eric Rosenbaum	469878a2fc	Merge pull request #5608 from fsih/thumbWhiteBg ... Adjust thumbnail css	2021-06-15 15:06:09 -04:00
Sarah Otts	a0ab492bd9	Merge branch 'develop' into muted-add-proj-via-proj-page	2021-06-15 14:50:15 -04:00
Eric Rosenbaum	6bbc62c5e3	thumbnail in report matches main thumbnail style	2021-06-15 12:16:33 -04:00
Eric Rosenbaum	a344f1280d	style fixes	2021-06-15 12:16:04 -04:00
Eric Rosenbaum	cbbd0ebdaf	style empty state	2021-06-15 10:51:45 -04:00
seotts	1a753dfde3	Put Add to Studio change behind session flag	2021-06-15 09:45:09 -04:00
seotts	56dc892ee5	Muted user can’t add proj to studio via proj page	2021-06-15 09:45:09 -04:00
DD Liu	f11cd55995	Adjust responsive boundaries for grid reflow	2021-06-15 04:30:39 -04:00
DD Liu	df19f1b421	Adjust thumbnail css	2021-06-15 03:49:41 -04:00
DD Liu	8ea97e4577	Make the border of editable fields dashed gray for studios. Otherwise, make them match the fields on project pages.	2021-06-15 01:58:04 -04:00
Eric Rosenbaum	a2169d71c4	responsive fixed height	2021-06-14 17:45:20 -04:00
picklesrus	6b4bab02d1	Move logic about whether session is fetched into selectors	2021-06-14 17:15:47 -04:00
Sarah Otts	a7dae0561b	Merge branch 'develop' into muted-errors-from-backend	2021-06-14 15:40:05 -04:00
Ray Schamp	a17919e561	Merge pull request #5496 from rschamp/rearrange-conference-2021 ... Bump Conference 2020 to 2021 (Take 2)	2021-06-14 09:01:51 -04:00
DD Liu	2d884eef64	Merge pull request #5578 from fsih/whiteButtons ... Make the default nav button state white	2021-06-13 23:07:33 -04:00
DD Liu	deb1f5eb7e	Merge pull request #5580 from fsih/titleLimit ... Make the title scroll after a certain length, and long words wrap	2021-06-13 23:07:23 -04:00
Karishma Chadha	8ab13436c0	Merge pull request #5588 from kchadha/manager-limit ... Studio Manager Limit	2021-06-11 16:39:27 -04:00
Karishma Chadha	85beabad19	Remove unneded redux connect code	2021-06-11 15:58:22 -04:00
Karishma Chadha	c773018c8e	Update managerCount in redux when promoting a curator or removing a manager.	2021-06-11 15:55:28 -04:00
Karishma Chadha	75687e52f7	Remove commented out CSS styling	2021-06-11 14:17:21 -04:00
Karishma Chadha	6486f119a3	fix trailing space issue	2021-06-10 19:40:53 -04:00
Karishma Chadha	9fc2f8167d	Fix prop warning in the studio curator invite box.	2021-06-10 19:24:54 -04:00
Karishma Chadha	96aeabd255	Display info to managers/studio creator about how close the studio is to reaching the manager limit when over a threshold. Display info about removing managers when a studio has reached the limit.	2021-06-10 19:24:25 -04:00
Karishma Chadha	40b8f5a5c9	Update styling of promote modal so that if we get a network or other server error while trying to promote, we see the error message in the modal (and closer to the promote button).	2021-06-10 19:22:22 -04:00
Karishma Chadha	51858167c9	Display manager limit modal in two scenarios: if the frontend already knows that the manager limit has been reached, and if we have the promote modal up, but we got response from the server that the manager limit has been reached.	2021-06-10 19:20:51 -04:00
Karishma Chadha	e0e53b8d73	Create manager limit modal (modeled off of the promote-curator modal) which will be displayed if the user clicks promote when the manager limit has already been reached.	2021-06-10 19:17:07 -04:00
Karishma Chadha	ce8e270309	Set up state, tracking the number of managers the limits used to display info to the user. Handle new error response when trying to promote a curator.	2021-06-10 19:13:48 -04:00
picklesrus	17307cacd3	Add tests	2021-06-10 16:51:41 -04:00
picklesrus	fcbcef244b	Show a status message in place of the usual comment components when studio comments are turned off.	2021-06-10 15:36:48 -04:00
Eric Rosenbaum	c7ba97d291	Empty state styling	2021-06-10 10:52:23 -04:00
Eric Rosenbaum	b6a91adf78	add empty states and done button	2021-06-09 17:38:22 -04:00
DD Liu	ee95a708b5	Make the title scroll after a certain length, and long words wrap	2021-06-09 14:57:53 -04:00
seotts	4f25a2ae34	Don’t show errors for toggling openToAll or commentsAllowed	2021-06-09 14:08:52 -04:00
seotts	91d66cd20b	Display backend mute errors on studio edit	2021-06-09 14:08:51 -04:00
Eric Rosenbaum	b7eb303217	Merge pull request #5568 from ericrosenbaum/hide-validation ... Hide validation message on click outside	2021-06-09 09:56:04 -04:00
picklesrus	b65ab82a89	Merge pull request #5561 from picklesrus/project-comments ... handle project comments turned off	2021-06-09 09:41:44 -04:00
picklesrus	0edd946fee	Address review comments	2021-06-09 09:08:16 -04:00
DD Liu	af5f810212	Make the default nav button state white. Also remove that weird tiny bit of resizing when you click on them, was that intentional?	2021-06-08 22:26:05 -04:00
Eric Rosenbaum	d9169e1892	catch errors	2021-06-08 14:55:37 -04:00
Eric Rosenbaum	5ba6bb83b9	hide validation on click outside for description	2021-06-08 14:16:23 -04:00
Eric Rosenbaum	b0a9bab71a	hide validation on click outside for thumnbail image	2021-06-08 13:58:21 -04:00
seotts	3d6a789812	update session when user gets muted	2021-06-08 13:38:35 -04:00
Eric Rosenbaum	935ec7acad	simplify wrapping	2021-06-08 11:01:54 -04:00
Eric Rosenbaum	6af78c45e5	hide validation message on click outside	2021-06-08 10:53:47 -04:00
picklesrus	ef801112cd	Merge branch 'develop' into project-comments	2021-06-07 15:38:40 -04:00
picklesrus	1afbe4ad79	clean up	2021-06-07 15:31:20 -04:00
picklesrus	993dd36aa5	WIP of being able to turn off project comments.	2021-06-07 11:28:29 -04:00
Karishma Chadha	7e1eb3a2f8	Merge pull request #5539 from kchadha/reply-thread-refresh-fix ... Use reply_count to check whether reply limit is reached	2021-06-03 11:09:04 -04:00
Karishma Chadha	9b323d99a0	Fix reply status box alignment.	2021-06-02 18:14:09 -04:00
Karishma Chadha	17ada7172d	Add totalReplyCount prop to check whether thread has reached limit instead of checking only the 20 we load on the first try	2021-06-02 17:38:10 -04:00
Karishma Chadha	c377af81f2	Fix l10n string ID where it previously got missed.	2021-06-02 15:45:07 -04:00
Karishma Chadha	e2db890814	Merge pull request #5495 from kchadha/comment-thread-limit ... Comment thread limit	2021-06-02 14:08:03 -04:00
Eric Rosenbaum	be047a5a7b	Merge pull request #5503 from ericrosenbaum/promote-modal ... Add "Promote to manager" modal	2021-06-02 10:51:05 -04:00
Karishma Chadha	da231ed3af	Change l10n string ID to match server error	2021-06-02 10:48:04 -04:00
Eric Rosenbaum	9ccbe94be1	add promote modal	2021-05-26 22:54:23 -04:00
DD Liu	2179ade65e	Fix lint	2021-05-26 15:00:52 -04:00
DD Liu	cd930046bb	Merge branch 'develop' into commentsNotAllowed	2021-05-26 14:47:20 -04:00
DD Liu	217c7ecafc	Add comments not allowed box	2021-05-26 14:45:47 -04:00
Paul Kaplan	8451e57a8a	Merge branch 'develop' into studio-curator-invite	2021-05-26 12:09:17 -04:00
Paul Kaplan	3ca94ee6cf	Merge branch 'develop' into studio-curator-invite	2021-05-26 12:07:05 -04:00
Paul Kaplan	dbf7522856	Merge branch 'develop' into editThumbnailButton	2021-05-26 12:02:54 -04:00
Paul Kaplan	3621cd24cf	Add edit icon	2021-05-26 11:59:58 -04:00
Paul Kaplan	f44cc23a98	Merge branch 'develop' into studio-meta	2021-05-26 11:55:35 -04:00
Paul Kaplan	60b154126d	Merge pull request #5467 from seotts/muted-users-cant-edit-studios ... Prototype: muted users can't edit studios	2021-05-26 11:01:47 -04:00
Paul Kaplan	47560e5d5e	Use the correct l10n message for curator page	2021-05-26 10:58:28 -04:00
Paul Kaplan	cb8a869e4f	Merge branch 'develop' into muted-users-cant-edit-studios	2021-05-26 10:58:12 -04:00
rschamp	31e6616544	Rename all Conference 2020 folders to 2021 ... This is both to reduce confusion in the future, and so that Transifex sees what it expects, with the name of the resource corresponding to the path to the l10n file.	2021-05-26 10:22:12 -04:00
rschamp	232d9f3bbd	Revert "Merge pull request #5494 from LLK/revert-5476-rearrange-conference-2021" ... This reverts commit 4edab6927e, reversing changes made to 7b7322c9f9.	2021-05-26 09:40:41 -04:00
Ray Schamp	f902e25b0f	Revert "Bump conference URL one year"	2021-05-26 09:35:35 -04:00
Karishma Chadha	6870db418e	Track which comment thread has the thread limit status box so that only one status box is displayed in the whole studio comments view.	2021-05-25 23:19:36 -04:00
Karishma Chadha	e57cd9a111	Introduce comment thread limit on studio comments. When a user clicks reply on a thread that has reached the limit, display a comment status message in place of the comment composer. The user should only see one status box in a message thread.	2021-05-25 23:17:57 -04:00
DD Liu	eff5803b92	Fix lint issues	2021-05-25 17:35:18 -04:00
DD Liu	8f542fa5e5	Change file input to edit thumbnail icon"	2021-05-25 17:30:38 -04:00
rschamp	c52677ccc6	Update community guidelines	2021-05-25 11:05:17 -04:00
Paul Kaplan	0ccf28e388	Merge pull request #5466 from ericrosenbaum/load-24-projects-per-page ... Small fixes for "add to studio" modal	2021-05-25 10:00:03 -04:00
Paul Kaplan	5903f57597	Merge pull request #5468 from cwillisf/studios-stats-and-icons ... Studios stats and icons	2021-05-25 09:53:18 -04:00
Paul Kaplan	f50d8dbf66	Wrap counts in span for styling	2021-05-25 09:48:33 -04:00
Eric Rosenbaum	e5212234ac	lint	2021-05-24 17:22:20 -04:00
Eric Rosenbaum	a390c0655f	Merge branch 'develop' of https://github.com/LLK/scratch-www into load-24-projects-per-page ... # Conflicts: # src/views/studio/modals/user-projects-modal.jsx	2021-05-24 17:18:09 -04:00
Eric Rosenbaum	a194b48566	load more button is fill width	2021-05-24 17:12:20 -04:00
Paul Kaplan	832324ea83	Merge pull request #5451 from paulkaplan/studio-alerts ... Alert component and studio error and success alerts	2021-05-24 15:33:10 -04:00
Paul Kaplan	f9702d9017	Merge pull request #5437 from paulkaplan/fix-studio-project-adding-errors ... Handle more types of project add errors	2021-05-24 15:32:37 -04:00
Paul Kaplan	2c53c70307	Merge pull request #5436 from paulkaplan/fix-admin-studio-comments ... Wait for session to be fetched before loading comments	2021-05-24 15:32:24 -04:00
Ray Schamp	460010e64f	Merge pull request #5476 from rschamp/rearrange-conference-2021 ... Bump conference URL one year	2021-05-24 13:53:22 -04:00
Bryce Taylor	bfe64aa313	Merge pull request #4540 from BryceLTaylor/move-navbar-tests ... Move Navbar integration tests from Tap to Jest	2021-05-24 10:57:21 -04:00
rschamp	40295d3860	Bump conference URL one year ... Resolves #5197	2021-05-24 09:36:47 -04:00
Eric Rosenbaum	b1b0d6b259	add/remove icons for project tiles	2021-05-21 17:01:08 -04:00
Christopher Willis-Ford	59e7490a46	fix nav tab size change on click	2021-05-21 12:53:14 -07:00
Christopher Willis-Ford	ad6675f64d	show '100+' if project/comment count is 100 or more	2021-05-21 12:43:57 -07:00
Christopher Willis-Ford	87f4fb3a9c	add icon & style to the StudioReport button	2021-05-21 12:43:57 -07:00
Christopher Willis-Ford	ddaa099cf0	add icons to StudioStats	2021-05-21 12:43:52 -07:00
Christopher Willis-Ford	594cd7a285	add tab icons to StudioTabNav	2021-05-21 12:41:52 -07:00
Christopher Willis-Ford	b21e55b5f3	add followers, last-updated date to studio sidebar	2021-05-21 10:31:35 -07:00
Christopher Willis-Ford	a0992bb5f7	add project and comment count to StudioTabNav	2021-05-21 10:31:30 -07:00
Eric Rosenbaum	0a9e465830	style border for added projects	2021-05-21 11:09:43 -04:00
seotts	6798380ca8	Fix conflicts ... d	2021-05-21 10:29:38 -04:00
seotts	3212ccf7cb	Add a comment about shouldShow*MuteErrors	2021-05-21 10:02:16 -04:00
seotts	4f618336a8	Error should only shrink textarea on small screens	2021-05-21 10:02:16 -04:00
seotts	13739ae0bc	Minor changes to error messages	2021-05-21 10:01:07 -04:00
seotts	dbb258cf8b	Work on tests ... remove failing tests	2021-05-21 10:00:15 -04:00
seotts	4f556785d3	Move whether to show mute both into selectors	2021-05-21 10:00:15 -04:00
seotts	9e8186808d	Correct projects message	2021-05-21 09:59:24 -04:00
seotts	db5358d79c	Show mute edit errors on hover	2021-05-21 09:59:23 -04:00
seotts	19a9997e0f	Muted users can’t edit studios ... linting fixes	2021-05-21 09:46:19 -04:00
Eric Rosenbaum	15b31c689e	load 24 projects per page in add to studio modal	2021-05-21 09:20:51 -04:00
Eric Rosenbaum	a7ab994638	use buttons in subnav to make keyboard nav work	2021-05-20 17:12:27 -04:00
Paul Kaplan	ecd4fa9438	Merge pull request #5458 from ericrosenbaum/studio-report-responsive ... Studio report modal style fixes	2021-05-20 10:04:23 -04:00
Paul Kaplan	29bb2f1f5a	Make the clickable items show a clickable cursor	2021-05-20 10:02:27 -04:00
Paul Kaplan	8832d31fd9	Merge pull request #5444 from paulkaplan/studio-admin-panel ... Studio admin panel	2021-05-20 09:37:59 -04:00
Paul Kaplan	85172b78fa	Use log.error instead of console	2021-05-20 09:32:31 -04:00
Eric Rosenbaum	5acff71cf7	adjust size of thanks modal	2021-05-19 22:44:43 -04:00
Eric Rosenbaum	a621449153	add studio report thanks image	2021-05-19 17:01:15 -04:00
Eric Rosenbaum	39a54b0bd3	update studio report modal text	2021-05-19 15:57:45 -04:00
Paul Kaplan	d0465acb21	Merge pull request #5440 from apple502j/decorate-desc ... Linkify studio descriptions	2021-05-19 15:43:02 -04:00
Paul Kaplan	a405908d0b	While I'm here, fixup the image styling too	2021-05-19 15:37:11 -04:00
Paul Kaplan	1d72806914	Also use a div for the title so it doesn't use scrollbars and fix the alignment	2021-05-19 15:36:56 -04:00
Paul Kaplan	c039a29189	Use the same class name, use tag selector for styling	2021-05-19 15:36:23 -04:00
Paul Kaplan	8a2cbc5ea4	Dont timeout error alerts	2021-05-19 15:09:06 -04:00
Eric Rosenbaum	70d22a0f1e	make studio report modal work on short or narrow screens	2021-05-19 14:27:53 -04:00
Paul Kaplan	64d4bd4fde	Do not use project name in duplicate message since we do not have it	2021-05-19 13:54:29 -04:00
Paul Kaplan	e2eb8611b1	Dont catch pointer events in the alert container	2021-05-19 13:46:06 -04:00
Paul Kaplan	9a931b026e	Add and use alert providers on curators, managers, projects and project modal	2021-05-19 13:36:16 -04:00
Paul Kaplan	5ee1c7c203	Add reusable alert component using context	2021-05-19 13:33:41 -04:00
apple502j	116d640fdd	Set background to studio-description-text	2021-05-20 00:44:46 +09:00
Paul Kaplan	b38a97adf3	Studio admin panel	2021-05-18 11:41:32 -04:00
Eric Rosenbaum	b37481a601	remove unused import	2021-05-18 11:22:46 -04:00
Eric Rosenbaum	f703578b6c	move studio report css into its own file	2021-05-18 11:20:51 -04:00
Eric Rosenbaum	47c12aefa3	move studio report modal into modals dir	2021-05-18 10:41:11 -04:00
Eric Rosenbaum	dc1316c8ff	Merge branch 'develop' of https://github.com/LLK/scratch-www into studio-report-modal	2021-05-18 10:08:30 -04:00
apple502j	536caf994a	Linkify studio descriptions	2021-05-18 05:22:02 +09:00
Paul Kaplan	ff2e321067	Add dynamic meta tags for studio pages	2021-05-17 15:47:51 -04:00
Eric Rosenbaum	33a0be0e35	add placeholder for error handling	2021-05-17 15:44:08 -04:00
Paul Kaplan	b0eae61d5b	Fix periods	2021-05-17 15:32:16 -04:00
Karishma Chadha	bc77b4b257	Merge pull request #5435 from LLK/hotfix/donate-banner-analytics ... [Develop] Hotfix Donate Banner Update	2021-05-17 15:31:27 -04:00
Paul Kaplan	efe961e103	Handle more types of project add errors	2021-05-17 15:24:51 -04:00
Eric Rosenbaum	7bfb045c4f	style tiles and send button	2021-05-17 15:16:08 -04:00
Paul Kaplan	cc66341252	Wait for session to be fetched before loading comments	2021-05-17 14:53:02 -04:00
Eric Rosenbaum	a1c9744ee8	tile styling	2021-05-17 14:15:37 -04:00
Paul Kaplan	b6baedcbab	Merge pull request #5433 from paulkaplan/fix-thumbnail-caching	2021-05-17 13:55:30 -04:00