scratch-www

mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-13 17:21:14 -05:00

Author	SHA1	Message	Date
Matthew Taylor	361afaa937	Make api request on filter change This fixes #1546 by using an updated api endpoint that accepts filter arguments.	2017-10-24 13:10:32 -04:00
The_Grits	cfa55d98e8	Fix gh-1588: Localize "it's free!" String (#1594 ) * Add it's free string * Add it's free string into page * Update presentation.jsx	2017-10-23 11:11:33 -04:00
KT	16f312b0fa	Fix #1612 (#1616 ) * Adding new mods and moving others to "Previous MIT Scratch Team Members" maintaining alphabetical order	2017-10-12 08:26:47 -04:00
Ken	b2e7d57f5a	Resolves #1614 (#1615 ) Email Settings -> Email	2017-10-11 17:07:48 -04:00
Matthew Taylor	a1675cbb7d	hide overflow on comment component (#1611 ) fixes #1568 by imposing a hidden state on overflow text.	2017-10-11 10:09:02 -04:00
Sheshank Shankar	5321712a25	Fix typos in Teacher Accounts FAQ. Resolves GH-1608	2017-10-09 13:49:19 -04:00
Sheshank Shankar	ce7bcd3409	Fix typos in FAQ. Resolves GH-1604	2017-10-08 11:00:31 -04:00
Sheshank Shankar	d99f503002	Fix typo in FAQ. Resolves GH-1601	2017-10-08 10:13:31 -04:00
KT	0301618b9c	Updates to community moderation listing. Resolves GH-1442 Resolves GH-1596 * Removing moderator job listing * Update moderator.jsx	2017-10-08 10:00:09 -04:00
Ken	36cb865f89	Fix TOS and messages typos. Resolves GH-1593 Resolves GH-1595 * fix typo "many not" -> "may not" * Fix typo in l10n.json while I'm at it	2017-10-08 09:58:06 -04:00
Sheshank Shankar	5f4256e7d7	Add Link to profile pic (#1576 ) * Add Link to profile pic * Update comment-message.jsx * Double-Quotes to Single-Quotes * fix indentation * Update comment-message.jsx * Update comment-message.jsx * Update comment-message.jsx	2017-10-04 15:58:24 -04:00
Matthew Taylor	161f50611c	Merge pull request #1590 from mewtaylor/hotfix/message-count-endpoint [Develop] Hotfix: change message count endpoint	2017-10-03 16:49:07 -04:00
Matthew Taylor	75217978c1	Switch message count to new endpoint	2017-10-03 16:37:00 -04:00
Matthew Taylor	2830257b17	Merge pull request #1589 from LLK/release/2.2.25 [Develop] Release 2.2.25	2017-10-03 15:14:26 -04:00
Matthew Taylor	37131df008	Handle message count split in container Fixes issue where admin messages caused social messages to display as unread when they weren’t	2017-10-03 12:53:49 -04:00
Matthew Taylor	d272a2e4e6	Handle case of messages length being less than unreadcount this fixes #1561 by making sure that if the count is retrieved before the messages themselves, there is no error in the console.	2017-10-02 10:33:53 -04:00
Sheshank Shankar	e8671c1727	Add Tina Quach to Credits. Resolves GH-1572 * Add Tina Quach to Credits * Update credits.jsx * Update credits.jsx	2017-09-26 11:10:58 -04:00
chrisgarrity	1d08a9e201	Rename AnimateYourNameGuide to NameGuide remove obsolete static URL so localizations get picked up correctly. git-ignore localized-urls.json as it’s pulled from scratch-resources now.	2017-09-25 17:16:58 -04:00
Andrew Sliwinski	d542f18e74	Merge pull request #1552 from VutonDesign/patch-1 Rewording \| 10n.json	2017-09-20 07:57:38 -04:00
Matthew Taylor	c9eacf4ac3	Merge pull request #1559 from mewtaylor/issue/gh-1545 Fix GH-1545: add `unread` as a key/value on each message	2017-09-19 17:18:42 -04:00
Matthew Taylor	129042fce6	Merge pull request #1553 from mewtaylor/issue/gh-1455 GH-1455: apply path explicitly rather than in `defaults`	2017-09-19 17:14:00 -04:00
Matthew Taylor	a9cb7bbd99	don’t iterate over list if no filter applied thanks @chrisgarrity !	2017-09-19 17:11:46 -04:00
chrisgarrity	5f48fc13e8	Link to pt-br downloads if locale is pt-br (#1558 ) * Link to pt-br downloads if locale is pt-br	2017-09-19 11:56:30 -04:00
Matthew Taylor	9b3b1a2623	render load more even if messages not there This handles #1546 by still checking about whether to display the loadMore button even if messages are not present (i.e. if a subfilter has no messages present).	2017-09-19 10:30:14 -04:00
Matthew Taylor	4fa3c0f761	Merge pull request #1551 from mewtaylor/issue/gh-1540 Fix GH-1540: Direct studio activity link to the activity tab	2017-09-19 10:18:18 -04:00
Matthew Taylor	8c631b40d9	add `unread` as a key/value on each message This fixes #1545 by adding unread as a key/value on each message during the filtering process. This means the unread count is always applied to the list of full messages, and never to a subset (as was happening before to cause #1545).	2017-09-19 10:13:52 -04:00
Matthew Taylor	9a3358b35c	provide a default `opts` if it’s undefined	2017-09-18 14:40:52 -04:00
Ray Schamp	5245123a4c	Merge pull request #1555 from rschamp/hotfix/qa-engineer [Develop] Add QA Engineer posting	2017-09-18 14:16:19 -04:00
Ray Schamp	62ad6ff51f	Add QA Engineer posting	2017-09-18 11:48:01 -04:00
Matthew Taylor	4175c119d2	apply path explicitly rather than in `defaults` This should fix #1455 by preventing the path from being changes via opts passed in, even though we don’t pass in a `path` anywhere.	2017-09-18 11:44:06 -04:00
Vuton Design	20ce38e8d0	Update l10n.json	2017-09-16 09:30:34 +01:00
Linda	e119cea627	Fixes GH-1435/Reduce work for translators on credits page (#1514 ) * Fixes GH-1435/Make as many names as possible on credits page non-translate * fixed the travis error that occured before	2017-09-15 17:24:41 -04:00
Matthew Taylor	1335de9b57	Direct studio activity link to the activity tab Fixes #1540 by ensuring that the anchor link for studio activity is directed to the activity tab of the studio	2017-09-15 15:49:57 -04:00
LiFaytheGoblin	aa8efd0bc9	fixed the travis errors that occured earlier	2017-09-15 14:34:21 +02:00
Matthew Taylor	426259fbe8	Merge pull request #1542 from mewtaylor/issue/manager-thumbnail-activity [Develop] Hotfix: use recipient thumbnail, not actor for manager activity	2017-09-13 14:11:50 -04:00
Matthew Taylor	d4b0207bb0	clean up stuff	2017-09-13 13:51:17 -04:00
Matthew Taylor	98cbfd638f	use recipient thumbnail, not actor for manager activity Fixes an issue where the thumbnail mismatches the username presented	2017-09-13 13:47:27 -04:00
Matthew Taylor	16a5208624	Merge pull request #1477 from Petroochio/IS-1195-radio-button-tabbing Fix issue 1195 registration gender tabbing	2017-09-13 08:26:37 -04:00
Matthew Taylor	556b527dc3	Merge pull request #1529 from towerofnix/fix-class-typo Fix CSS class of forum post message row	2017-09-13 08:18:43 -04:00
Matthew Taylor	94ce746f9b	Merge pull request #1533 from mewtaylor/hotfix/highlight-unread-rows [Develop] Hotfix: highlight unread message row in light blue	2017-09-11 10:16:04 -04:00
Matthew Taylor	057f741f89	highlight unread message row in light blue This addresses issues with seeing unread notifications by highlighting them as light blue, along with more opaque icons	2017-09-11 09:59:24 -04:00
Florrie	14fd4e9a5b	Change CSS class .mod-studio-activity to .mod-forum-activity in forum post message row	2017-09-10 10:11:27 -03:00
Matthew Taylor	9f3b0c903e	Merge branch 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www into develop * 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www: remove debug message	2017-09-09 17:00:39 -04:00
Matthew Taylor	a90dd6e296	remove debug message	2017-09-09 16:59:39 -04:00
Matthew Taylor	88ea667f8c	Merge branch 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www into develop * 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www: call as anonymous method	2017-09-09 16:56:05 -04:00
Matthew Taylor	ffa6b7d376	call as anonymous method	2017-09-09 16:55:43 -04:00
Matthew Taylor	35ab2ebe48	Merge pull request #1525 from mewtaylor/hotfix/fix-interval [Develop] fix parentheses around interval	2017-09-09 16:03:53 -04:00
Matthew Taylor	7917f15874	fix parentheses around interval	2017-09-09 15:56:01 -04:00
Matthew Taylor	2a48f8a9a2	Merge pull request #1523 from LLK/release/messages-page [Develop] Release: new notifications page	2017-09-09 01:07:59 -04:00
Matthew Taylor	d18fd0064b	change width to min-width on icon fixes #1521 but no idea why shrug	2017-09-08 18:09:55 -04:00
Matthew Taylor	026c035af3	adjust line-height for notifications this applies to the comments only	2017-09-08 14:24:59 -04:00
Matthew Taylor	9e3823e6e7	add icons to social message notifications	2017-09-08 14:10:46 -04:00
Matthew Taylor	1dffc08445	change the way invites are assigned assign invites directly to the state rather than by defaults in order to ensure empty objects can be part of an update	2017-09-08 10:24:39 -04:00
Matthew Taylor	7e85d2c731	fix invite for initial	2017-09-08 09:38:47 -04:00
Matthew Taylor	b82d312dd8	make invite an array instead of an object When trying to clear the invite, because invite is currently an object, it’s getting the state’s existing invite re-applied via `defaultsDeep`. Making it an array should solve this issue	2017-09-08 09:29:46 -04:00
Matthew Taylor	7a3290a2ca	show recipient for owner notification	2017-09-07 14:55:48 -04:00
LiFaytheGoblin	b5c44bae96	Fixes GH-1435/Make as many names as possible on credits page non-translate	2017-09-07 17:33:12 +02:00
Andrew Sliwinski	f3ee0443e8	Changed 'Animate a Name' educator guide link. Resolved GH-1509	2017-09-07 08:16:38 -04:00
Matthew Taylor	7945a7eff1	only dispatch count if the `user` is present this prevents a console error	2017-09-06 14:25:44 -04:00
Matthew Taylor	ce88466ee4	tweak formatting for message content helps with comment formatting	2017-09-06 11:41:26 -04:00
Matthew Taylor	2bd9b184c5	Fix GH-[1505, 1507]: hide message counter on 0 (#1510 ) * Hide messages counter when at 0 fixes #1507 * check for body before looking at success fixes #1505	2017-09-06 10:05:14 -04:00
Matthew Taylor	b77e278927	handle logout on messages page (#1503 ) Go back to redirecting to splash on logout, and empty messages page too.	2017-09-05 14:31:10 -04:00
Matthew Taylor	432a6240aa	have tab link go to curator tab	2017-09-05 12:38:16 -04:00
Matthew Taylor	5772eed8f7	use lodash instead of assign this fixes #1500, since lodash works in ie11 but `assign` does not	2017-09-05 12:28:01 -04:00
Matthew Taylor	b7f1f5e913	fix comment message handling add comment message to redux to access the current user, and fix the string	2017-09-05 12:06:06 -04:00
Matthew Taylor	d7fe43fad7	fix commentee assignment	2017-09-05 11:41:56 -04:00
chrisgarrity	c7eabe18c3	Merge pull request #1483 from Petroochio/gh-1470-credits-overflow Fix gh-1470 Firefox Overflow on Credits Page	2017-09-05 10:15:31 -04:00
Matthew Taylor	e9f54b3fd3	use border-bottom, not top this fixes an issue with comment bubble displays in firefox	2017-09-05 10:06:27 -04:00
Matthew Taylor	74400b0599	add comments to redux methods	2017-09-05 10:03:48 -04:00
Matthew Taylor	23c40c8f5e	if social messages less than 0, display 0 handles a caching edge case with admin messages.	2017-09-05 10:03:35 -04:00
chrisgarrity	1311de0a61	Merge pull request #1493 from chrisgarrity/gh1454-teacher-invite Revise student invitation string	2017-09-05 09:57:54 -04:00
Matthew Taylor	6493052725	Use username, not user id, for profile link	2017-09-05 09:10:41 -04:00
Matthew Taylor	b62a4db590	Pass to legacy on message routes with `ajax` Currenlty, some legacy endpoints are failing because they’re being directed to www. A similar thing happened with `/explore`, and this is the same fix	2017-09-01 14:39:47 -04:00
Matthew Taylor	71b93cb207	reduce unread count on successful admin message dismiss	2017-09-01 11:07:21 -04:00
Matthew Taylor	630ae5e462	fix formatting for numbers and for dismiss icon fixes #1494	2017-09-01 11:05:29 -04:00
Matthew Taylor	3dee0e46d2	continue to use proxy msg count for now	2017-09-01 10:20:18 -04:00
Matthew Taylor	654dafdaee	fix binding for admin message dismissal based on https://stackoverflow.com/questions/39009611/react-bindthis-value-in-opposite-order-on-function-declaration	2017-09-01 10:00:20 -04:00
chrisgarrity	b10b8a3d51	Revise student invitation string fixes #1454. Changes ‘has invited you to join the class:’ sentence fragment to a complete sentence ‘Your teacher has invited you to join a class:’ to account for languages that reverse the order of subject/object.	2017-09-01 09:20:36 -04:00
Matthew Taylor	779c42717b	I think I misunderstood the xhr docs	2017-08-31 23:39:49 -04:00
Matthew Taylor	3022a565ce	json-encode body	2017-08-31 18:39:03 -04:00
Matthew Taylor	9ace64fda7	add csrf for message clear requests	2017-08-31 18:24:58 -04:00
Matthew Taylor	6dbc4abdc5	subtract admin notifications from social count fallout from #1487	2017-08-31 17:48:07 -04:00
Matthew Taylor	3dd768f2f6	GH-1361: Implement Notifications Page (#1487 ) * start work on www page committing out of paranoia. including changing splash page endpoints * updates from feedback thanks @rschamp! This includes: 1. splitting out messages list into a separate component (for clarity) 2. some comment/formatting adjustments for the api calls 3. removal of an extraneous property in emoji-text * remove duplicate string declaration * use object.assign instead of defaults deep we don’t need deep defaults * fix react warnings	2017-08-31 17:05:22 -04:00
Matthew Taylor	a089b664da	Merge pull request #1491 from LLK/release/2.2.24 [Develop] Release 2.2.24	2017-08-31 13:41:15 -04:00
Matthew Taylor	38d79df894	Change header for download page follow up from https://github.com/LLK/scratch-www/pull/1475#issuecomment-326034683	2017-08-30 12:58:08 -04:00
The_Grits	9942e91175	Add Tracy Tang (#1489 )	2017-08-29 22:41:10 -04:00
Peter Gyory	59435d9ec6	Fix gh-1470 Firefox Overflow on Credits Page Add specific style on credits page to allow for word wrap	2017-08-23 14:43:18 -06:00
Ken	a5cf7c60d6	Correct “WeDo” case	2017-08-23 10:49:25 +08:00
The_Grits	21210e1fa5	Re-Add Community Moderator (#1480 )	2017-08-22 19:25:31 -04:00
Ken	0f1bd3df17	Update text for “learn more” links (#1478 ) * Update text for “learn more” links * Remove “Scratch” from string	2017-08-22 09:51:21 -04:00
St19_Galla	283572ed29	Fix gh-1472 & gh-1473: FAQ Updates (#1475 ) * various updates * adding 2.0	2017-08-21 18:55:56 -04:00
Peter Gyory	69effaac79	Fix issue 1195 registration gender tabbing Add focus highlight scss for radio buttons on demographic registration step	2017-08-21 15:13:49 -06:00
St19_Galla	ad25e09980	Add Ellen Daoust	2017-08-16 13:39:17 -04:00
Ken	6dc5bfa788	Update credits (#1451 ) Fixes #1450 Thanks @Kenny2github	2017-08-09 08:36:48 -04:00
chrisgarrity	6743364447	Merge pull request #1446 from St19Galla/patch-5 Fix #1444 : Change Things to Try to Tips	2017-08-09 08:28:10 -04:00
St19_Galla	b087874859	Update landing.jsx	2017-08-02 23:43:44 -04:00
St19_Galla	3f0f4d23e7	Update landing.jsx	2017-08-02 23:42:17 -04:00
Matthew Taylor	b13c76e1ea	Merge pull request #1436 from TheGrits/patch-4 Fix gh-1433: Fix Gunicorn Link	2017-08-02 08:31:05 -04:00
Matthew Taylor	1cda176c9e	Merge pull request #1434 from LiFaytheGoblin/issue/gh-1432-Addition_to_Credits_Page Added JT Galla to the Credits Page under 'Aknowledgements'	2017-07-31 15:15:33 -04:00
Ray Schamp	3e371f5511	Merge branch 'develop' into jobs	2017-07-31 15:15:05 -04:00
Ray Schamp	e369a439e3	Add Senior Backend Engineer job posting	2017-07-31 14:47:56 -04:00
Matthew Taylor	fcb635b5a9	Merge pull request #1443 from St19Galla/patch-4 Fix gh-1442: Remove Moderator Position	2017-07-31 14:16:05 -04:00
St19_Galla	c472699dbe	Update landing.jsx	2017-07-31 11:22:24 -04:00
Matthew Taylor	52a968f6ce	Merge pull request #1427 from TheGrits/patch-3 Alphabetize Routes List v2	2017-07-31 08:07:30 -04:00
Matthew Taylor	5bd66cd628	Merge pull request #1439 from TheGrits/patch-5 Fix gh-1438: Update Community Guidelines	2017-07-28 15:35:24 -04:00
Matthew Taylor	d285cb08d7	Merge pull request #1443 from St19Galla/patch-4 Fix gh-1442: Remove Moderator Position	2017-07-28 14:00:13 -04:00
St19_Galla	dd9386b8e8	TTT -> Tips	2017-07-28 13:49:41 -04:00
St19_Galla	2cf2e7e951	Remove Moderator Position	2017-07-27 11:30:39 -04:00
The_Grits	d8a62719cb	Update Community Guidelines	2017-07-26 14:49:17 -04:00
The_Grits	0d76d58f5f	Make donate a redirect	2017-07-26 10:26:32 -04:00
The_Grits	487fd1b47a	Fix Gunicorn Link	2017-07-25 20:38:03 -04:00
LiFaytheGoblin	f9a9130351	Added JT Galla to the Credits Page under 'Aknowledgements'	2017-07-25 22:11:05 +02:00
Matthew Taylor	e2a596ea9d	Squashed commit of the following: commit `b8a05d9624` Author: Matthew Taylor <mewtaylor@gmail.com> Date: Fri Jul 21 12:06:06 2017 -0400 only change style for links on page otherwise, the footer links were getting the new styling commit `34a3b8b49b` Author: St19_Galla <fcbdsp@gmail.com> Date: Thu Jul 20 22:28:03 2017 -0400 Update l10n.json commit `9c8241b92c` Merge: `3f90e98` `bca79e6` Author: Matthew Taylor <mewtaylor@gmail.com> Date: Thu Jul 20 16:36:32 2017 -0400 Merge pull request #1423 from mewtaylor/hotfix/camp-page Hotfix Scratch Camp 2017 Page commit `bca79e652a` Author: St19_Galla <fcbdsp@gmail.com> Date: Wed Jul 19 15:42:16 2017 -0400 Update l10n.json (#1421) commit `4a9418d49c` Author: St19_Galla <fcbdsp@gmail.com> Date: Wed Jul 19 11:48:29 2017 -0400 Down Deep - Scratch Camp 2017 Page (#1409) * Add files via upload * Create downdeep.jsx * Delete downdeep.jsx * Delete downdeep.scss * Delete l10n.json * Delete downdeep.jsx * Create dd.jsx * Rename dd.jsx to filler.jsx * Add files via upload * Delete dd.jsx * Delete filler.jsx * Create filler.jsx * Add files via upload * Delete filler.jsx * Update routes.json * whoops * travis * Update downdeep.jsx * Update downdeep.scss * Update downdeep.scss * Update _colors.scss * what i get for rushing * Update downdeep.jsx * Update l10n.json * thisandagain's changes * Carl's Changes * carl's changes * carl's changes * Update downdeep.jsx * Rename downdeep.jsx to camp.jsx * Rename downdeep.scss to camp.scss * Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx * Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss * Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json * Update camp.jsx * Add files via upload * Update camp.jsx * Update camp.scss * Update l10n.json * Create filler * Add files via upload * Delete bubbles.svg * Delete dolphin.svg * Delete fish-divider.svg * Delete fish-divider2.svg * Delete map.svg * Delete ocean-bottom.svg * Delete ocean-top.svg * Delete treasure.svg * Update camp.scss * Update camp.scss * Update camp.scss * Update camp.jsx * whoops * Update camp.scss * Update l10n.json * Update camp.scss * Update camp.jsx * Update _colors.scss * Update camp.scss * Update camp.scss * Update camp.scss * Update camp.scss * Update _colors.scss * Update camp.scss * Update camp.scss commit `3f90e98593` Merge: `c8afebf` `84a37a6` Author: Ray Schamp <rschamp@users.noreply.github.com> Date: Thu Jul 13 16:32:51 2017 -0400 Merge pull request #1413 from rschamp/hotfix/rip-smartystreets [Master] Remove SmartyStreets API	2017-07-21 12:10:48 -04:00
Matthew Taylor	e264a1d2c9	Merge pull request #1426 from St19Galla/patch-2 Fix gh-1425 // Camp Page Typo	2017-07-21 12:02:11 -04:00
The_Grits	d936d0d9c4	Add -redirect tags + reorder	2017-07-21 09:51:45 -04:00
The_Grits	5fa9c6a05f	Alphabetize Routes List v2	2017-07-21 07:30:42 -04:00
St19_Galla	110e47f1d2	Update l10n.json	2017-07-20 22:28:03 -04:00
Matthew Taylor	d0e7c29b5f	key api calls on `username` check `this.props.user` will now return `true` because there is a default user object that’s empty. So, instead, wait for an actual user object	2017-07-20 15:01:36 -04:00
Matthew Taylor	8561385324	Update name for legacy carousel	2017-07-20 13:56:11 -04:00
Matthew Taylor	cb4ca51061	Add new carousel component 1. Moves carousel to `LegacyCarousel` since it currently is designed to handle JSON from proxy endpoints 2. Add separate `Carousel` endpoint to handle data from project models in scratch’s new api, the standard moving forward.	2017-07-20 13:47:14 -04:00
Matthew Taylor	7d9b6fc5d8	Merge pull request #1415 from St19Galla/patch-2 Fix gh-1410: Correct "Tips" Page Link	2017-07-20 07:40:59 -04:00
Matthew Taylor	36583f0d04	Merge pull request #1416 from mewtaylor/issue/custom-rows-api Move custom homepage row to new api endpoints	2017-07-19 17:19:27 -04:00
St19_Galla	9f47d504ec	Update l10n.json (#1421 )	2017-07-19 15:42:16 -04:00
St19_Galla	43b8f0b38f	Down Deep - Scratch Camp 2017 Page (#1409 ) * Add files via upload * Create downdeep.jsx * Delete downdeep.jsx * Delete downdeep.scss * Delete l10n.json * Delete downdeep.jsx * Create dd.jsx * Rename dd.jsx to filler.jsx * Add files via upload * Delete dd.jsx * Delete filler.jsx * Create filler.jsx * Add files via upload * Delete filler.jsx * Update routes.json * whoops * travis * Update downdeep.jsx * Update downdeep.scss * Update downdeep.scss * Update _colors.scss * what i get for rushing * Update downdeep.jsx * Update l10n.json * thisandagain's changes * Carl's Changes * carl's changes * carl's changes * Update downdeep.jsx * Rename downdeep.jsx to camp.jsx * Rename downdeep.scss to camp.scss * Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx * Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss * Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json * Update camp.jsx * Add files via upload * Update camp.jsx * Update camp.scss * Update l10n.json * Create filler * Add files via upload * Delete bubbles.svg * Delete dolphin.svg * Delete fish-divider.svg * Delete fish-divider2.svg * Delete map.svg * Delete ocean-bottom.svg * Delete ocean-top.svg * Delete treasure.svg * Update camp.scss * Update camp.scss * Update camp.scss * Update camp.jsx * whoops * Update camp.scss * Update l10n.json * Update camp.scss * Update camp.jsx * Update _colors.scss * Update camp.scss * Update camp.scss * Update camp.scss * Update camp.scss * Update _colors.scss * Update camp.scss * Update camp.scss	2017-07-19 11:48:29 -04:00
Matthew Taylor	36dc8283b8	move projects loved by following to new api endpoint	2017-07-19 11:25:39 -04:00
Matthew Taylor	753a3e1eed	Split splash into container/presentation component This does a bit of upkeep based on recs from @rschamp that: 1. Splits splash into container/presentation components 2. Updates the default project count to 20 million 3. makes the api calls that get info from the api take in arguments rather than use the session 4. Updates `MapStateToProps` to be more specific in what it uses beyond just `session` and `permissions` Thanks @rschamp!	2017-07-17 12:19:49 -04:00
chrisgarrity	4cc353ab43	remove obsolete strings ‘Help’ and ‘Discuss’ are not needed now that they’ve been replaced with the Tips page. Fixes #1362	2017-07-17 10:14:32 -04:00
Matthew Taylor	8c94a04e77	Move custom homepage row to new api endpoints This goes along with https://github.com/LLK/scratch-api/pull/292. This can be updated if we choose to migrate the `lovedByFollowing` endpoint off of proxy as well.	2017-07-13 15:35:18 -04:00
St19_Galla	093d8f4eb3	Update tips.jsx	2017-07-13 12:48:18 -04:00
Ray Schamp	02b36ab9f3	Merge pull request #1414 from rschamp/hotfix/rip-smartystreets [Develop] Remove SmartyStreets API	2017-07-13 10:52:58 -04:00
Ray Schamp	84a37a671f	Remove SmartyStreets API We are so lax with this that it's not actually helping us, and we don't have a plan with them anymore.	2017-07-13 10:44:50 -04:00
Matthew Taylor	03785b78f6	Merge pull request #1406 from TheGrits/patch-3 Fix gh-1382: Centre Align Note	2017-07-13 10:38:04 -04:00
The_Grits	6533b5b50a	Misplaced Periods Fix	2017-07-10 19:49:13 -04:00
The_Grits	c5f6619947	Fix gh-1382: Centre Align Note	2017-07-07 20:17:03 -04:00
Andrew Sliwinski	d705272341	Merge pull request #1402 from TheGrits/patch-3 Fix gh-1397: Update Supporting Organizations	2017-07-07 19:45:28 -04:00
The_Grits	a9ba27ef97	Fix gh-1404: Add Junior Designer	2017-07-07 19:34:55 -04:00
The_Grits	a3714e5348	Add transifex remove pootle	2017-07-06 23:06:23 -04:00
chrisgarrity	24bfc18487	Add missing closing tag for PDF Guide	2017-07-05 13:42:20 -04:00
chrisgarrity	ced9339fb6	Remove unnecessary ‘^’ from routeAliases	2017-06-29 15:30:26 -04:00
chrisgarrity	ece3d4a1f9	update /help and /info routes	2017-06-29 14:42:17 -04:00
Matthew Taylor	7a44be5e5b	Merge pull request #1389 from TheGrits/patch-3 Fix gh-1388: Help -> Tips on FAQ Page	2017-06-29 09:58:17 -04:00
chrisgarrity	f1cfeeca81	Merge pull request #1390 from chrisgarrity/issue/gh1387 Add /info redirect	2017-06-29 07:33:07 -04:00
chrisgarrity	ed056701c4	Add /info redirect	2017-06-28 17:25:36 -04:00
The_Grits	5570632ed3	Help -> Tips	2017-06-28 16:54:42 -04:00
chrisgarrity	f7345c443d	Fix blocks icon for windows Note for future reference - set the size for SVGs with height not width if using rem. IE on Windows 7 doesn’t resize correctly if the width is set with rem. Height works with rem, and exact pixel width works, but that should be avoided.	2017-06-28 09:32:08 -04:00
chrisgarrity	a712a8d28a	Fix typo in tutorial URL (#1377 ) Getting started tutorial link started with `//` instead of just `/`., and typo in downloading	2017-06-27 16:33:57 -04:00
chrisgarrity	022d2dd506	FIx layout problems (#1380 ) * removed white-space: no wrap to let buttons flow in Cards section * Fix download link (download should be part of the link) * Set the size of the icons to fix alignment	2017-06-27 16:27:07 -04:00
Matthew Taylor	b22aaa8465	Add `/store` to footer	2017-06-26 10:35:29 -04:00
Andrew Sliwinski	a16a189a7f	Update compatibility requirements to clarify support for ChromeOS	2017-06-26 09:42:56 -04:00
Matthew Taylor	df2b7fd7df	Merge pull request #1367 from mewtaylor/issue/gh-1364 Fix GH-1364: Change `help` to `tips` in footer	2017-06-23 16:39:19 -04:00
chrisgarrity	6469ac3362	Simplify /help redirect pattern (#1366 ) Restrict /help redirect to just `/help` or `/help/`. Anything else following help should get handled by scratchr2.	2017-06-23 12:02:15 -04:00
Matthew Taylor	c1e5c7cb03	Change `help` to `tips` in footer Fixes #1364	2017-06-23 11:55:43 -04:00
chrisgarrity	39b1400705	Handle /help redirect (#1363 )	2017-06-23 10:28:34 -04:00
Matthew Taylor	dbb4fcc8a2	tweak some styling for the download page Adds the numbers back in above the download steps, and also moves the “note for mac users” down into a callout.	2017-06-23 09:23:24 -04:00
Matthew Taylor	dd923aa586	change download route	2017-06-22 10:57:30 -04:00
Andrew Sliwinski	124c8e36d7	Update navigation. Resolves GH-1262 (#1285 )	2017-06-22 09:40:34 -04:00
chrisgarrity	74e315dc71	Add new Tips page (#1357 ) New of tips page, uses cards from new resources server (s3) * added get-localized-urls script to get the generated json from the s3 bucket * added /tips route * correct localized-urls for other pages * remove thingstotry * redirect /go * fix up /info/cards view to use resources (s3). * redirect /go to /tips * change /hoc redirect from /go to /tips * Add full set of cards pdf download to tips localization * removed cards and guides from static PDFs, they are all coming from resources.scratch.mit.edu now. * removed things to try view Corrections for reviews: * decided to pretty print the localized URLs * replaced console.errors with process.stdout and fail with exit(1) * formatted localized-urls to make it easier to read * moved link outside `<Button…` makes whole button clickable instead of just text * fixed up css styles, removed unnecessary classes * corrected “unused” resource links	2017-06-21 16:20:18 -04:00
Matthew Taylor	2c7cc52a70	Merge pull request #1359 from mewtaylor/issue/store [Develop] Hotfix: add redirect for store	2017-06-20 15:37:35 -04:00
Matthew Taylor	73b88c850b	Add redirect for store	2017-06-20 14:38:14 -04:00
Matthew Taylor	c1ea4730c3	use `$ui-gray` instead	2017-06-19 11:41:44 -04:00
Matthew Taylor	4342ef36a3	Have behavior for default/error on version check This keeps the version field empty, as well as the links, until it gets a response from the `version.xml` request. It then displays an error message if there was an error trying to get the version.	2017-06-19 11:36:33 -04:00
Matthew Taylor	670633a459	s/view/redirect thanks @chrisgarrity :)	2017-06-19 11:35:33 -04:00
Matthew Taylor	49a52b634c	add background gray for installation process	2017-06-19 11:35:15 -04:00
Matthew Taylor	cf863fb3d3	point links at `/download`	2017-06-16 10:14:01 -04:00
Matthew Taylor	6e3c255fa7	Make version dependent on xml call Fixes #1351 by including a call to `version.xml` to get the most up-to-date offline build version, defaulting to the current version, `456.0.3`. This also fixes #1352 by switching the route to `/download`, with a redirect from `/scratch2download/`	2017-06-16 10:11:58 -04:00
Matthew Taylor	348fd2d860	Merge pull request #1258 from TheGrits/patch-3 Fix gh-1254: Migrate Download Page	2017-06-13 17:06:21 -04:00
The_Grits	5ed33945ff	Centre align	2017-06-13 16:58:01 -04:00
Matthew Taylor	6ace6926c0	Merge pull request #1347 from LiFaytheGoblin/fix_issue/gh_1331_add_mark_ferrell_to_credits_page Fix issue/gh-1331: added mark ferrell to credits page	2017-06-13 16:22:54 -04:00
The_Grits	dd655df674	Fix gh-1343: Update Credits Page (#1346 ) * Remove Christina Huang * Add Christina Huang to Previous Members	2017-06-12 09:22:58 -04:00
LiFaytheGoblin	acfb5d71ac	added mark ferrell to credits page (issue 1331)	2017-06-11 12:57:26 +02:00
Matthew Taylor	7a958f0326	Revert "[Master] Revert PR #1324 "	2017-06-08 15:31:37 -04:00
Matthew Taylor	69176fb572	Revert "[Develop] Revert PR #1324 "	2017-06-08 15:31:09 -04:00
The_Grits	e0ab9f4f03	Remove width from download page	2017-06-06 19:43:01 -04:00
Ray Schamp	e4ba1061b9	Revert "Merge pull request #1324 from mewtaylor/issue/api-250" This reverts commit `949a166c0f`, reversing changes made to `56b46fd861`.	2017-06-02 14:12:54 -04:00
The_Grits	c29dde59a1	Update download.scss	2017-06-02 08:13:29 -04:00
The_Grits	8b39259ce5	Thanks Travis (and St19Galla)	2017-05-24 23:48:37 -04:00
The_Grits	15d393a9e2	Update Styling of Download Page	2017-05-24 20:19:49 -04:00
Matthew Taylor	e7c04044ae	remove `?$` from search expressjs expression I don’t see a reason for this to be here, and it’s breaking the build with the explore change	2017-05-24 17:33:55 -04:00
Matthew Taylor	949a166c0f	Merge pull request #1324 from mewtaylor/issue/api-250 For api-250: Change explore endpoint	2017-05-24 14:03:36 -04:00
Matthew Taylor	a8cf1af73c	Merge pull request #1316 from mewtaylor/issue/explore-projects Fix r2-3978: Use regex in express patterns to limit scope	2017-05-24 12:49:09 -04:00
Matthew Taylor	373c7784c6	Change conference date Fixes #1322	2017-05-24 08:42:25 -04:00
Matthew Taylor	1a83b34387	Change explore endpoint For scratch-api#250	2017-05-22 15:41:28 -04:00
The_Grits	d740eb586f	Lint fix download page	2017-05-22 11:58:55 -04:00
The_Grits	fadf0a3346	Download Page Restyle	2017-05-20 00:24:18 -04:00
Matthew Taylor	87da9f3d8a	Use regex in express patterns to limit scope This fixes https://github.com/LLK/scratchr2/issues/3798 by using regex in expressjs patterns, and then also parsing those regex patterns for fastly, such that we can limit the scope of the regex created for a specific view	2017-05-18 13:57:49 -04:00
Andrew Sliwinski	afe134a898	Merge pull request #1309 from thisandagain/hotfix/cm [Develop] Hotfix - Remove "Trust & Safety Manager" role from jobs page	2017-05-15 11:37:38 -04:00
Matthew Taylor	5b3341673f	Merge pull request #1312 from mewtaylor/hotfix/revert-birthday-banner [Develop] Hotfix: Remove 10th anniversary banner	2017-05-15 11:23:41 -04:00
Matthew Taylor	ae53dcd746	Remove 10th banner	2017-05-15 11:08:15 -04:00
Andrew Sliwinski	042ae48408	Remove 'Trust & Safety Manager' role from jobs page	2017-05-14 12:52:53 -04:00
Matthew Taylor	a5281179cd	Merge pull request #1293 from TheGrits/patch-4 Fix gh-1292: Dropdown Mobile Un-Friendly	2017-05-08 15:54:51 -04:00
The_Grits	f589ed0f4d	Update dropdown.scss	2017-05-08 10:10:24 -04:00
The_Grits	f901d3b429	Restyle the Download Page	2017-05-03 16:19:56 -04:00
The_Grits	8ae401e861	Move mobile rule	2017-05-03 15:58:14 -04:00
Andrew Sliwinski	52b6ed9eb8	Merge pull request #1271 from TheGrits/patch-5 Fix gh-875: Double Search Bar	2017-05-03 14:37:02 -04:00
Matthew Taylor	b1e33a2933	Merge pull request #1299 from TheGrits/patch-9 Fix gh-1294: Unlocalize Browser Links	2017-05-03 14:33:50 -04:00
Matthew Taylor	787040b972	Merge pull request #1297 from TheGrits/patch-8 Fix gh-1296: Add DD Liu to Credits Page	2017-05-03 11:48:01 -04:00
Ray Schamp	ed2cd81a7a	Merge pull request #1300 from St19Galla/patch-1 Fix gh-1282 ~ Add "United States" to faq/educators page	2017-05-02 18:15:34 -04:00
St19_Galla	f82d5f8341	add US to educators	2017-05-02 15:34:57 -04:00
St19_Galla	5083614f48	add US to faq	2017-05-02 15:33:31 -04:00
The_Grits	a837c05ac7	Remove localized Microsoft links	2017-05-02 15:29:00 -04:00
The_Grits	5822b2facb	Update Firefox Link	2017-05-02 13:38:00 -04:00
The_Grits	0a747f68bd	Add DD Liu Resolves #1296	2017-05-01 11:24:55 -04:00
Matthew Taylor	00b80b40f3	Merge pull request #1295 from mewtaylor/issue/r2-4586 Implement r2-4586: Add anniversary banner	2017-05-01 07:35:31 -04:00
Matthew Taylor	d6f8b2fa9e	add card tutorial redirect	2017-04-28 13:43:18 -04:00
Matthew Taylor	a950c91725	Add studio link	2017-04-28 09:09:06 -04:00
Matthew Taylor	fc075aedaf	Add anniversary banner	2017-04-28 08:51:40 -04:00
The_Grits	83baa2ada6	import frameless	2017-04-26 23:14:50 -04:00
The_Grits	8f827d812a	Re-add min-width for mobile	2017-04-26 23:13:24 -04:00
Matthew Taylor	aef7b5e834	Merge pull request #1291 from LLK/release/2.2.20 [Master] Release 2.2.20	2017-04-26 22:20:07 -04:00
Matthew Taylor	aed3093bc0	Change invalidation to year	2017-04-21 07:51:03 -04:00
Matthew Taylor	f61fe17353	use `birthOffset` for age validation Fixes #1278	2017-04-20 16:47:35 -04:00
Matthew Taylor	76c46be17b	Merge pull request #1269 from mewtaylor/issue/r2-4470 Fix R2-4470: Only allows birthdays >= 13 yrs old for teacher reg	2017-04-19 16:41:09 -04:00
Matthew Taylor	9c50f31ce3	Merge pull request #1270 from TheGrits/patch-4 Fix gh-728: Align Misaligned Nav-bar Dropdown	2017-04-19 16:40:15 -04:00
Matthew Taylor	f2e4858868	Revert "[Master] Temp Hotfix: remove custom rows"	2017-04-18 06:36:39 -04:00
Matthew Taylor	6b513f82e0	Merge pull request #1268 from mewtaylor/issue/gh-1265 [Develop] Hotfix GH-1265: Update jobs route to include moderator	2017-04-14 14:20:20 -04:00
Matthew Taylor	cd3fb9245a	Only apply offset to teachers thanks @chrisgarrity!	2017-04-14 14:18:32 -04:00
The_Grits	5cc8911b04	Thanks Travis	2017-04-14 11:13:46 -04:00
The_Grits	d7e63aadee	Fix gh-875: Double Search Bar	2017-04-14 10:08:17 -04:00
The_Grits	7c9f6f4fad	Fix gh-728 Fixes mis-aligned nav-bar dropdown	2017-04-14 06:46:50 -04:00
Matthew Taylor	cb7ce8c71d	update language for age validation thanks @TheGrits!	2017-04-13 07:41:47 -04:00
Matthew Taylor	2c472b607a	Only allows birthdays > 13 yrs old for teacher reg Helps fix https://github.com/LLK/scratchr2/issues/4470 from the UX side of things	2017-04-12 17:41:43 -04:00
Matthew Taylor	12e87df7c3	Merge pull request #1257 from TheGrits/patch-4 Nit-picky Developer Class Type	2017-04-11 12:58:09 -04:00
Matthew Taylor	a56c8d0b37	Update jobs route to include moderator Fixes #1265 by updating the logic for checking the route to include an optional moderator endpoint check	2017-04-11 12:57:02 -04:00
Matthew Taylor	5ca5c149f3	temporarily remove custom homepage rows redis emptied when mc1 restarted, so this is all going to mysql at the moment	2017-04-11 09:27:19 -04:00
The_Grits	6dbf66d59d	Patches and Styling	2017-04-06 10:40:46 -04:00
Matthew Taylor	b2e827f752	Merge pull request #1260 from mewtaylor/release/april-fools-rollback [Develop] Hotfix: Revert those changes we did last week	2017-04-03 14:51:29 -04:00
Matthew Taylor	9affc8441c	Revert "Merge pull request #1255 from LLK/release/branch" This reverts commit `c36bde2c30`, reversing changes made to `becae19f6f`.	2017-04-03 14:32:38 -04:00
The_Grits	94dec64045	Thanks Travis Gotta love missing semicolons	2017-04-01 13:06:45 -04:00
The_Grits	68d10ffe32	Patch 3 wip (#30 )	2017-04-01 10:55:47 -04:00
The_Grits	6255f989b0	Nit-picky Developer Class Type Just noticed that the type on this page was copied over from the About page. Non-blocking issue, just me being nit-picky.	2017-04-01 10:06:40 -04:00
The_Grits	0f87a65622	importy	2017-03-31 19:35:33 -04:00
Matthew Taylor	d8ef3110e2	don’t apply to top banners	2017-03-31 10:26:56 -04:00
Matthew Taylor	0e645ce954	Reset banner on new login	2017-03-31 10:00:40 -04:00
Matthew Taylor	d66e11fced	Banner updates	2017-03-31 09:02:54 -04:00
Matthew Taylor	7522be4c03	Merge pull request #1253 from TheGrits/patch-4 Fix gh-1194: Remove Scratch Day from Localization	2017-03-22 08:41:51 -04:00
Matthew Taylor	3a299e06f7	Merge pull request #1240 from TheGrits/patch-3 Fix gh-1239: Update Conference Dates	2017-03-22 08:32:54 -04:00
The_Grits	77bdd356d8	Remove Scratch Day from Localization File	2017-03-20 11:06:28 -04:00
The_Grits	bc43e89d36	Remove localization of Scratch Day	2017-03-20 11:05:52 -04:00
Matthew Taylor	e9f7748fdf	Merge pull request #1243 from TheGrits/patch-4 Fix gh-1242: Update Credits Page	2017-03-16 11:57:11 -04:00
Matthew Taylor	0bb60700ba	Merge pull request #1244 from mewtaylor/issue/opt-in [Develop] Hotfix: re-add checkbox to opt-in to email list for teacher	2017-03-15 10:15:16 -04:00
Matthew Taylor	63c6bf59f2	Merge pull request #1149 from mewtaylor/issue/r2-4092 For R2-4092: Add checkbox to opt-in to teacher emails	2017-03-15 10:08:35 -04:00
The_Grits	c45663e966	Add Juanita Buitrago to Previous Members	2017-03-13 17:09:08 -04:00
The_Grits	f1880e47d5	Remove Juanita Buitrago	2017-03-13 17:08:39 -04:00
The_Grits	7e9a6ef410	Add, remove, and resort! (2)	2017-03-13 16:17:12 -04:00
The_Grits	b5cebffe11	Add, remove, resort!	2017-03-13 16:06:37 -04:00
The_Grits	715b05fbdf	whoops 12th not 15th	2017-03-08 18:20:28 -05:00
The_Grits	1794b30079	Update dates Costa Rica dates were updated, plus fixed a gotcha with the China dates	2017-03-08 18:18:22 -05:00
The_Grits	86b5e462c6	Between, not Around	2017-03-06 16:34:21 -05:00
Matthew Taylor	f76707381a	Merge pull request #1235 from TheGrits/patch-3 Fix gh-1234: Update China Conference	2017-03-06 11:10:03 -05:00
Matthew Taylor	56bf384459	Merge pull request #1233 from mewtaylor/issue/max-chars Match `routeAlias` with that of `/jobs` route	2017-03-06 10:23:44 -05:00
Matthew Taylor	8d2a43530e	Merge pull request #1205 from TheGrits/patch-2 Fix gh-1183: Remove slashes	2017-03-06 10:11:43 -05:00
The_Grits	46a3cea40c	Fix gh-1234: Update China Conference	2017-03-02 22:14:26 -05:00
Matthew Taylor	2954d0916b	match `routeAlias` with that of `/jobs` route this `routeAlias` is being added as it’s own path pattern since it’s not matching the other one, causing us to hit our 512 char limit.	2017-02-28 09:55:16 -05:00
Matthew Taylor	a170aec6d2	Merge pull request #1220 from TheGrits/patch-4 Fix gh-1218: Community Moderator Page	2017-02-28 09:38:44 -05:00
The_Grits	82af7786a0	Put back some slashes	2017-02-28 09:38:43 -05:00
The_Grits	c26e42f715	Change parenthesis	2017-02-28 09:34:20 -05:00
The_Grits	8772ab5605	Fix jobs-moderator route	2017-02-28 09:33:18 -05:00
Matthew Taylor	184947d3d9	Merge pull request #1215 from TheGrits/patch-3 Fix gh-1214: Lowercase F in Family	2017-02-24 13:40:53 -05:00
Ray Schamp	4e67f95577	Merge pull request #1229 from LLK/release/2.2.18 [Develop] Release 2.2.18	2017-02-24 12:05:06 -05:00
The_Grits	55f94eb19c	24 hours => one day zap!	2017-02-23 15:14:03 -05:00
The_Grits	b01c8a44e0	/jobs route R is for route and that's good enough for me	2017-02-23 12:47:42 -05:00
The_Grits	1ac7cd4b79	Bump Path	2017-02-23 12:29:23 -05:00
The_Grits	5eed0fe430	Remove sharing links	2017-02-23 12:14:40 -05:00
The_Grits	90aaf6140f	Remove Back-End Engineer	2017-02-23 11:54:38 -05:00
The_Grits	9a11c04cd2	Add Community Moderator Page	2017-02-23 11:53:29 -05:00
The_Grits	39ceaa2f33	Add Community Moderator	2017-02-23 11:12:18 -05:00
Matthew Taylor	eb56b27a88	Update `otherDisabled` check Fall out from #1217. We should likely change the way this is set up, it seems not ideal. But not sure the best way atm.	2017-02-23 10:57:27 -05:00
Matthew Taylor	f59774bd0d	Don’t localize an empty string	2017-02-23 09:52:33 -05:00
Matthew Taylor	7a2e7cc949	Some additional tweaks for conference 2017 1. Updates svgs for formatting 2. Makes the font size of the title smaller Fixes #1211, 5-6 in #1206	2017-02-23 09:39:57 -05:00
The_Grits	4f2768e7f2	Lowercase F in Family Fixes #1214	2017-02-22 21:28:15 -05:00
Matthew Taylor	e13fa6dc4b	add height to svg needed by ie11 to render correctly. fixes #1208	2017-02-22 16:37:57 -05:00
The_Grits	f7d9086296	credits typo Should fix #1201	2017-02-22 11:14:32 -05:00
The_Grits	e0a81c50c3	Lowercase P Should fix #1202	2017-02-22 11:14:26 -05:00
The_Grits	b75fb7debe	Remove slashes	2017-02-22 11:14:12 -05:00
Matthew Taylor	98c163ecb1	Merge pull request #1204 from TheGrits/patch-3 Fix gh-1201: credits localization typo	2017-02-22 11:03:20 -05:00
The_Grits	40e2bf8500	credits typo Should fix #1201	2017-02-22 10:57:37 -05:00
The_Grits	d4f840b99d	Lowercase P Should fix #1202	2017-02-22 10:54:50 -05:00
Matthew Taylor	dd940235cd	Add language chooser to conf footer thanks @jwzimmer!	2017-02-22 10:31:40 -05:00
Matthew Taylor	1b0de13d63	Merge pull request #1192 from mewtaylor/issue/conference-fixes Bugfix: Some copy fixes for new conference page	2017-02-22 09:25:56 -05:00
Matthew Taylor	b139f0a606	Additional conference fixes 1. border on flags 2. `Conferences` in nav 3. mailto for costa rica	2017-02-22 08:03:16 -05:00
Ray Schamp	6019726453	Fix argument name Thanks @mewtaylor!	2017-02-21 09:42:34 -05:00
Matthew Taylor	4cf3b890fd	Update ordering and text size for “Learn More”	2017-02-21 08:37:05 -05:00
Ray Schamp	405763246d	Wait for the search term before searching Fixes #1189	2017-02-20 11:08:36 -05:00
Ray Schamp	0313346fed	Encode term from search view's search bar Same fix as #1175, but for the form on the search page.	2017-02-20 11:08:05 -05:00
Ray Schamp	d6093f19b0	Fix React key warnings The number of warnings was locking up my browser, making it hard to test things out.	2017-02-20 11:04:41 -05:00
Matthew Taylor	674270483d	Fix title for conference in China Also add 2017 to date	2017-02-17 17:28:51 -05:00
Matthew Taylor	06ebc88287	Change footer for 2017 Take out sponsors	2017-02-17 13:13:03 -05:00
Matthew Taylor	9669527eb8	Some copy fixes for new conference page Thanks @kaschm!	2017-02-17 11:46:27 -05:00
Matthew Taylor	509d8e84d7	Add new icons and format accordingly	2017-02-16 16:58:27 -05:00
Matthew Taylor	4e65e34275	Merge pull request #1184 from mewtaylor/issue/gh-1086 Conference 2017: add new landing page, and archive old site	2017-02-16 07:56:21 -05:00
chrisgarrity	3b4a07c7b8	Adding Fashion and Story activities to Things to Try (#1176 ) Added Fashion and Story activities between Hide and Pong. Updated description text. Note that Cards and Guide locations were already included in l10n-static.json	2017-02-15 23:21:27 -05:00
Matthew Taylor	ff1410ee6f	Merge pull request #1180 from TheGrits/patch-4 Fix gh-1178: 24 hours => one day	2017-02-15 14:33:57 -05:00
Matthew Taylor	00ba8b2b2a	Merge pull request #1148 from TheGrits/patch-5 Fix gh-959: Localize Credits Page	2017-02-15 14:29:40 -05:00
Matthew Taylor	c1a474fe8b	Remove name after feedback	2017-02-15 10:51:13 -05:00
Matthew Taylor	19757ef730	Update details uri to have 2016 path	2017-02-15 08:44:28 -05:00
Matthew Taylor	8b772737a3	Add 2017 conference site	2017-02-15 08:35:10 -05:00
Matthew Taylor	67a39e4870	Archive 2016 site move to a subfolder, do some css shuffling and add some trello style guide stylings to help scope for also adding 2017	2017-02-15 08:34:46 -05:00
The_Grits	7f148f1a47	Remove MIT Scratch Team from Localization	2017-02-14 14:01:54 -05:00
The_Grits	574e2134da	24 hours => one day	2017-02-14 13:36:39 -05:00
The_Grits	7a9f213cfb	24 hours => one day	2017-02-14 13:35:54 -05:00
Ray Schamp	c8a7d3cdc7	Clean up usage of Redux for searchTerm Now that the search term is encoded, we need to be sure both the search fields get a decoded string. Parse, decode and set this string via Redux in componentDidMount, and use it in both places.	2017-02-10 18:54:20 -05:00
Ray Schamp	05adcde88d	URI-encode search string on form submit This prevents the search form from setting an invalid URL. Resolves #1153	2017-02-10 18:51:42 -05:00
The_Grits	1d47e0ef6a	Add Organizations Back In	2017-02-08 09:12:14 -05:00
Matthew Taylor	9255185716	Merge pull request #1164 from LLK/release/2.2.17 [Develop] Release 2.2.17	2017-02-08 08:37:42 -05:00
Matthew Taylor	2ea8eace6a	Merge pull request #1166 from TheGrits/patch-3 Fix gh-1157: Search Redirect	2017-02-08 08:37:21 -05:00
The_Grits	e4ffcf00c3	Remove ajax	2017-02-06 17:00:48 -05:00
Matthew Taylor	8878726084	Merge pull request #1010 from TheGrits/patch-2 Fix gh-1009: Add Tutorials Button	2017-02-06 09:51:53 -05:00
The_Grits	1cc8083137	Travis Fix	2017-02-01 16:15:18 -05:00
The_Grits	ee2cb185bd	Search Redirect	2017-02-01 15:57:04 -05:00
Ray Schamp	22802f87e8	Merge pull request #1160 from TheGrits/patch-3 Fix gh-1159: Add 2017 to Teacher Registration	2017-02-01 12:44:23 -05:00
Andrew Sliwinski	c2991fb185	Merge pull request #1155 from TheGrits/patch-4 Fix gh-1154: Join Us Section on Developers Page	2017-02-01 10:44:41 -05:00
The_Grits	e42cf6f25b	Fix FormattedHTMLMessage	2017-02-01 09:41:19 -05:00
Matthew Taylor	ca0985571e	Revert "Merge pull request #1149 from mewtaylor/issue/r2-4092" This reverts commit `8e82398255`, reversing changes made to `e1a0e9fece`.	2017-01-31 11:38:50 -05:00
The_Grits	32bd01ab88	Automagic Year	2017-01-31 11:01:22 -05:00
The_Grits	d19d0844a9	Add 2017 Resolves #1159	2017-01-31 10:10:05 -05:00
The_Grits	79639cb454	Change Search Term and Add "Tutorials" String	2017-01-26 10:10:49 -05:00
The_Grits	4fa2d24601	Add join section	2017-01-23 07:38:58 -05:00
The_Grits	6bc8dc5947	Update l10n.json	2017-01-23 07:34:28 -05:00
Matthew Taylor	6363a16b47	Merge pull request #1151 from mewtaylor/issue/r2-4219 For r2-4451: Change password reset anchor text	2017-01-20 07:49:34 -05:00
Matthew Taylor	b2c32c465a	Merge pull request #1138 from mewtaylor/issue/gh-1097 Fix GH-1097: Don’t validate username server side unless it passes client-side checks	2017-01-20 07:48:49 -05:00
Matthew Taylor	8e82398255	Merge pull request #1149 from mewtaylor/issue/r2-4092 For R2-4092: Add checkbox to opt-in to teacher emails	2017-01-19 18:37:11 -05:00
Matthew Taylor	7cfc29f2dc	Update content Thanks @kaschm!	2017-01-19 18:36:28 -05:00
chrisgarrity	e1a0e9fece	Fix GH 1102: Don’t allow duplicate strings in a single l10n file (#1150 ) * Don’t allow duplicate strings in a single l10n file Added check_duplicate_strings to test for duplicates in a single file. removed duplicates - tried to keep the more generic ‘key’ * revised test case for safer file reads	2017-01-19 18:23:56 -05:00
Matthew Taylor	e1665c2b34	Change password reset anchor text This is part of https://github.com/LLK/scratchr2/pull/4451	2017-01-19 11:12:54 -05:00
Matthew Taylor	4c6522ff9d	Merge pull request #1132 from TheGrits/patch-3 Fix gh-1130: Update Flash Link	2017-01-19 10:42:14 -05:00
Matthew Taylor	313f267cfe	Add checkbox to opt-in to teacher emails	2017-01-17 15:57:15 -05:00
The_Grits	3f4e40ef5c	Localize Credits Page	2017-01-14 00:38:16 -05:00
The_Grits	4eb3287c0e	FormattedMessage and FormattedHTMLMessage	2017-01-13 23:46:26 -05:00
chrisgarrity	0b857892d2	Merge pull request #1137 from chrisgarrity/issue/gh1113-tttwording Update wording of Animate a Name TTT	2017-01-04 08:55:17 -05:00
Matthew Taylor	6c589e1dc7	remove test ref whoopsie :)	2016-12-28 10:03:11 -05:00
Matthew Taylor	5da9514f4d	Don’t validate username server side if error Fixes #1097 by not making the server-side username validation call if the client side validations have failed. This is not the ideal way to do this, since it’s getting the input from an array. However, to make this different would require significant refactor.	2016-12-28 09:54:46 -05:00
morantsur	e763f8a9bf	Merge pull request #1095 from morantsur/microworlds_projects Add a microworlds homepage, and point microworlds pages at the new microworlds projects.	2016-12-22 12:36:03 -05:00
chrisgarrity	1ba27684c8	Update wording of Animate a Name TTT Don’t encourage scratchers to share personal info	2016-12-21 14:37:33 -05:00
The_Grits	4595377ed8	Remove spaces from other strings	2016-12-21 14:23:17 -05:00
morantsur	0df1eec3e0	Merge pull request #1122 from morantsur/fix_fashion Fix #1118 - broken link to fashion microworld video	2016-12-21 12:13:05 -05:00
morant	66f8ee201f	Remove bannerUrl, as it’s only used in the modal.	2016-12-21 12:06:48 -05:00
The_Grits	66c9e14c15	Remove spaces	2016-12-21 11:18:29 -05:00
morantsur	e95caef368	Merge branch 'develop' into microworlds_projects	2016-12-20 13:02:46 -05:00
morant	012321721c	Remove isRequired from description and onGuideClick, and fix naming on l10n strings.	2016-12-20 12:58:16 -05:00
morant	485d3903e0	- Fix routes - move functions to inline rendering in ttt-tile and mw homepage	2016-12-20 12:06:58 -05:00
Matthew Taylor	dbee423814	Update bulk account creation faq string /cc @kaschm	2016-12-20 09:07:16 -05:00
The_Grits	5cc8b2c124	Update Flash Link As per #1130	2016-12-20 00:27:37 -05:00
Matthew Taylor	967b2beb42	Update bulk creation faq content	2016-12-19 17:50:45 -05:00
Ray Schamp	afe63af707	Provide intl to TeacherRegistration	2016-12-19 17:02:03 -05:00
Ray Schamp	c901675b41	Allow empty response, again Missed in #1128, this fixes the rest of the handler to not expect a body from the request. Fixes #1124 again.	2016-12-19 15:41:32 -05:00
Ray Schamp	3b396019ab	Allow empty responses Fixes #1124 by not assuming there is any body associated with the response. That we don't send one is news to me, but we should cover this possibility in any case.	2016-12-19 13:43:33 -05:00
Matthew Taylor	ccd6713ef1	get `formatMessage` from props Fixes #1125. I had fixed this last iteration, not sure how it got re-introduced.	2016-12-18 22:08:17 -05:00
morant	647bc74ec3	Fix #1118 - broken link to fashion microworld video	2016-12-16 14:03:51 -05:00
morant	7bbb498a4f	- Stop using ttt cscc files, and remove all references to ttt that are not needed. - Update translation strings that are specific to microworlds to have microworlds as prefix. - Address other comments	2016-12-16 12:18:16 -05:00
Matthew Taylor	134dbbd3a8	Remove `routeAlias` from splash redirect It’s not necessary, and I believe is causing confusion for the faslty config.	2016-12-16 10:41:45 -05:00
Matthew Taylor	34ff8fc50f	Merge pull request #1116 from mewtaylor/issue/remove-hoc-banner Remove HOC Banner	2016-12-16 10:33:57 -05:00
morant	e3025ea3e9	Added a microworlds homepage, based on the ttt page, at /microworlds/go. Changed ttt-tile to only show “see guides…” if they exist.	2016-12-15 16:59:48 -05:00
Matthew Taylor	3c3f1c2f8f	Remove HOC Banner Reverts #1073	2016-12-15 15:58:29 -05:00
Matthew Taylor	0111278fa5	Update id string for general error message strings Fixes #1112, which was created by moving the error message into `general`	2016-12-15 15:32:40 -05:00
Ray Schamp	2539c4cf63	Merge pull request #1110 from rschamp/bugfix/fallback-registration-error Provide fallback error messages	2016-12-13 15:08:42 -05:00
Ray Schamp	64ceb2ae56	Provide fallback error messages In case the response does not supply `msg` or `errors`, provide a default. If `registrationError(s)` is empty, we do not show the error card, which causes "silent" failures.	2016-12-13 12:12:23 -05:00
Matthew Taylor	ba50840809	only apply right margin to radio input fixes #1101. I wanted to apply a custom class to the input, however that is unfortunately obscured and unreachable with our current implementation of `formsy-react-components`	2016-12-13 12:11:24 -05:00
Matthew Taylor	cbd983baf8	Merge pull request #932 from TheGrits/patch-3 Fix gh-678: Retain Search Term	2016-12-12 22:52:38 -05:00
The_Grits	0b2c1fff1a	Squish	2016-12-12 16:01:06 -05:00
Matthew Taylor	83f6bc6892	add slash thanks @rschamp!	2016-12-08 17:37:34 -05:00
Matthew Taylor	d3e6fd48cd	Move out to redirect	2016-12-08 17:20:34 -05:00
Matthew Taylor	b1595caa95	Handle double slash in splash pattern This fixes https://github.com/LLK/scratchr2/issues/4195 by updating the regex to catch two slashes. I decided to intentionally not catch more than 2 – it’ll 404 on 3 or more, which seems appropriate.	2016-12-08 10:19:17 -05:00
Matthew Taylor	11828d2d44	Merge pull request #1099 from mewtaylor/issue/gh-966 Fix GH-966: Localize default “required” message	2016-12-08 09:35:57 -05:00
Matthew Taylor	9ae4e5a963	Move `validationRequired` into general thanks @rschamp!	2016-12-07 17:24:48 -05:00
Matthew Taylor	6be9fc1084	Localize default “required” message Fixes #966. I was trying, if possible, to not introduce localization at the component level in order to keep it in the views – but that seemed a bit too involved given that the fix in this way is only a few lines long.	2016-12-06 11:36:24 -05:00
Matthew Taylor	afa25dc1c2	Move other input to be the label for the button thanks @rschamp! Never would’ve thought label would accept html.	2016-12-05 14:05:27 -05:00
Matthew Taylor	cc0496619d	use width for radio buttons, not margin This fixes #962 – the margin was causing flex to overflow the radio buttons when the text was long, causing the male and other options to render on top of each other. This fixes that by giving the radio buttons a fixed with relative to the parent container, and by ensuring that languages with long localizations will still be visible in overflow text.	2016-12-05 12:53:04 -05:00
Matthew Taylor	16d638672e	Merge pull request #1012 from jwzimmer/issue/gh-942-clarify-compatibility-FAQ Fix gh-942: update compatibility & support FAQ response	2016-12-05 09:54:28 -05:00
Matthew Taylor	48865c279f	Merge pull request #1000 from TheGrits/patch-5 Fix gh-997: Update General and Teacher FAQs	2016-12-05 09:53:39 -05:00
Matthew Taylor	6309c30667	Merge branch 'release/hoc-nov-21' of https://github.com/LLK/scratch-www into develop * 'release/hoc-nov-21' of https://github.com/LLK/scratch-www: Match tutorial ordering to ttt top row Turn off related videos in embed Move margin to flex-row element Add finalized video Add event row text Add temporary video for testing Add windows device manager url Add `ignoreUrls` to max-len lint rules switch to column in tablet Add hoc event row Update wedo2 text for new Windows deploy Add “open” string to l10n.json Add link to TTT page to educators page Add hoc banner Move padding to splash element trello-ize title banner h1,p styling # Conflicts: # src/views/explore/explore.jsx # src/views/search/search.jsx	2016-12-02 10:55:38 -05:00
morant	a17ec2f72c	Point microworlds pages at the new microworlds projects (created by the Scratch user “microworlds”	2016-12-01 22:21:29 -05:00
Matthew Taylor	eef7135a6d	Match tutorial ordering to ttt top row Forgot to do this, sorry.	2016-12-01 08:35:44 -05:00
Matthew Taylor	010ed3c530	Merge pull request #1080 from mewtaylor/issue/gh-930 Fix GH-930: Update wedo2 text for new Windows deploy	2016-11-30 09:24:26 -05:00
Matthew Taylor	55a73241d4	Merge pull request #1091 from mewtaylor/issue/hoc-event-row-tweaks Turn off related videos in event row embed	2016-11-30 09:21:13 -05:00
Matthew Taylor	e9d6b58d5e	Turn off related videos in embed See https://github.com/LLK/scratch-www/pull/1081#issuecomment-263746724. Also adjusts padding to accommodate https://github.com/LLK/scratch-www/pull/1081#issuecomment-263747658.	2016-11-30 08:33:15 -05:00
Matthew Taylor	435021658b	Move margin to flex-row element so that the header elements are evently aligned vertically. fixes #1089	2016-11-30 08:28:05 -05:00
Matthew Taylor	f84df573a3	Add finalized video but – let the record show: Who has two thumbs and is a Hufflepuff? I’M A HUFFLEPUFF!	2016-11-29 17:40:40 -05:00
Matthew Taylor	d63dcb19fd	Add event row text somehow this got lost from the PR, not sure how.	2016-11-29 16:59:52 -05:00
Matthew Taylor	eb21456b51	Merge pull request #1081 from mewtaylor/feature/gh-982 Implement GH-982: Add hoc event row	2016-11-29 16:42:31 -05:00
Matthew Taylor	7e167cc441	Add temporary video for testing	2016-11-29 16:37:42 -05:00
Matthew Taylor	f2cd0d3777	Add windows device manager url	2016-11-29 15:13:16 -05:00
Matthew Taylor	971c520f83	switch to column in tablet since that’s whats in the specs, and it handles centering with `align-items`. Fixes #1083	2016-11-29 12:49:26 -05:00
Matthew Taylor	2daa882331	Add hoc event row still missing the video for content, otherwise should be good to go	2016-11-29 11:13:00 -05:00
Matthew Taylor	14fcef7478	Update wedo2 text for new Windows deploy Fixes #930	2016-11-29 10:06:30 -05:00
Matthew Taylor	636c27bdcb	Add “open” string to l10n.json Fixes #1078. This also fixes #1076 and https://github.com/LLK/scratch-www/issues/981#issuecomment-263301322 by updating the styling accordingly.	2016-11-29 08:59:14 -05:00
chrisgarrity	110a7f2dc0	Merge pull request #1025 from TheGrits/patch-6 Fix gh-1023: Localize Explore Title and Dropdown	2016-11-28 13:48:40 -05:00
chrisgarrity	546ae19065	Merge pull request #1067 from TheGrits/patch-4 Fix gh-1066: Localize Search Header	2016-11-28 13:17:19 -05:00
chrisgarrity	02a7cece6b	Merge pull request #1074 from chrisgarrity/issue/gh905-educator-hoc Add link to TTT page to educators page	2016-11-23 13:38:48 -05:00
Matthew Taylor	2e7336ff55	Merge branch 'feature/gh-981' into release/hoc-nov-21 * feature/gh-981: Add hoc banner Move padding to splash element trello-ize title banner h1,p styling # Conflicts: # src/components/title-banner/title-banner.scss # src/views/hoc/hoc.jsx	2016-11-23 11:17:47 -05:00
chrisgarrity	a21587a658	Add link to TTT page to educators page Replace ‘Help’ link with ‘Things to Try’: fixes #905	2016-11-23 10:25:54 -05:00
Matthew Taylor	12e7326f49	Merge pull request #1069 from mewtaylor/issue/go-page-querystring Remove extra $	2016-11-22 14:58:06 -05:00
Matthew Taylor	788b034f32	Remove extra $	2016-11-22 14:56:27 -05:00
Matthew Taylor	20bc8b874c	Merge pull request #1065 from mewtaylor/issue/go-page-querystring [Staging] Hotfix: allow querystrings for `/go`	2016-11-22 14:22:21 -05:00
The_Grits	52a57b05a7	Localize Search Header	2016-11-22 12:15:17 -05:00
Matthew Taylor	a182367a4e	allow querystrings for `/go` again, the same as #1004, but needed too soon for a full fix of this issue.	2016-11-22 10:40:35 -05:00
Matthew Taylor	f98cf53455	Merge pull request #1062 from mewtaylor/hotfix/localized-pdfs-bug remove uri from path	2016-11-21 16:54:16 -05:00
Matthew Taylor	cf67ec0e4b	remove uri from path	2016-11-21 16:52:46 -05:00
Matthew Taylor	0c9f2561f9	Merge branch 'release/hoc-2016-1' into release/2.2.15 * release/hoc-2016-1: Merge pull request #1027 from TheGrits/patch-7 Additional content changes Fix TTT content Redirect hoc page to `/go` Merge pull request #1037 from chrisgarrity/patch-column-count update ttt content Update ttt content Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage Merge pull request #1018 from mewtaylor/issue/gh-995 Merge pull request #1008 from mewtaylor/issue/gh-980 Update pattern so rewrite accepts querystring too # Conflicts: # src/components/modal/ttt/modal.jsx # src/views/jobs/jobs.jsx # src/views/thingstotry/l10n.json	2016-11-21 15:01:53 -05:00
Matthew Taylor	e84427fcc0	Merge pull request #1050 from mewtaylor/issue/hoc-redirect Implement GH-906: Redirect hoc page to `/go`	2016-11-21 12:41:39 -05:00
Matthew Taylor	bfaf5b35ba	Merge pull request #1027 from TheGrits/patch-7 Fix gh-1026: Trust and Safety Manager URL update # Conflicts: # src/views/jobs/jobs.jsx	2016-11-21 12:40:13 -05:00
chrisgarrity	58656aea17	Additional content changes - new FlyCards.pdf (fixes shortcut url on title page) - changes ‘download’ to ‘open’ for PDFs	2016-11-21 11:06:12 -05:00
chrisgarrity	bb777baf4c	Fix TTT content ttt.subtitle: - ‘try theTutorial’ instead of ‘try a Tutorial’ - Hide and Seek instead of Hide-and-Seek Game - change <b> to <strong> title-banner.scss - add explicit rule to bold <strong> within title-banner for windows browsers	2016-11-21 11:06:02 -05:00
Matthew Taylor	edd41205bc	Redirect hoc page to `/go` Implements #906	2016-11-20 13:55:00 -05:00
chrisgarrity	b58163c420	Merge pull request #1037 from chrisgarrity/patch-column-count fix column count for IE and Edge	2016-11-18 17:42:20 -05:00
Matthew Taylor	e77e02d5a6	Update ttt content Still missing `FashionGuide`, may need to remove that guide.	2016-11-18 17:42:09 -05:00
Matthew Taylor	b7bfaec438	Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage Fix gh-979: TTT page	2016-11-18 17:41:58 -05:00
Matthew Taylor	e6de0d0ba4	Merge pull request #1018 from mewtaylor/issue/gh-995 Fix GH-995: Make cards tweaks	2016-11-18 17:41:49 -05:00
Matthew Taylor	9ca54e83ce	Merge pull request #1008 from mewtaylor/issue/gh-980 Implement GH-980: add new TTT modal component	2016-11-18 17:41:26 -05:00
chrisgarrity	0ab62689ce	fix column count for IE and Edge Set column-count for all widths since it’s needed for Firefox, IE and Edge browsers	2016-11-18 17:08:23 -05:00
The_Grits	f22b698bb6	Bitly URL	2016-11-16 15:24:20 -05:00
The_Grits	62c6a57ff5	Update Trust and Safety Manager URL I have a feeling Travis won't like this	2016-11-16 14:58:58 -05:00
The_Grits	e1f58662d0	Add localization strings For #1023	2016-11-16 14:23:16 -05:00
The_Grits	015cca13f4	Localize Explore Title and Dropdown As per #1023	2016-11-16 14:20:43 -05:00
Matthew Taylor	c4f42b3673	Add hoc banner	2016-11-16 08:52:18 -05:00
Matthew Taylor	e65ba61e7a	Move padding to splash element Having it in the nav was causing issues with positioning the banner, as evidenced by the teacher banner’s `-20px` setting	2016-11-16 08:51:57 -05:00
Matthew Taylor	fe70dd0f9e	trello-ize title banner h1,p styling we need it to be different for the hoc banner, so make it need a class name in order to be styled correctly	2016-11-16 08:50:00 -05:00
Matthew Taylor	e4231e9d57	Update ttt content Still missing `FashionGuide`, may need to remove that guide.	2016-11-15 07:42:36 -05:00
Matthew Taylor	ac46cce989	Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage Fix gh-979: TTT page	2016-11-15 07:22:16 -05:00
Matthew Taylor	faa8c879be	Merge pull request #1018 from mewtaylor/issue/gh-995 Fix GH-995: Make cards tweaks	2016-11-15 07:21:37 -05:00
chrisgarrity	9693a5a526	Merge pull request #999 from TheGrits/patch-4 Fix gh-996: Update Privacy Policy	2016-11-14 16:59:37 -05:00
chrisgarrity	de9fb22fc8	last tweak use .map (.., key) instead of tile.title just in case we ever have two tiles with the same title.	2016-11-14 16:42:06 -05:00
chrisgarrity	a27fea51e6	Integrated ttt-modal integrated modal and added guide pdfs. Catch and Pet Guides are still missing. We may need to remove them from the TTT list. Wanted to get this committed in any case to start review.	2016-11-14 14:34:45 -05:00
Matthew Taylor	370164c585	Make cards tweaks Fixes #995	2016-11-14 13:35:13 -05:00
chrisgarrity	986a368d2b	Remove Story and Fashion TTTs Create a Story and Fashion Game are not ready, so removing from the ttt json. Leaving in the l10n files so that translations can get started.	2016-11-14 10:37:19 -05:00
chrisgarrity	5854e9ccc9	Adding data for tutorials/guides/cards	2016-11-14 10:31:40 -05:00
Matthew Taylor	1b95e643a9	fix for linting	2016-11-14 10:31:40 -05:00
Matthew Taylor	d72a605e69	Last tweaks thanks @rschamp!	2016-11-14 10:31:40 -05:00
Matthew Taylor	688ab935d1	Some last tweaks based on feedback from @rschamp, thanks! 1. make `ref` into method 2. remove accidental inclusion of prototype modal 3. use `omit` for props so that we don’t need a separate object for wrapped component properties	2016-11-14 10:31:40 -05:00
Matthew Taylor	438dbb21e1	Edits based on feedback thanks @rschamp !	2016-11-14 10:31:40 -05:00
Matthew Taylor	fa380a7148	edit copy/paste error Thanks @chrisgarrity !	2016-11-14 10:31:40 -05:00
Matthew Taylor	95b6d6bd5c	Update microworld iframe modal	2016-11-14 10:31:40 -05:00
Matthew Taylor	484e3d2544	Add ttt modal component This assumes that the parent view that renders it will contain the strings that are specific to the ttt element.	2016-11-14 10:31:40 -05:00
Matthew Taylor	b1e37360f3	Refactor modal components 1. Split out base modal stylings from iframe modal stylings 2. Move iframe-specific stylings into a separate copmonent 3. Move width/height iframe stylings to scss 4. Change global stylings for modals to match #980 5. Update styles to use trello style guide	2016-11-14 10:31:40 -05:00
Matthew Taylor	25f61fdb77	Merge pull request #1008 from mewtaylor/issue/gh-980 Implement GH-980: add new TTT modal component	2016-11-14 10:09:00 -05:00
Matthew Taylor	24aa9be30d	fix for linting	2016-11-14 09:58:42 -05:00
Matthew Taylor	652c328cbd	Last tweaks thanks @rschamp!	2016-11-14 08:39:19 -05:00
Matthew Taylor	402efd8046	Some last tweaks based on feedback from @rschamp, thanks! 1. make `ref` into method 2. remove accidental inclusion of prototype modal 3. use `omit` for props so that we don’t need a separate object for wrapped component properties	2016-11-10 17:13:44 -05:00
Matthew Taylor	d2474c87a5	Edits based on feedback thanks @rschamp !	2016-11-10 15:00:33 -05:00
chrisgarrity	1f8d26186c	Add all the banners Removed the getting started placeholder. Added all the banners from #980, updated ttt.json with banner location	2016-11-10 11:32:58 -05:00
jwzimmer	8fce4f3e03	update compatibility & support FAQ response	2016-11-10 11:13:10 -05:00
Matthew Taylor	c6cd701464	edit copy/paste error Thanks @chrisgarrity !	2016-11-10 09:39:52 -05:00
Matthew Taylor	cbaab105f1	Update microworld iframe modal	2016-11-10 09:39:23 -05:00
The_Grits	6f35550ff4	Add Tutorials Button For #1009	2016-11-09 21:32:58 -05:00
chrisgarrity	145da5f872	Styling and formatting clean up pass Went over styles with Carl. Some notes: renamed tutorial button tutorial tag as it’s not really a button and is unique to ttt. Found out why cols4 wasn’t working - if your browser default font isn’t 16px, rem isn’t 16px. Opening a separate issue and using cols4 where it should be.	2016-11-09 21:25:35 -05:00
The_Grits	5fb1dd6230	Thanks Travis A more thorough search of the error Travis returned helped me realize the problem.	2016-11-09 12:48:39 -05:00
chrisgarrity	ca7d0cf30e	Next draft Includes new SVGs for banner and resources link MasonryGrid does the reordering of items Using react-responsive MediaQuery to change columns Brought in ../forms/button.scss for button styling, and then modified for TTT Still needs Modal Final styling pass with Carl	2016-11-09 09:28:59 -05:00
Matthew Taylor	5af05466f6	Add ttt modal component This assumes that the parent view that renders it will contain the strings that are specific to the ttt element.	2016-11-08 14:44:50 -05:00
Matthew Taylor	c9de1d73d9	Refactor modal components 1. Split out base modal stylings from iframe modal stylings 2. Move iframe-specific stylings into a separate copmonent 3. Move width/height iframe stylings to scss 4. Change global stylings for modals to match #980 5. Update styles to use trello style guide	2016-11-08 14:44:03 -05:00
chrisgarrity	c6f2fa68a7	First version of TTT page	2016-11-07 15:07:19 -05:00
Ray Schamp	0b6d87fa91	Update pattern so rewrite accepts querystring too	2016-11-07 12:14:50 -05:00
Ray Schamp	c83ffbef46	Merge pull request #1005 from LLK/hotfix/hoc-url [Develop] Allow querystring in /hoc URL	2016-11-07 11:54:22 -05:00
Ray Schamp	7be6704b51	Allow querystring in /hoc URL We should fix this for every URL, but that is too large of a change for a hotfix	2016-11-07 11:13:32 -05:00
The_Grits	2c1106adf7	Fix Travis	2016-11-07 11:12:59 -05:00
The_Grits	bfc0b5994e	gotcha	2016-11-07 11:09:44 -05:00
The_Grits	d9df101a66	One Commit More (#23 ) * Update reducer.js * Update search.jsx	2016-11-07 11:02:33 -05:00
Matthew Taylor	f7f4ed466e	Merge pull request #985 from TheGrits/patch-2 Fix gh-706: "This field is required" when phone number is null	2016-11-07 10:28:31 -05:00
The_Grits	21941ecf86	Phone Number 'Required' Validation	2016-11-04 11:51:48 -04:00
The_Grits	eba009b132	Student Data Privacy Strings	2016-11-03 17:33:48 -04:00
The_Grits	d3f432d247	Add law compliance strings	2016-11-03 17:22:49 -04:00
The_Grits	f3579a2976	Update Privacy Policy Add policy, fix typo, and update update date.	2016-11-03 17:10:02 -04:00
Ray Schamp	ae106a866a	Merge pull request #993 from LLK/release/2.2.14 [Develop] Release 2.2.14	2016-10-31 16:25:13 -04:00
The_Grits	8be3e11486	Travis and Other Stuffs	2016-10-31 10:19:35 -04:00
The_Grits	9f2cda0eaa	Bugs and Connections	2016-10-31 10:05:08 -04:00
St19_Galla	2fd2118fe0	change community manager name	2016-10-28 11:29:50 -04:00
St19_Galla	d93212818d	Remove jobs	2016-10-28 11:16:20 -04:00
Matthew Taylor	c6ccf78b2f	Revert "Update requirement string" temporarily This reverts commit `9f93340539`. This is temporary, and we will add it back in once the Windows tool is ready.	2016-10-28 08:00:14 -04:00
Matthew Taylor	7e04ae1088	Add w/o slash to the whitelist paths as recommended in https://github.com/LLK/scratchr2/pull/4127#issuecomment-256484893	2016-10-27 08:38:17 -04:00
The_Grits	10e49d87b3	Empty Phone Number Validation Separated the null check from the area code check so that when the field is null the 'required' popup will be displayed.	2016-10-26 14:15:54 -04:00
The_Grits	379ac78551	Navigation Redux	2016-10-26 10:20:16 -04:00
The_Grits	f77b22b07b	Update with Reducer	2016-10-20 21:30:32 -04:00
chrisgarrity	fa1b6c6c00	Merge pull request #948 from TheGrits/patch-1 Fix gh-924: Localize Developers Page	2016-10-20 17:52:16 -04:00
Connor Hudson	dc890d6db8	Merge pull request #964 from technoboy10/gh899-searchbarundefined Fix GH-899: Re-searching should not search for 'undefined'	2016-10-20 12:51:50 -07:00
Technoboy10	3777ab825c	make fix simpler by using value instead of defaultValue	2016-10-20 13:17:23 -06:00
Matthew Taylor	f2b7d4fcf7	Merge pull request #976 from mewtaylor/issue/gh-856 Implement GH-856: Add new cards and card thumbs to www	2016-10-20 11:23:57 -04:00
Matthew Taylor	88a78480ba	Back to hide-and-seek with new cards	2016-10-19 16:54:24 -04:00
Matthew Taylor	cdf8059995	Change name to “Hide and Show”	2016-10-19 16:39:51 -04:00
Matthew Taylor	dc48dbb34a	use `var` not `const` We’re not at es6 yet. My baaaaaaaaaaddddd	2016-10-19 15:41:56 -04:00
chrisgarrity	991ce989be	Merge pull request #929 from tmickel/feature/developers-scratchjr Add ScratchJr to developers page	2016-10-19 15:29:25 -04:00
Matthew Taylor	e01afa0161	Add new cards and card thumbs to www Fixes #856. This also updates the styling of the `cards.jsx` view to follow the trello style guide, as previously discussed.	2016-10-19 13:45:37 -04:00
Matthew Taylor	f8a6d975c7	Merge pull request #951 from mewtaylor/issue/ban-whitelist Don’t redirect banned user on community guidelines	2016-10-18 16:35:08 -04:00
St19_Galla	bb20fa3375	single quotes whoops!	2016-10-13 17:31:57 -04:00
St19_Galla	5775cedc7a	add space	2016-10-13 17:26:46 -04:00
St19_Galla	d6680f129f	Update l10n.json	2016-10-13 17:25:44 -04:00
St19_Galla	e3452e3ea1	Add space in curator row	2016-10-13 15:51:17 -04:00
Technoboy10	4a610296e2	Add check for undefined formData	2016-10-12 16:09:00 -06:00
chrisgarrity	4074b986c2	Merge pull request #960 from chrisgarrity/gh940-missing-i18n Fix gh-940: missing translations	2016-10-12 16:28:34 -04:00
chrisgarrity	29b104741f	Added tests for duplicate strings in build-locales merge Also took out default messages for strings that are in the l10n json files.	2016-10-12 09:41:06 -04:00
The_Grits	8de70e8882	FormattedHTMLMessage fix	2016-10-11 20:38:01 -04:00
chrisgarrity	5b2ff1a4ca	Update md5map fixtures for tests Also cleaned up comments from @mewtaylor	2016-10-11 19:28:13 -04:00
Matthew Taylor	36992e7d8d	Merge pull request #939 from TheGrits/patch-2 Fix gh-938: Update Privacy Policy	2016-10-11 15:12:18 -04:00
chrisgarrity	1339683a73	Fix #940 Most problems were due to strings being duplicated and overwriting each other. Updated the build-locales script to keep track of duplicates. Project Curated by on the splash page was just missing the formatMessage call.	2016-10-11 12:33:31 -04:00
The_Grits	9f93340539	Fix #930 : Update requirement string	2016-10-11 12:33:30 -04:00
Matthew Taylor	cd9720f0f1	Merge pull request #954 from mewtaylor/issue/smarty-streets-strict [Develop] Hotfix: loosen restrictions on smartystreets check	2016-10-06 16:46:57 -04:00
Matthew Taylor	7540ee45e3	loosen restrictions on smartystreets check re-fixes #828 by loosening restrictions on the check once again (see https://smartystreets.com/docs/us-street-api#match-strategy)	2016-10-06 16:36:27 -04:00
St19_Galla	b83a3825e9	Add Travis-CI	2016-10-06 15:55:00 -04:00
The_Grits	dd4550899b	unbold	2016-10-06 10:44:08 -04:00
The_Grits	009b6eb75a	Finish Localization and Implementation	2016-10-05 23:03:23 -04:00
Matthew Taylor	e1e9455866	Don’t redirect banned user on comm. guideliens Goes along with https://github.com/LLK/scratchr2/pull/4127.	2016-10-05 17:49:18 -04:00
The_Grits	e0026d5c44	Part 1	2016-10-05 00:05:03 -04:00
Matthew Taylor	603a1336ce	Merge pull request #931 from TheGrits/patch-1 Fix gh-930: Update requirement string	2016-10-04 20:47:58 -04:00
Matthew Taylor	6bcc7eeae3	Update make it fly hoc image to be higher res Higher res AND SMALLER FILE SIZE?!?! This really is 2016. We live in an amazing time.	2016-10-03 16:40:57 -04:00
The_Grits	53e3e34a52	Update link, add reviewed date	2016-10-03 16:12:14 -04:00
Matthew Taylor	c44742e668	Slight content edits to hoc page updates the studio links, and also fixes a link issue for the dance activity. Thanks @jwzimmer!	2016-10-03 16:04:19 -04:00
Ray Schamp	6fa1c13cfb	Move Randy Jou to previous Scratch Team section	2016-10-03 11:39:21 -04:00
Matthew Taylor	99cedec978	Put label for “Not Required” above input Fixes #933	2016-09-30 15:02:05 -04:00
The_Grits	195930bc53	Merge!	2016-09-30 13:54:34 -04:00
The_Grits	d90f62c316	Create navigation.js	2016-09-30 13:48:57 -04:00
The_Grits	4413213caa	Fix #930 : Update requirement string	2016-09-28 08:10:11 -04:00
Tim Mickel	aea35c5b8c	Add ScratchJr to developers page	2016-09-26 11:57:52 -04:00
Matthew Taylor	0156fe8c77	Add cards for fly and make music	2016-09-19 15:59:40 -04:00
Matthew Taylor	cd6a60e5b8	Change bearstack/bball to hide and dance Also make updates to style scoping based on feedback from @rschamp	2016-09-15 11:44:33 -04:00
Matthew Taylor	f4b0b26b5c	make multiline formatting for `img` uniform	2016-09-15 08:21:38 -04:00
Matthew Taylor	469d7a35bb	Update hoc page with new tutorials Adds: 1. Make it Fly 2. Make Music Removes: 1. Hide-and-Seek 2. Dance, Dance, Dance	2016-09-15 08:15:37 -04:00
The_Grits	2b2f4a03e8	Fix lint	2016-09-13 11:49:34 -04:00
The_Grits	68d37e0506	Update Video Link As per @sleggss on #918	2016-09-13 11:41:39 -04:00
Ray Schamp	60f0ee1ded	Merge pull request #913 from rschamp/bugfix/empty-bodies Don't set state to undefined API response bodies	2016-09-12 13:52:54 -04:00
Matthew Taylor	bd911c52d1	Merge pull request #867 from morantsur/feature/microworlds Adding routes to microworlds	2016-09-12 12:06:27 -04:00
Ray Schamp	3efa1fd7c8	Merge pull request #911 from rschamp/feature/html-webpack-plugin Use html-webpack-plugin for html rendering	2016-09-09 15:52:52 -04:00
Ray Schamp	c274de7295	Make template variables a bit less verbose Move the rest of the configuration into template-config.js. This way the options are explicitly in the same namespace so we won't be surprised when we add a variable with the same name as an html-webpack-plugin option. Rename template extension to ejs for syntax-coloring purposes.	2016-09-09 09:21:03 -04:00
Ray Schamp	c0eb1608bd	Don't set state to undefined API response bodies This resolves the "Cannot read property 'x' of undefined" errors that occur when the API returns non-JSON responses. For instance if the proxy endpoints return 500 error responses from scratchr2.	2016-09-08 17:23:49 -04:00
morant	89faccfc6f	Remove caret from routhAlias	2016-09-08 17:06:24 -04:00
Ray Schamp	e44e958fe0	Move permissions storage to client-side cookie Instead of retrieving the permission from the session cookie, store permission data from /session/, and cache it in a cookie. On subsequent page loads, the permission information will be retrieved from the cookie more quickly than the /session/ endpoint returns. When the session changes, the cookie and permissions state is updated to reflect the new state.	2016-09-08 12:53:05 -04:00
Ray Schamp	a497fed338	Remove token storage We're not using it yet, and it won't be coming from the cookie when we do.	2016-09-08 12:48:07 -04:00
Ray Schamp	3fbd9fab36	Use html-webpack-plugin for html rendering This plugin will likely be updated when webpack is updated.	2016-09-08 09:59:37 -04:00
morant	850def5cf0	- Remove commented out content from microword pages, as they are not displayed. - Change art microworld text to not refer to videos.	2016-09-07 16:27:46 -04:00
morant	96c52dc223	Fixing route alias + adding new line	2016-09-07 13:35:14 -04:00
Matthew Taylor	1b4eaf0f0f	Merge pull request #902 from TheGrits/patch-3 Fix gh-894: Community Guidelines Image	2016-09-06 11:28:51 -04:00
Matthew Taylor	e454544abd	Merge pull request #901 from St19Galla/patch-1 Fix gh-900 // Update Credits	2016-09-06 10:56:20 -04:00
Matthew Taylor	2e3aee25d9	cover `undefined` case as well thanks @rschamp!	2016-09-01 16:22:45 -04:00
Matthew Taylor	ffa249c3c5	Check for username before sending the `//` for an empty username that gets sent to the backend causes a 500 error. This is an edge case in formsy, as it has not detected a change value yet, so handle it in the username validation method. Fixes #872	2016-09-01 14:59:02 -04:00
The_Grits	c224284d81	oops Just realized I took the whole footer off, not just the image.	2016-08-31 21:24:10 -04:00
The_Grits	bf24d592ad	Update guidelines.scss Update to hide page's footer image when the screen is too small.	2016-08-31 21:11:19 -04:00
St19_Galla	f2c176a521	Update Credits	2016-08-31 14:59:03 -04:00
Matthew Taylor	ee088e6384	Merge pull request #896 from mewtaylor/issue/gh-825-zip Fix GH-825: Only require zip code for US addresses	2016-08-29 13:14:22 -04:00
morant	ecdc544dff	Disable lint on require('react') lines as they are required implicitly.	2016-08-29 12:40:17 -04:00
Matthew Taylor	33d06e9721	Merge pull request #865 from St19Galla/patch-2 Fix gh-864 // Update Conference Text	2016-08-29 11:57:48 -04:00
morant	2af34efa98	Fix some failed tests.	2016-08-26 15:51:42 -04:00
Matthew Taylor	e7b0415a6b	Only require zip code for US addresses Since we only check for the US, only require for that country. Other countries have zip codes, but it seems better to do it this way than codify which countries do/do not have zip codes (in case local practices are not the same as international information). Fixes #825	2016-08-26 11:14:26 -04:00
Matthew Taylor	fae45f191e	Merge pull request #873 from TheGrits/patch-2 Fix gh-853: Update Community Guidelines	2016-08-26 10:27:47 -04:00
Matthew Taylor	45d206315f	Merge pull request #863 from St19Galla/patch-1 Fix gh-860 // Update FAQ	2016-08-26 10:27:00 -04:00
St19_Galla	5ca03b4e3a	remove on from anchor	2016-08-25 08:05:32 -04:00
Matthew Taylor	ab6f8e1049	Add in an Oxford Comma *whistles as he commits see https://github.com/LLK/scratch-www/pull/819#issuecomment-242195194	2016-08-24 16:39:03 -04:00
Matthew Taylor	5dd80c1020	additional reformatting	2016-08-24 10:55:13 -04:00
Matthew Taylor	fb5d9788f8	Re-structure grid styling a bit combine stylings where possible, re-name some of the variables to be used more often	2016-08-24 10:24:01 -04:00
Matthew Taylor	28f96a1d0d	Align grid items on the left use `flex-start` with margins to ensure proper spacing between, while still starting at the left of each row.	2016-08-24 10:23:26 -04:00
Matthew Taylor	9a11e49444	Add `device-width` by default Now that we have mobile nav/footer	2016-08-24 07:54:08 -04:00
The_Grits	c0c7a1a7e0	Update Community Guidelines As per @Paddle2See on #853	2016-08-23 16:31:43 -04:00
Technoboy10	32ef37e3bf	remove unused variable	2016-08-23 11:10:02 -06:00
Technoboy10	f0703b9f46	fix styling error	2016-08-23 09:26:22 -06:00
Technoboy10	55f95bb2a8	remove inactive class on tabs	2016-08-23 09:26:22 -06:00
Technoboy10	f27e99f1a4	move card styling to grid.scss, use card as default grid style	2016-08-23 09:26:22 -06:00
Technoboy10	6394d3e8cf	make search bar on 4 column layout look right	2016-08-23 09:26:22 -06:00
Technoboy10	647c925a1c	search redesign	2016-08-23 09:26:22 -06:00
Technoboy10	4d0efd1268	explore redesign	2016-08-23 09:26:21 -06:00
Technoboy10	017df9da20	redo tabs component	2016-08-23 09:26:21 -06:00
Technoboy10	3fa6fa95fd	add card display to grid and thumbnail components	2016-08-23 09:26:21 -06:00
Technoboy10	278f7c8819	more tweaks	2016-08-23 09:26:21 -06:00
Technoboy10	cca9b4a7ed	style tweaks	2016-08-23 09:26:21 -06:00
Technoboy10	55163d2c86	more work on user avatar in thumbnail	2016-08-23 09:26:21 -06:00
Technoboy10	432b621079	wip	2016-08-23 09:24:44 -06:00
Technoboy10	f883ecfbae	commit changes	2016-08-23 09:24:44 -06:00
morant	191d78fab3	Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/microworlds	2016-08-22 13:43:04 -04:00
morant	28aa4f0b2c	Fixing microword pages and adding routes to them. - Remove temp "open in Scratch" button, now that we have a permanent one. - Fix microworld pages to work with new changes to environment. - Fix alignment issues. - Connect routes to microworld pages. - Add soccer microworld. - Comment out videos and tips from arts microworls, so it can be shown publicly.	2016-08-22 13:31:44 -04:00
St19_Galla	2123fc9af8	Updates	2016-08-22 11:04:31 -04:00
St19_Galla	ceb6b38106	whoops	2016-08-22 09:46:47 -04:00
St19_Galla	4f3f978b86	Update FAQ	2016-08-22 09:41:44 -04:00
Matthew Taylor	70eb82f7cb	remove `.card`-specific stylings	2016-08-19 15:16:35 -04:00
Matthew Taylor	baf0676f99	move `.validation-message` out` It doesn’t need to be specifically styled, as we have no use for it inside `.card` but outside `.row` yet. Thanks @rschamp!	2016-08-19 15:06:12 -04:00
Matthew Taylor	bc0263531b	align gender/org input msg with others Because the `input` field is already to the right, they were being transformed too far over. This overrides the transform to be correct, and also scopes some css in more detail	2016-08-19 14:11:24 -04:00
Matthew Taylor	db2b7ebc34	Merge pull request #851 from St19Galla/patch-1 Fix GH-850 // Add image links	2016-08-19 06:42:40 -04:00
Matthew Taylor	9882aea9f0	Merge pull request #855 from mewtaylor/issue/gh-843 Fix GH-843: Add link to teacher accounts registration in faq	2016-08-19 06:42:13 -04:00
St19_Galla	43bcbaf2ac	what was i thinking lol	2016-08-17 18:30:39 -04:00
Ray Schamp	2c9e53310e	Merge pull request #852 from rschamp/bugfix/3895 Allow an optional / in teacher registration URL	2016-08-17 12:59:14 -04:00
Matthew Taylor	34a0cfc4e7	Add link to teacher accounts registration in faq also re-order questions based on feedback	2016-08-17 12:55:58 -04:00
St19_Galla	4ca603b050	One more update for '/'	2016-08-17 10:11:00 -04:00
St19_Galla	880413a61d	fix (hopefully)	2016-08-16 21:30:52 -04:00
St19_Galla	5d5e1d9fdf	update to relative	2016-08-16 21:21:29 -04:00
Ray Schamp	f18be588a0	Allow an optional / in teacher registration URL Resolves #3895	2016-08-16 11:48:46 -04:00
Matthew Taylor	4a0442695a	generalize “Educator Resources” It was getting overwritten since it was defined in multiple places. fixes #840.	2016-08-16 11:33:07 -04:00
St19_Galla	b1eadf8c12	Add image links	2016-08-16 11:11:46 -04:00
Matthew Taylor	43add1ad35	Clean up some intl formatting remove `defaultMessage` from inline, which we don’t use right now	2016-08-16 08:56:01 -04:00
Matthew Taylor	41a0ef73ba	Add missing strings for translation 1. Explore page header 2. “by” in the project thumbnail	2016-08-16 08:55:32 -04:00
Matthew Taylor	b893c5c657	Merge pull request #845 from mewtaylor/issue/new-languages Add fur, sq and te to language list	2016-08-16 08:45:28 -04:00
Matthew Taylor	54e9980808	Merge pull request #847 from mewtaylor/issue/gh-835 For GH-835: eliminate max height of validation messsage	2016-08-16 08:14:09 -04:00
Matthew Taylor	bb37d4be57	eliminate max height of validation messsage now that it’s not centered but rather top/down, we don’t need this anymore	2016-08-16 08:08:48 -04:00
Matthew Taylor	ac4d1b51d6	Merge pull request #846 from mewtaylor/issue/gh-835 For GH-835: Update max length copy	2016-08-15 16:47:10 -04:00
Matthew Taylor	2a18c381f4	Update max length copy thanks @kaschm and @jwzimmer !	2016-08-15 16:40:01 -04:00
Matthew Taylor	f3de2d1d28	re-order languages and also get language for dropdown from `IntlProvider` rather than the window, so that we have one point of truth	2016-08-15 14:53:31 -04:00
Matthew Taylor	f4d7cbd235	Merge pull request #819 from mewtaylor/issue/gh-546 Fix GH-546: Update faq language	2016-08-15 13:30:29 -04:00
Matthew Taylor	59d558116e	Merge pull request #836 from mewtaylor/issue/gh-760 Fix GH-760: Add username `not equals` to password validation	2016-08-15 13:29:46 -04:00
Matthew Taylor	e791c0a8ff	Merge branch 'issue/gh-835' of https://github.com/mewtaylor/scratch-www-1 into develop * 'issue/gh-835' of https://github.com/mewtaylor/scratch-www-1: Switch ordering Remove `option` warning in console Add `maxLength` validations where needed # Conflicts: # src/components/registration/steps.jsx	2016-08-12 17:23:32 -04:00
Matthew Taylor	61ef3c2c69	Switch ordering so `intl` comes first	2016-08-12 16:43:56 -04:00
Matthew Taylor	0d9493de12	Remove `option` warning in console `option` throws an error in React if it’s not a string. `FormattedMessage` returns a `span` around strings, so any time this function was loaded/called, it was throwing >100 warnings in the console. use `intl` to return a string instead.	2016-08-12 15:47:44 -04:00
Matthew Taylor	6d5bb4f850	Add `maxLength` validations where needed fixes #835	2016-08-12 15:39:39 -04:00
Matthew Taylor	2db7097b9b	Merge pull request #839 from mewtaylor/hotfix/gh-828 [Develop] Fix GH-828: check street number range for address	2016-08-12 15:15:53 -04:00
Matthew Taylor	ccfde96f67	use new `match` option instead of header so that it works in IE9 too.	2016-08-12 14:40:26 -04:00
Matthew Taylor	f8de61f067	Update from feedback use props for username rather than constructed form data, and `studentUsername -> username`. Thanks @rschamp!	2016-08-12 10:11:14 -04:00
Matthew Taylor	cbf76ec636	Clean up a few lint warnings	2016-08-12 08:10:42 -04:00
Matthew Taylor	537104c56b	Add username validation to student complete registration Fixes #760	2016-08-12 08:10:20 -04:00
Matthew Taylor	ea91b3d885	Remove declaration of `defaultsDeep` Got lost in the merge, apologies.	2016-08-11 15:55:58 -04:00
Matthew Taylor	e18e320231	Merge branch 'hotfix/gh-828' into develop * hotfix/gh-828: Make `X-Requested-With` overridable use `defaults` again Only apply `X-Requested-With` to same domain check street number range for address # Conflicts: # src/lib/api.js	2016-08-11 15:45:05 -04:00
Matthew Taylor	d6d5fa0f8a	Make `X-Requested-With` overridable thanks @rschamp!	2016-08-11 15:20:54 -04:00
Matthew Taylor	4dc85b1bc4	use `defaults` again deep is no longer necessary with the `headers` change	2016-08-11 15:20:54 -04:00
Matthew Taylor	fa2c326955	Only apply `X-Requested-With` to same domain it breaks on cross domain	2016-08-11 15:20:54 -04:00
Matthew Taylor	9c88f92f44	check street number range for address rather than exact address, so that we can more flexibly allow outdate post office data	2016-08-11 15:20:54 -04:00
Ray Schamp	5001d3a12d	Merge pull request #833 from rschamp/bugfix/3937 [Master] Update teacher FAQ copy	2016-08-11 14:32:12 -04:00
Ray Schamp	1df251ca2a	Merge pull request #832 from rschamp/bugfix/3937 [Develop] Update teacher FAQ copy	2016-08-11 14:22:46 -04:00
Ray Schamp	46b23beda5	Update teacher FAQ copy Resolves LLK/scratchr2#3937	2016-08-11 13:00:45 -04:00
Matthew Taylor	2fc62cba13	Merge pull request #830 from mewtaylor/hotfix/gh-828 [Develop] Fix GH-828: check street number range for address	2016-08-11 08:46:07 -04:00
Matthew Taylor	4d9fe86f40	check street number range for address rather than exact address, so that we can more flexibly allow outdate post office data	2016-08-10 15:33:17 -04:00
Ray Schamp	47d0cca883	Merge pull request #824 from St19Galla/patch-1 Fix GH-806: Teacher Account Video Embded	2016-08-10 12:15:56 -04:00
St19_Galla	ecd1963bbe	Update faq.jsx	2016-08-10 12:14:08 -04:00
Matthew Taylor	6e3a18a574	only look for empty phone on submit thanks @rschamp!	2016-08-10 09:45:21 -04:00
Matthew Taylor	56e88685b5	Check for empty phone number on submit Thanks @rschamp!	2016-08-10 09:38:43 -04:00
Matthew Taylor	30945bc078	Remove `phoneLength` validation	2016-08-10 07:53:49 -04:00
Matthew Taylor	56481c797e	Remove `phoneLength` validation It appears that some valid phone numbers in some countries differ in length from what is specified in the util’s phone number format. Fixes #816.	2016-08-10 07:47:12 -04:00
Connor Hudson	f49d6e6a83	Merge pull request #767 from technoboy10/mobile-nav-footer Fix GH-217: Implement responsive nav and footer (woohoo!)	2016-08-09 15:09:01 -04:00
St19_Galla	8b18629264	amend text	2016-08-09 10:22:48 -04:00
St19_Galla	fd5be4bf8d	Embed Video	2016-08-09 10:16:08 -04:00
Technoboy10	c009497b6b	use scss in navbar instead of react-responsive	2016-08-09 09:55:20 -04:00
The_Grits	722b7ec20c	Add email address link Fixes #822	2016-08-08 19:37:58 -04:00
Matthew Taylor	68042b056b	Merge pull request #821 from mewtaylor/hotfix/gh-673 [Develop] Hotfix: Bind the banner api method to the splash page	2016-08-08 16:39:39 -04:00
Matthew Taylor	7cb14c17b9	Bind the api method to the splash page otherwise, `this` is undefined. Fixes #673.	2016-08-08 16:31:03 -04:00
Matthew Taylor	b1f7d9666e	Update faq language Fixes #546	2016-08-08 16:28:48 -04:00
Matthew Taylor	f3c4276d0f	Merge pull request #814 from St19Galla/patch-1 Fix GH-812 / Enhance Checkbox Display	2016-08-08 10:20:09 -04:00
Matthew Taylor	967e5b6d3f	remove link to “My Classes” from faq so that it doesn’t 403 for people without educator accounts. Fixes #658	2016-08-08 08:34:20 -04:00
Matthew Taylor	606e3600ba	Merge pull request #803 from mewtaylor/issue/gh-683 Fix GH-[683,705,712,797]: Updates to registration UX for teachers	2016-08-08 08:10:24 -04:00
St19_Galla	a7ea6d7fd9	whoops, don't need that anymore	2016-08-05 15:51:48 -04:00
St19_Galla	ef55f20ff3	now i finally understand scss variables	2016-08-05 15:50:51 -04:00
St19_Galla	3ff81296a7	test	2016-08-05 15:43:15 -04:00
St19_Galla	dd85de22e6	Enhance Checkbox Display	2016-08-05 15:24:33 -04:00
Matthew Taylor	04524c8d91	Merge pull request #809 from mewtaylor/hotfix/js-types [Develop] Set mime types on deploy	2016-08-04 08:09:40 -04:00
Matthew Taylor	1013f260b9	Use `guess-mime-type` to get the right file type should help with some header issues we’re seeing. Also remove `x-frame-options` meta tag, since it’s not acknolwedged by some browsers (like Chrome).	2016-08-04 08:02:45 -04:00
Ray Schamp	e5b62ba61b	Merge pull request #808 from rschamp/hotfix/ta-yt-ta-faq [Develop] Add link to teacher account walkthrough video	2016-08-03 17:04:41 -04:00
Ray Schamp	77644aafb2	Merge pull request #807 from rschamp/hotfix/ta-yt-ta-faq [Master] Add link to teacher account walkthrough video	2016-08-03 17:04:35 -04:00
Matthew Taylor	776623bbb3	Merge pull request #790 from mewtaylor/hotfix/conference-livestream [Master] Hotfix: Add hyperlink to keynote livstream for 2016 conf	2016-08-03 17:03:09 -04:00
Ray Schamp	42229e84e7	Add link to teacher account walkthrough video	2016-08-03 16:53:38 -04:00
Matthew Taylor	73fbc36ff9	declare callback if undefined	2016-08-03 16:24:51 -04:00
Matthew Taylor	4a527fdd2e	Merge branch 'master' of https://github.com/LLK/scratch-www into hotfix/conference-livestream * 'master' of https://github.com/LLK/scratch-www: Only redirect approved educators to My Classes Lint Add "Request Account" button to Educators landing Add `align` prop to `SubNavigation` component	2016-08-03 16:19:09 -04:00
Matthew Taylor	fc20f59a7e	Merge branch 'master' of https://github.com/LLK/scratch-www into isseu/gh-792 * 'master' of https://github.com/LLK/scratch-www: Only redirect approved educators to My Classes Lint Add "Request Account" button to Educators landing Add `align` prop to `SubNavigation` component	2016-08-03 16:17:30 -04:00
Ray Schamp	d2d78da580	Merge pull request #793 from rschamp/hotfix/activate-teacher-registration [Master] Add "Request Account" button to Educators landing page	2016-08-03 15:50:48 -04:00
Matthew Taylor	86662e13d6	Consolidate and remove `onValidSubmit`	2016-08-03 15:20:58 -04:00
Matthew Taylor	4e568f7c06	use minLength instead it’s the same thing :). Thanks @rschamp!	2016-08-03 14:34:07 -04:00
Matthew Taylor	cec3214def	some updates from feedback thanks @rschamp! 1. moved org type validation to a custom validation 2. added a callback to the username validation call	2016-08-03 12:11:55 -04:00
Technoboy10	fdfbf57e28	fix file location	2016-08-02 16:50:40 -04:00
Technoboy10	c19c32ded3	fix merge conflicts from upstream/develop	2016-08-02 16:50:23 -04:00
Technoboy10	ed924e3b2c	add space back in	2016-08-02 15:30:01 -04:00
Matthew Taylor	f0c2280fde	Updates to registration UX for teachers 1. Phone too long validation occurs before submit now. 2. Organization “other” type is now being required 3. Organization type required now shows up at the same time as other organization validation errors 4. Username check now occurs earlier, on blur rather than on submit	2016-08-02 15:23:09 -04:00
Ray Schamp	c55595fbc3	Merge pull request #802 from rschamp/hotfix/waiting-room-loop [Develop] Only redirect approved educators to My Classes	2016-08-02 11:24:01 -04:00
Ray Schamp	0e6a7e6fdc	Merge pull request #794 from rschamp/hotfix/activate-teacher-registration [Develop] Add "Request Account" button to Educators landing page	2016-08-02 10:55:43 -04:00
Ray Schamp	a9039ca63b	Only redirect approved educators to My Classes Fixes #800	2016-08-02 10:52:47 -04:00
Ray Schamp	0e8e842eb2	Lint	2016-08-02 09:50:46 -04:00
Matthew Taylor	85377193a8	Merge pull request #796 from mewtaylor/isseu/gh-792 [Develop] Hotfix: Create space between paragraph elements	2016-08-02 09:37:27 -04:00
Matthew Taylor	5cbaabbe97	Merge pull request #791 from mewtaylor/hotfix/conference-livestream [Develop] Hotfix: Add hyperlink to keynote livstream for 2016 conf	2016-08-02 09:37:16 -04:00
Technoboy10	63c67a1d2d	use frameless.js for carousel breakpoints	2016-08-02 09:17:13 -04:00
Matthew Taylor	2e962c7831	Create space between paragraph elements Fixes #792	2016-08-01 14:21:27 -04:00
Ray Schamp	c842d06ac4	Add "Request Account" button to Educators landing	2016-08-01 12:19:29 -04:00
Ray Schamp	025958fc24	Add `align` prop to `SubNavigation` component	2016-08-01 12:18:25 -04:00
Matthew Taylor	00e6ad2ee1	Add hyperlink to keynote livstream for 2016 conf	2016-08-01 10:59:27 -04:00
Technoboy10	6b63f5b7ad	set image width to 100%	2016-07-29 17:37:24 -04:00
Matthew Taylor	4909d509d2	remove ie fallback to mobile styling it looks like @rschamp’s wodnerful `top` alignment fix for Chrome and Edge also helps here, from a test I did in IE11.	2016-07-28 15:46:56 -04:00
Matthew Taylor	d97bc193df	Remove unnecessary redefinitions These are already defined in the base, and are not overridden anywhere. Only redefine the things that were overridden.	2016-07-28 15:11:14 -04:00
Matthew Taylor	2c9df3237e	Fix gender input error alignment in IE11 Also re-apply the arrow styling on the organization checkbox group, since it appears to be aligned correctly.	2016-07-28 14:10:36 -04:00
Ray Schamp	e218cc5169	Move "select country" to general strings It's reused in the other registration views so doesn't belong in teacherregistration/l10n.json Fixes #783	2016-07-28 12:26:56 -04:00
Matthew Taylor	9e9ffc96e9	Merge pull request #779 from mewtaylor/issue/gh-773 Fix GH-[772,773]: Fix “afterschool” typo, default country and margin for username	2016-07-28 10:52:55 -04:00
Ray Schamp	7e8fddef18	Don't use a static width for inputs Fixes #769	2016-07-28 10:39:18 -04:00
Matthew Taylor	40fb433d7d	Make country choice a function that’s called And also default the country in address to the country in demographics. Thanks @rschamp @carljbowman!	2016-07-28 09:56:01 -04:00
Matthew Taylor	2650e6e148	Move countryOptions to the global scope thanks @rschamp!	2016-07-28 08:30:29 -04:00
Matthew Taylor	cf4a057278	Fix “afterschool” typo Also make default country selectable in the user demographic step, and fix the spacing with `Create a Username`	2016-07-27 23:33:45 -04:00
Ray Schamp	668f141457	Merge pull request #778 from rschamp/bugfix/chrome-52 Set common y-origin for validation bubbles	2016-07-27 20:17:32 -04:00
Ray Schamp	ecbbeb5612	Set common y-origin for validation bubbles I believe this will keep the misalignment from happening across browsers. Sets the top left corner to the top left corner of the input block. Resolves #770	2016-07-27 20:15:53 -04:00
Ray Schamp	19d67dc0b4	Resurrect old invite step design for new users	2016-07-27 19:32:08 -04:00
Technoboy10	2da07923ca	revert verbiage change as per IRL discussion with Carl	2016-07-27 15:49:48 -04:00
Ray Schamp	27a7b98ab9	Merge pull request #765 from rschamp/bugfix/752 Redesign invite step, add option to log out	2016-07-27 14:37:45 -04:00
Ray Schamp	89071b10d0	Lint	2016-07-27 14:12:55 -04:00
Ray Schamp	0b1f708400	Don't redirect to password reset on complete_registration	2016-07-27 10:27:31 -04:00
Ray Schamp	d1f73c3ef4	Redesign invite step, add option to log out Resolves #752	2016-07-27 10:24:37 -04:00
Technoboy10	26d314a5c1	undo weird merge thing that happened a while back	2016-07-27 09:54:07 -04:00
Technoboy10	5e7bf85733	remove redundant media query from footer.scss	2016-07-27 09:48:07 -04:00
Ray Schamp	2b1cf25f88	Merge pull request #763 from rschamp/bugfix/3878 Redirect students that must reset their password	2016-07-27 09:35:19 -04:00
Technoboy10	0d2416c850	fix merge conflicts	2016-07-27 09:33:15 -04:00
Technoboy10	90631b3054	remove dev file	2016-07-27 09:27:22 -04:00
Technoboy10	25402113bf	tweak a few things before WIP PR	2016-07-27 09:26:33 -04:00
Matthew Taylor	806fd25e46	Move to the view thanks @rschamp!	2016-07-26 17:03:41 -04:00
Ray Schamp	d83df730c8	Redirect students that must reset their password Fixes LLK/scratchr2#3878	2016-07-26 16:40:05 -04:00
Technoboy10	ae9c15f6ce	update with routes.json from develop branch	2016-07-26 15:51:05 -04:00
Matthew Taylor	60a62bb374	Redirect to `/educators/classes` if a confirmed teacher Fixes #757. Note: Because we are getting this info from the session, the redirect may not happen until the page is rendered first in cases where the connection is slow, or the db is slow.	2016-07-26 15:24:51 -04:00
Matthew Taylor	1c7dc73ed7	Merge pull request #753 from mewtaylor/issue/gh-749 Fix GH-749: Fix formatting for a few form elements	2016-07-26 11:42:13 -04:00
Technoboy10	2a5f330884	hide intro if not desktop width	2016-07-26 11:29:45 -04:00
Matthew Taylor	e87a2bce76	remove trailing whitespace	2016-07-26 11:24:51 -04:00
Technoboy10	a8b26b1a1c	experiment with removing content display from scss	2016-07-26 11:06:21 -04:00
Matthew Taylor	69ac5b60bd	make `.no-label` an auto assignment thanks @rschamp!	2016-07-26 10:44:19 -04:00
Matthew Taylor	b510d154df	remove ‘noformsy` option on inputs	2016-07-26 10:20:06 -04:00
Matthew Taylor	6787ae03ce	Apply classes to row, not textarea And move help rendering into the phone input row.	2016-07-26 08:06:38 -04:00
Ray Schamp	74f56d42c5	Explicitly show a spinner while loading class data To make this view work consistently with the complete registration view	2016-07-25 16:59:55 -04:00
Ray Schamp	4df4ea8930	Show an error to logged out users When logged out users visit the complete registration view, show them an error rather than a spinner.	2016-07-25 16:58:38 -04:00
Matthew Taylor	d8e07ee7f6	use `rowClassName` instead so that it can include `label`. Also add some default styling to `label` in `.row`. Thanks @rschamp!	2016-07-25 15:43:44 -04:00
Matthew Taylor	263d292b3c	Fix formatting for a few form elements and make use of the FRC `elementWrapperClassName`, since they way we did it before – custom `className` strings on the element – was not working. Fixes #749.	2016-07-25 13:21:28 -04:00
Ray Schamp	61e21f6b5b	Show an error if the API doesn't return class data Fixes #747. Also explicitly show a spinner when the component is waiting on the class API, and hide it when it returns.	2016-07-25 11:41:10 -04:00
Technoboy10	daf803d4a3	experiment with the react-responsive library	2016-07-25 10:53:57 -04:00
Technoboy10	188841c73c	layout reducer (needs work)	2016-07-22 14:57:47 -04:00
Technoboy10	808922b50d	pass layout to navbar and footer	2016-07-22 14:57:05 -04:00
Technoboy10	391344489d	footer mobile	2016-07-22 14:56:14 -04:00
Technoboy10	5b9cef8dd6	navbar mobile	2016-07-22 14:55:56 -04:00
Technoboy10	a9def9c1ae	tweak splash to not be terrible on mobile	2016-07-22 14:53:39 -04:00
Ray Schamp	62609cbc87	Collapse by beginning all routes with a common `^`	2016-07-22 12:38:24 -04:00
Ray Schamp	eba654c411	Collapse /classes routes to shorten condition	2016-07-22 12:21:42 -04:00
Ray Schamp	7455807591	Provide RegistrationError content as children This allows us to do more inline formatting, so we don't have any of that outside of `render`. Thanks @mewtaylor	2016-07-22 09:38:37 -04:00
Ray Schamp	be41d004ad	Show password by default	2016-07-21 21:08:07 -04:00
Ray Schamp	3335207c54	Update copy for password step	2016-07-21 21:08:07 -04:00
Ray Schamp	7e330bfb67	Redirect to student registration update view Previously requests to /session/ would return a signal to redirect, but we need /session/ to complete registration. So check if we should redirect when we retrieve the session. Also update this behavior for banned users.	2016-07-21 21:08:07 -04:00
Ray Schamp	a4dd1611d1	Add student registration update view	2016-07-21 21:08:06 -04:00
Ray Schamp	1df6eb5d2a	Update incorrect CSS class name	2016-07-21 21:08:06 -04:00
Ray Schamp	7a6e5c3eb4	Fix student registration localization Add missing strings, actually translate the content of the steps	2016-07-21 21:08:06 -04:00
Ray Schamp	8dae646ff3	Style tweaks	2016-07-21 20:44:51 -04:00
Ray Schamp	b06a9e49d0	Fix wording on student username step	2016-07-21 20:44:51 -04:00
Ray Schamp	9aa7e828b7	Remove "blank" classroom, show spinner instead It was broken due to a key error on `classroom.images` anyway	2016-07-21 20:44:51 -04:00
Ray Schamp	8038fbcdc1	Fix classroom API call	2016-07-21 18:10:41 -04:00
Andrew Sliwinski	74b26267d2	Merge pull request #741 from thisandagain/bugfix/740 Adjustments to the educators page as per feedback	2016-07-21 13:49:37 -04:00
Andrew Sliwinski	99c61ef0f7	Adjustments to the educators page as per feedback. Resolves GH-740	2016-07-21 13:43:35 -04:00
Matthew Taylor	859877c1ff	refresh session on successful registration This is needed to ensure that the approval step displays the correct “Wait for Approval” message. Fixes #698	2016-07-21 12:57:49 -04:00
Matthew Taylor	102de9a087	Merge branch 'develop' of https://github.com/LLK/scratch-www into issue/gh-715 * 'develop' of https://github.com/LLK/scratch-www: Pluralize example headlines on educators page Educator page language adjustments as per feedback. Resolves GH-734 fix typo Update image format for API change Fix lint errors, l10n issues revert irrelevant change Remove IE weird input additions, fallback to mobile error style on IE, fix some mobile error issues Update description of demographics step Add student registration flow Scope message strings more reusably Make registration styles reusable Parse with babel-eslint Fix whitespace # Conflicts: # src/l10n.json	2016-07-21 10:27:10 -04:00
Connor Hudson	6a58c7b2e6	Merge pull request #731 from technoboy10/ie-validation-fallback Fix GH-699: Fallback to mobile validation bubble on IE	2016-07-21 10:24:25 -04:00
Technoboy10	b88b8c83b1	redo responsive nav	2016-07-21 10:12:16 -04:00
Andrew Sliwinski	4f6c071c2c	Pluralize example headlines on educators page	2016-07-21 08:41:31 -04:00
Andrew Sliwinski	4d2f9d7a05	Educator page language adjustments as per feedback. Resolves GH-734	2016-07-20 17:53:02 -04:00
Technoboy10	3bbc17bb35	moved ie targeting to steps.scss	2016-07-20 17:29:34 -04:00
Technoboy10	22dc55c030	change verbiage, begin work on responsive nav/footer	2016-07-20 16:53:50 -04:00
Ray Schamp	d3f1046a42	Merge pull request #730 from rschamp/feature/3679-student-flow Add student registration flow	2016-07-20 15:57:47 -04:00
Technoboy10	74afd163b5	fix typo	2016-07-20 14:28:46 -04:00
Ray Schamp	754859f35f	Update image format for API change Removed default `image` field convention	2016-07-20 13:47:43 -04:00
Ray Schamp	a3b56dcbf1	Fix lint errors, l10n issues	2016-07-20 12:07:19 -04:00
Technoboy10	285c4c2d69	revert irrelevant change	2016-07-20 09:58:37 -04:00
Technoboy10	4e6efae667	Remove IE weird input additions, fallback to mobile error style on IE, fix some mobile error issues	2016-07-20 09:46:51 -04:00
Ray Schamp	6d5b7d3c02	Update description of demographics step	2016-07-19 22:58:50 -04:00
Matthew Taylor	90a4277a8a	Change copy for `Wait for Approval` Fixes #715	2016-07-19 16:54:38 -04:00
Ray Schamp	1c5940cc05	Add student registration flow	2016-07-19 16:51:28 -04:00
Ray Schamp	47ebef1b6f	Scope message strings more reusably	2016-07-19 16:51:10 -04:00
Ray Schamp	67ecb60f48	Make registration styles reusable	2016-07-19 16:49:12 -04:00
Ray Schamp	5b6a1fe8b9	Fix whitespace	2016-07-19 09:24:07 -04:00
Connor Hudson	637b1352cd	Merge pull request #727 from technoboy10/gh674-ie11-card-margin Fix GH-674: Waiting room cards should be centered in IE	2016-07-18 11:16:07 -04:00
Technoboy10	8c260032fa	card margin auto	2016-07-18 10:39:13 -04:00
Technoboy10	db049b871f	fix IE11 select background, indent issues	2016-07-18 10:17:22 -04:00
Matthew Taylor	7741cb2c7e	Merge pull request #685 from St19Galla/patch-1 Fix gh-684 - Changing error message	2016-07-12 19:04:16 -04:00
Matthew Taylor	6fd1d08d56	Merge pull request #720 from mewtaylor/issue/usernames-search [Develop] GH-710: only show username in search and explore	2016-07-11 20:21:58 -04:00
Matthew Taylor	27b5afddfb	Forgot search thanks @thisandagain!	2016-07-11 19:59:13 -04:00
Matthew Taylor	845ddb2966	only show username in search and explore fixes #710	2016-07-11 16:35:03 -04:00
Andrew Sliwinski	f8ee125bfe	Update job listings	2016-07-11 16:16:46 -04:00
Matthew Taylor	d8a0436525	Forgot a few	2016-07-11 11:09:15 -04:00
Matthew Taylor	87a0350b02	Allow urls with `ajax` to pass through Needed for https://github.com/LLK/scratchr2/pull/3804	2016-07-11 10:29:22 -04:00
Matthew Taylor	075f1481a2	Add custom validation for organization and phone It appears that the `required` field is not applied in the way we'd like it to be for the custom checkbox group and custom phone input fields, so do a `required` check on form submission. Additionally, this adds in a few style fixes. Fixes #695, #694, #693, #691	2016-07-07 16:56:51 -04:00
St19_Galla	ea6cd2ab2c	final fix	2016-07-07 14:18:16 -04:00
Matthew Taylor	7f466aacc6	Add language to search / explore api requests Fixes #686, thanks @thisandagain !	2016-07-07 08:38:10 -04:00
St19_Galla	16a985212c	alphanumeric only text fix	2016-07-06 21:20:46 -04:00
Technoboy10	717a2319b4	remove button, use div instead	2016-07-06 14:16:08 -04:00
Technoboy10	66c3a02340	default cursor on coming soon, make cards into links	2016-07-06 12:27:42 -04:00
Ray Schamp	b7c46f483e	Don't error on null children Was throwing a `TypeError` when child was null/undefined.	2016-07-05 15:48:21 -04:00
Ray Schamp	c50ac03a48	Merge pull request #671 from rschamp/bugfix/669 Disable default style for select elements in IE	2016-07-05 14:39:58 -04:00
Ray Schamp	edf0c1e475	Disable default style for select elements in IE Fixes #669	2016-07-05 14:39:08 -04:00
Matthew Taylor	9a037fda81	don't use `let` yet for variable definitions Fixes #670	2016-07-05 14:21:40 -04:00
Ray Schamp	6f9c16a7a5	Merge pull request #667 from rschamp/bugfix/647 Add style to general error messages	2016-07-05 14:18:49 -04:00
Matthew Taylor	0d23964771	Merge pull request #664 from mewtaylor/issue/gh-628-focusout Fix GH-628: Add box shadow for focus state on checkboxes	2016-07-05 14:02:51 -04:00
Matthew Taylor	aa3cbe552a	Make category options into key/value so that we can store the query string with the tab name, since it's not the same in every instance. fixes #666, and makes a couple other style tweaks.	2016-07-05 13:38:51 -04:00
Ray Schamp	d990dee755	Move location of the general error message From review of the style with @carljbowman Requires a bit of magic, where the Form component manually adds the "all" value. But without a major overhaul of the validation system, I don't see how else to put the general error among the other fields.	2016-07-05 12:06:10 -04:00
Ray Schamp	b15b5b8614	Add style to general error messages Resolves #647	2016-07-05 12:03:27 -04:00
Matthew Taylor	2cd8019ef6	Add box shadow for focus state on checkboxes Fixes #628 by applying the same outline for focus as is currently applied to checked boxes.	2016-07-05 11:39:06 -04:00
Ray Schamp	11155c429e	Merge pull request #661 from rschamp/bugfix/654 Fix JSON response parsing in IE	2016-07-04 09:23:28 -04:00
Ray Schamp	b89d644573	Fix JSON response parsing in IE Fixes #654 IE does not honor responseType: 'json', and will not parse responses as JSON unless json data is present in the request. For some reason this issue can also be solved by including a `json` attribute on the xhr request, but if that's present, url encoded form data is overwritten with the contents of the json. So just try to parse the response ourselves if it looks like it wasn't parsed. See https://github.com/Raynos/xhr/issues/123	2016-07-03 15:54:58 -04:00
Ray Schamp	7fe82c11be	Get rid of most splash warnings in development	2016-07-03 14:49:01 -04:00
Ray Schamp	c25852b3c6	Merge pull request #657 from rschamp/bugfix/645 Revalidate address step after invalid submissions	2016-07-01 13:48:13 -04:00
Ray Schamp	a56f994886	Revalidate address step after invalid submissions I don't like that the state is being set to a calculation of existing props. When I did that calculation in `render`, it didn't update when fields were changed. Fixes #645	2016-07-01 11:43:18 -04:00
Connor Hudson	d432282ff4	Merge pull request #652 from technoboy10/gh649-z-index-weirdness Fix GH-649: Dropdown hidden by TED Talk	2016-07-01 08:40:54 -04:00
Technoboy10	2206cb97f6	message icon tweak	2016-06-30 19:17:53 -04:00
Technoboy10	42c000d14f	orangify this	2016-06-30 18:06:17 -04:00
Matthew Taylor	6db426a586	Use empty default object Looks as if the having one of these objects as the default causes overwriting in some way, as opposed to augmentation. Have the source object be an empty one, so that it gets the attributes of both defaults and props. Fixes #642.	2016-06-30 16:52:46 -04:00
Technoboy10	5e5c2a4f9d	Remove z-index as it wasn't needed	2016-06-30 16:46:44 -04:00
Ray Schamp	5b288e4d3e	Merge pull request #648 from rschamp/feature/username-clarity Clarify username field is not for logging in	2016-06-30 16:17:14 -04:00
Ray Schamp	0816b0ec0f	Clarify username field is not for logging in	2016-06-30 16:16:31 -04:00
Connor Hudson	7f3af0f8be	Merge pull request #639 from technoboy10/gh637-relativepaths Fix GH-637: Make links to help and tips window relative	2016-06-30 15:57:43 -04:00
Ray Schamp	a0a82ef5a7	Merge pull request #646 from rschamp/bugfix/608 Fix localization of address validation message	2016-06-30 15:55:26 -04:00
Ray Schamp	554e21cd15	Fix localization of address validation message Fixes #608	2016-06-30 15:54:32 -04:00
Matthew Taylor	5cc6eb3ecb	use empty string if no cookie value found redux doesn't like getting null values for actions, so give empty ones /cc @rschamp	2016-06-30 15:29:53 -04:00
Matthew Taylor	300831c1e1	Merge pull request #641 from mewtaylor/issue/gh-636-tfaq-link Fix GH-636: point landing page to teacher faq page	2016-06-30 13:48:57 -04:00
Matthew Taylor	2017e1573d	point landing page to teacher faq page Fixes #636	2016-06-30 13:37:12 -04:00
Matthew Taylor	04aa7e01ef	check for the null value in `get` thanks @rschamp!	2016-06-30 11:40:05 -04:00
Matthew Taylor	794c3e2cba	Set null contents to null instead of error throw Before, if a cookie didn't exist, it would throw an error, not causing permissions/tokens to change to empty values. This fixes that (and #626) by setting the value to undefined instead.	2016-06-30 11:27:46 -04:00
Technoboy10	b5bf0298d7	Make s.m.e links relative	2016-06-30 10:06:10 -04:00
Technoboy10	088eb7cc66	inherit width on iframe	2016-06-30 09:46:39 -04:00
Technoboy10	b0f0bce211	enable fullscreen, fix border radius and aspect ratio	2016-06-30 09:43:24 -04:00
Matthew Taylor	f2b8e9025d	switch ordering in defaults This was assigning `props` to defaults, rather than the other way around. Fixes #618.	2016-06-30 08:00:40 -04:00
Matthew Taylor	b874d05bda	Override devault input style for login so that it looks like it used to, and not to tall. Fixes #618.	2016-06-29 14:54:00 -04:00
Matthew Taylor	9fb6170569	style error-step like last-step Since they're both mostly info cards. Fixes #627.	2016-06-29 14:08:16 -04:00
Connor Hudson	9bafdf6067	Merge pull request #619 from technoboy10/darken-dropdown Darken Account Nav Link when Menu Open	2016-06-29 13:31:27 -04:00
Technoboy10	41d9b1f526	use classNames before return	2016-06-29 13:24:37 -04:00
Matthew Taylor	8f60b020cb	fix educator faq link `info` is not in there anymore	2016-06-29 12:35:53 -04:00
Matthew Taylor	19bbd5ae7b	Link icon to splash page fixes #623	2016-06-29 10:53:55 -04:00
Connor Hudson	42ccc6c0a0	Merge pull request #622 from technoboy10/gh620-coming-soon Fix GH-620: Replace "Request account" with "Coming Soon"	2016-06-29 10:41:28 -04:00
Technoboy10	ce4069fdb1	tweak padding	2016-06-29 09:56:15 -04:00
Technoboy10	db039739dd	change request account button to coming soon	2016-06-29 09:51:23 -04:00
Connor Hudson	221170a9ff	Merge pull request #616 from technoboy10/gh537-dropdown-gap Fix GH-537: Logged-in user dropdown gap	2016-06-29 08:58:16 -04:00
Technoboy10	52d834c3fa	darken account nav link when menu open	2016-06-28 21:10:33 -04:00
Matthew Taylor	7bb52c25fe	move permissions checks to mirror session more thanks @rschamp!	2016-06-28 14:25:11 -04:00
Technoboy10	c4a98c5571	close gap, use border-box for box-sizing	2016-06-28 13:50:58 -04:00
Matthew Taylor	f2310170b2	Add permissions dispatch for `WillReceiveProps` We still need `componentWillMount` to handle the initial render for a logged in teacher first visting the page. Fixes issue in which a teacher would not see the banner immediately after dynamic login.	2016-06-28 13:30:36 -04:00
Matthew Taylor	16fe86b2fd	Fix scratch ed links they are not domain agnostic. fyi @rschamp	2016-06-28 08:35:01 -04:00
Matthew Taylor	c5f85022f3	Copy edits for conference site	2016-06-28 07:51:49 -04:00
Matthew Taylor	91de6f7912	Merge pull request #614 from mewtaylor/issue/gh-611-teacher-banner Fix GH-611: Connect `TeacherBanner` to redux	2016-06-27 22:40:13 -04:00
Technoboy10	5f62e5ffaf	scoping tweak	2016-06-24 11:42:35 -04:00
Matthew Taylor	c4a365a0e8	Connect `TeacherBanner` to redux whoops! Thanks @rschamp. Fixes #611	2016-06-24 11:40:50 -04:00
Technoboy10	172dd3cd62	set the size of the language chooser	2016-06-24 11:34:11 -04:00
Matthew Taylor	ef881a07f9	Merge pull request #610 from mewtaylor/cleanup/teacher-styling styling cleanup for teacher registration	2016-06-24 11:25:25 -04:00
Connor Hudson	49edaf0247	Merge pull request #609 from technoboy10/gh605-language-dropdown-state Fix GH-605: Make languagechooser keep locale state	2016-06-24 11:22:54 -04:00
Matthew Taylor	97516b1e1d	styling cleanup for teacher registration some scoping, as well as class labeling	2016-06-24 11:19:41 -04:00
Technoboy10	93054cf393	change from defaultValue to value because of formsy	2016-06-24 11:13:05 -04:00
Connor Hudson	5724a4c609	Merge pull request #606 from technoboy10/gh604-localize-educator-landing Fix GH-604: Localize Educator Landing Page	2016-06-24 10:51:34 -04:00
Technoboy10	0277b96698	move teacher accounts string to general	2016-06-24 10:39:55 -04:00
Technoboy10	3d18f04a43	localize educator landing page	2016-06-24 10:05:44 -04:00
Matthew Taylor	633fee162a	Merge pull request #603 from TheGrits/patch-2 Fix gh-602: Remove Community Counselor	2016-06-24 08:58:10 -04:00
Connor Hudson	5cb46b1579	Merge pull request #601 from technoboy10/educator-landing Fix GH-311: Educator landing page	2016-06-24 08:21:02 -04:00
Matthew Taylor	ebf45c6f1d	Fix linting errors Signed-off-by: Connor Hudson <technoboy10@fake.email>	2016-06-24 08:13:32 -04:00
Matthew Taylor	92883d3cbe	swap logos in conference footer	2016-06-23 22:46:11 -04:00
The_Grits	f233f660b0	Fix gh-602: Remove Community Counselor	2016-06-23 18:28:24 -04:00
Connor Hudson	1da0978029	routes.json	2016-06-23 17:26:28 -04:00
Connor Hudson	53eb56c1df	style tweaks	2016-06-23 17:23:35 -04:00
Matthew Taylor	e71aff5df1	Merge pull request #594 from St19Galla/develop Navbar issues; :hover	2016-06-23 17:20:44 -04:00
St19_Galla	49f6a6bee2	Update navigation.scss Changed padding rather than height	2016-06-23 17:06:40 -04:00
Matthew Taylor	74bd2b3255	Merge pull request #599 from mewtaylor/feature/teacher-registration-flow [Updates] Teacher registration flow	2016-06-23 16:48:58 -04:00
Connor Hudson	7de13d029b	get rid of carousel, make things centered if they need it	2016-06-23 15:46:02 -04:00
Matthew Taylor	0c1abada3a	Small tweaks 1. left-align form elements even in mobile 2. Bolden input labels, except for checkboxes and radio elements /cc @carljbowman	2016-06-23 15:44:14 -04:00
Andrew Sliwinski	89f8434d71	Move GA tracking code into page head	2016-06-23 15:34:47 -04:00
Matthew Taylor	6aeee284bc	style waiting room also "deep purple" :)	2016-06-23 15:25:22 -04:00
Matthew Taylor	86a8f94919	some code formatting tweaks	2016-06-23 15:10:51 -04:00
Matthew Taylor	10f154ca10	accidentally took this out	2016-06-23 15:10:41 -04:00
Matthew Taylor	f00aedd17e	linter error	2016-06-23 14:27:42 -04:00
Matthew Taylor	1a08e7ae49	Finalize styling for registration flow /cc @carljbowman One issue we ran into is that our `frameless` configuration is in `em` rather than `rem`, making it difficult to have an aboslute grid applied uniformly at all hierarchies. For now, we're using straight `rem` calculations instead of `$cols{1,8}` in the styling until we can refactor `frameless` to use `em`.	2016-06-23 14:06:36 -04:00
Connor Hudson	6d3d8b7446	more styling	2016-06-23 13:48:18 -04:00
Connor Hudson	c52a6e16e9	attempted mobile styling	2016-06-23 13:18:45 -04:00
Matthew Taylor	1910d38bc6	Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow * 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www: Add teacher waiting room view Only pass necessary props to steps # Conflicts: # src/components/registration/steps.jsx # src/views/teacherregistration/teacherregistration.jsx	2016-06-23 07:35:06 -04:00
Matthew Taylor	8fb16bf397	Add formatting for teacher reg flow	2016-06-23 07:27:43 -04:00
Connor Hudson	3624e18e08	inherit line height, remove margin	2016-06-22 16:58:58 -04:00
Connor Hudson	230cadffa5	more styling, carousel	2016-06-22 16:48:58 -04:00
Ray Schamp	93ed60cd0d	Add teacher waiting room view	2016-06-22 13:35:38 -04:00
Connor Hudson	9c14f7cb3f	create landing page	2016-06-22 13:18:19 -04:00
St19_Galla	ab2dc47921	Update navigation.scss	2016-06-22 11:22:30 -04:00
Ray Schamp	de8ac6c56a	Only pass necessary props to steps Rather than lazily including all form progress to every step, just give each step what it needs.	2016-06-21 18:45:41 -04:00
carljbowman	ee8d6bf0c5	Update Jobs page - Add 'Web Designer' position - Adjusted typography to match new Type Standards - Add Hex Value to Colors for consistency	2016-06-21 15:00:51 -04:00
Matthew Taylor	9d6fb63d18	Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow * 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www: (46 commits) Add serverside email validation Clean up Move registration step to main component Submit the rest of the fields when registering This help text is redundant now Fix organization "other" field enablement Get the form creating regular accounts Add method to api for submitting forms Update language chooser for formsy Add missing string Add progress indicators Style pass Remove unused label component Remove unused mixin factory Fixup api refactor Add serverside username validation L10n pass Explain the GeneralError component Add help text when a field is not required L10n WIP ... # Conflicts: # src/l10n.json # src/views/splash/splash.jsx	2016-06-17 15:32:49 -04:00
Connor Hudson	5d12e5773d	Merge pull request #584 from technoboy10/gh554-localize-faq Fix GH-554: Localize FAQ title	2016-06-17 14:47:46 -04:00
Matthew Taylor	b337b47590	Merge pull request #586 from mewtaylor/issue/conference-updates Fix GH-[571,563] – updates to the conference site	2016-06-17 14:14:53 -04:00
Ray Schamp	bf76e88ca2	Add serverside email validation	2016-06-17 13:01:53 -04:00
Ray Schamp	11b9876930	Clean up	2016-06-17 12:22:29 -04:00
Ray Schamp	078463ac25	Move registration step to main component Add a placeholder error step	2016-06-17 12:22:11 -04:00
Ray Schamp	8646bd84b3	Submit the rest of the fields when registering	2016-06-17 11:01:34 -04:00
Ray Schamp	532a1cce57	This help text is redundant now	2016-06-17 11:01:10 -04:00
Ray Schamp	ad5da0f543	Fix organization "other" field enablement	2016-06-17 11:00:48 -04:00
Matthew Taylor	f0b178c290	Merge pull request #583 from mewtaylor/issue/gh-541-faq-schools Fix GH-541: Add "schools" section to faq	2016-06-17 09:39:41 -04:00
Ray Schamp	d7ca0166ab	Get the form creating regular accounts	2016-06-16 17:25:14 -04:00
Ray Schamp	26e1ee553b	Add method to api for submitting forms Some of our legacy endpoints expect this style rather than json. Also clean up the way useCsrf works — don't always set json attribute to an empty object.	2016-06-16 17:24:31 -04:00
Matthew Taylor	32e9b089c5	updates to the conference site 1. new collaborators 2. new sold out language 3. some copy edits	2016-06-16 17:07:22 -04:00
Ray Schamp	d27b0a2433	Update language chooser for formsy	2016-06-16 16:31:13 -04:00
Ray Schamp	9a3b83f8c6	Add missing string	2016-06-16 16:30:59 -04:00
Connor Hudson	1e571d0e2d	localize FAQ title	2016-06-16 15:11:43 -04:00
Matthew Taylor	f5cbdfa2c9	Merge pull request #582 from mewtaylor/issue/teacher-faq Add teacher faq page	2016-06-16 11:31:29 -04:00
Connor Hudson	c188a268e2	Merge pull request #568 from TheGrits/patch-1 Fix gh-555: Squished News Icons	2016-06-16 11:17:44 -04:00
Ray Schamp	e062096445	Add progress indicators	2016-06-16 10:54:36 -04:00
Matthew Taylor	b13a388425	Fix typo thanks @technoboy10!	2016-06-16 10:54:35 -04:00
Matthew Taylor	8ef3acd5d9	Merge pull request #560 from mewtaylor/issue/gh-556-footer Fix GH-556: Add "For Developers" to the footer	2016-06-16 10:28:19 -04:00
Matthew Taylor	098bc8618a	Merge pull request #577 from mewtaylor/issue/gh-573-grid-align Fix GH-573: center align grid while left aligning projects	2016-06-16 10:24:53 -04:00
Matthew Taylor	b828200e94	add teacher faq page	2016-06-16 10:22:37 -04:00
Matthew Taylor	2ea2cfa6c5	Add "schools" section to faq	2016-06-15 15:22:41 -04:00
Ray Schamp	1fba322d01	Style pass	2016-06-15 15:08:56 -04:00
Matthew Taylor	626b3f008e	Merge branch 'develop' of https://github.com/LLK/scratch-www into issue/gh-543-teacher-banner * 'develop' of https://github.com/LLK/scratch-www: (29 commits) Add explore redirects Allow access to 2014 and 2015 pages use route aliases for generalizable route patterns remove `/components` from `routes.json` Remove Make it Fly banner Fix issues in FAQ of /developers page. move shuffle to utility module fix error with shuffleArray function add shuffleArray function, shuffle most loved and most remixed use `image` to get studio thumbnail quick formatting fix for box header on search Fix merge issue Add localizations, minor style changes Removed rows from grid, changed explore tabs Removed extraneous image file Whitespace added Small fix Support for studios Refactoring, new grid component Style changes ... # Conflicts: # src/views/splash/splash.jsx # src/views/splash/splash.scss	2016-06-15 09:45:05 -04:00
Matthew Taylor	2193914650	center align grid while left aligning projects Fixes #573	2016-06-15 09:34:15 -04:00
Matthew Taylor	311f431ca1	Add explore redirects for `/explore`, `/explore/projects` and `/explore/studios` to `/explore/<projects\|studios>/all`	2016-06-15 08:19:27 -04:00
Ray Schamp	fb57c25afd	Remove unused label component	2016-06-14 17:47:56 -04:00
Ray Schamp	333d52d2b6	Remove unused mixin factory	2016-06-14 17:41:12 -04:00
Ray Schamp	dffea48299	Fixup api refactor Updates after a rebase	2016-06-14 17:33:54 -04:00
Ray Schamp	8da8ab4100	Add serverside username validation With this we get cleanspeak for free	2016-06-14 17:29:31 -04:00
Ray Schamp	8dac67f292	L10n pass	2016-06-14 17:29:31 -04:00
Ray Schamp	97c4e9beb9	Explain the GeneralError component	2016-06-14 17:29:31 -04:00
Ray Schamp	f74a078afb	Add help text when a field is not required Most of our fields are required, so it makes more sense to display help when they are optional than to asterisk every required field	2016-06-14 17:29:31 -04:00
Ray Schamp	667ff08a36	L10n WIP	2016-06-14 17:29:31 -04:00
Ray Schamp	ce007d64f8	Change password confirmation to "show password"	2016-06-14 17:29:30 -04:00
Ray Schamp	4e0d54df98	Split up concerns of form progression and display Still thinking of a good name for the form "card" component...	2016-06-14 17:29:30 -04:00
Ray Schamp	da2a4ce48c	Add bot honeypot	2016-06-14 17:29:30 -04:00
Ray Schamp	cfa85427b1	Add address validation	2016-06-14 17:29:30 -04:00
Ray Schamp	f8037f6767	Lint	2016-06-14 17:29:30 -04:00
Ray Schamp	d7df1e980f	Move api mixin to lib, remove mixin The mixin doesn't gain us anything except complexity	2016-06-14 17:29:30 -04:00
Ray Schamp	56e16bc0dc	Actually provide every state in world choice	2016-06-14 17:29:30 -04:00
Ray Schamp	0512b614be	Fixup use iso	2016-06-14 17:29:29 -04:00
Ray Schamp	0206a4da9d	Lint	2016-06-14 17:29:29 -04:00
Ray Schamp	f126a71336	Use iso-31660-2 package for country data	2016-06-14 17:29:29 -04:00
Ray Schamp	9da2bb29a8	Base phone and address country on user country	2016-06-14 17:29:29 -04:00
Ray Schamp	3ea1c64184	Split out steps from the view	2016-06-14 17:29:29 -04:00
Ray Schamp	0f3485534b	Organize form data into objects	2016-06-14 17:29:29 -04:00
Ray Schamp	fe74208f32	Add international phone validation	2016-06-14 17:29:29 -04:00
Ray Schamp	bcda082014	Add validation to the rest of the form	2016-06-14 17:29:29 -04:00
Ray Schamp	175a71711d	Update existing forms on the site to use formsy Or not in the case of the search form	2016-06-14 17:29:29 -04:00
Ray Schamp	b5c615b1fa	Use formsy-react for validation Complete validation for username/password form (except for checking if a username exists).	2016-06-14 17:27:53 -04:00
Ray Schamp	de3151924c	Lint	2016-06-14 17:27:53 -04:00
Ray Schamp	1eaf6effcc	Tiny bit of style	2016-06-14 17:27:53 -04:00
Ray Schamp	04c8650512	Allow other types other than form in FormStep	2016-06-14 17:27:53 -04:00
Ray Schamp	2ca846f826	Use Scratch components for the form and clean up	2016-06-14 17:27:52 -04:00
Ray Schamp	350a573fc5	Move formset into forms	2016-06-14 17:27:52 -04:00
Ray Schamp	17a3f1ebcb	Add initial form data	2016-06-14 17:27:52 -04:00
Ray Schamp	68d49a84dc	Update FormSet to advance steps onSubmit	2016-06-14 17:27:52 -04:00
Ray Schamp	144d6e3754	wip	2016-06-14 17:27:52 -04:00
Ray Schamp	a080b2b64f	wip	2016-06-14 17:27:52 -04:00
Matthew Taylor	60187d4a75	Allow access to 2014 and 2015 pages	2016-06-14 12:42:13 -04:00
Matthew Taylor	dfc4f9574d	use route aliases for generalizable route patterns 1. match all `^/explore` to www 2. match all `^/search` to www 3. match all `^/conference` to www	2016-06-14 11:28:20 -04:00
Matthew Taylor	45d78b9c7c	remove `/components` from `routes.json` It's a dev-only route, and is in `dev-routes.json` already	2016-06-14 11:26:17 -04:00
The_Grits	1785c767b4	whoops	2016-06-13 15:37:31 -04:00
The_Grits	554dcb100c	Fix gh-555: Squished News Icons	2016-06-13 15:06:41 -04:00
Ray Schamp	01b662f77f	Merge pull request #567 from rschamp/hotfix/remove-banner [Develop] Remove Make it Fly banner	2016-06-13 14:43:37 -04:00
Ray Schamp	e2dcd6c647	Remove Make it Fly banner This reverts commit `7cf3846231`, reversing changes made to `afe14ebe88`.	2016-06-13 14:35:08 -04:00
Andrew Sliwinski	e05572dc0a	Fix issues in FAQ of /developers page.	2016-06-13 11:38:11 -04:00
Matthew Taylor	e04b314656	remove dashes Thanks @rschamp!	2016-06-13 10:07:00 -04:00
Matthew Taylor	5b73c4192d	change name to `getUnsignedValue` thanks @rschamp!	2016-06-13 10:06:43 -04:00
Matthew Taylor	0c2a73a910	Don't use dash in name It's used for grouping in `build-locales`.	2016-06-13 09:41:12 -04:00
Connor Hudson	fde193ca06	move shuffle to utility module	2016-06-13 09:40:32 -04:00
Matthew Taylor	e5f274933b	Add final copy for teacher account banner	2016-06-13 07:47:43 -04:00
Connor Hudson	3d6a95e84b	fix error with shuffleArray function	2016-06-09 17:33:49 -04:00
Connor Hudson	04166ab423	add shuffleArray function, shuffle most loved and most remixed	2016-06-09 17:22:31 -04:00
Matthew Taylor	e5467e5f45	Add "For Developers" to the footer Fixes #556	2016-06-09 11:54:14 -04:00
Matthew Taylor	ef0037942e	use `image` to get studio thumbnail same as with `project`	2016-06-09 09:44:09 -04:00
Matthew Taylor	b065ed5254	quick formatting fix for box header on search	2016-06-09 07:57:41 -04:00
Matthew Taylor	365c3d0bad	Fix merge issue	2016-06-09 07:44:28 -04:00
Matthew Taylor	9fad938eb8	Add localizations, minor style changes	2016-06-09 07:32:25 -04:00
Matthew Taylor	ac17850491	Add teacher banner to splash page This only shows if the logged in user is a teacher, and persists for teachers.	2016-06-08 13:47:11 -04:00
Matthew Taylor	0894724dfd	Merge branch 'develop' of https://github.com/rthorn/scratch-www into feature/explore-from-rthorn * 'develop' of https://github.com/rthorn/scratch-www: Removed rows from grid, changed explore tabs Removed extraneous image file Whitespace added Small fix Support for studios Refactoring, new grid component Style changes Changed path of search page to allow for studio tabs Changes to path for search results Removed unnecessary files Search page functions Starting mock of search page Fixed problem with loading Load button and tabs functioning Merge remote-tracking branch 'LLK/develop' into develop Early Explore Page # Conflicts: # src/components/navigation/www/navigation.jsx	2016-06-07 09:06:01 -04:00
Matthew Taylor	bf1fa2934d	Merge pull request #552 from mewtaylor/bugfix/mobile-nav-conference [Develop] hotfix: mobile nav conference	2016-06-06 11:01:12 -04:00
Connor Hudson	8022d76aaa	Merge pull request #553 from technoboy10/gh548-signout Fix GH-548: Sign out should take effect before reload	2016-06-06 09:06:36 -04:00
Connor Hudson	75ce6378a2	remove comment	2016-06-06 08:46:28 -04:00
Connor Hudson	9c66939bc3	use defaults instead of defaultsDeep	2016-06-06 08:45:35 -04:00
Matthew Taylor	fb4464d0d4	Correction for Nichole Pinkard's name on `/expect` Apologies for the copy error!	2016-06-06 08:32:48 -04:00
Matthew Taylor	fce41dc32e	use `row wrap` instead of columns apparently mobile doesn't like columns as much as row wrap for flexbox.	2016-06-06 08:29:51 -04:00
Matthew Taylor	bcec3d8fc6	Merge pull request #549 from mewtaylor/bugfix/conference-schedule [Develop] Hotfix: conference schedule bug fixes	2016-06-03 19:52:16 -04:00
Matthew Taylor	c8f6c36b1f	Fix schedule formatting 1. Sort schedule by 24-hour time to handle 12-o-clock 2. Sort chunks by type AND time, since multiple chunks have the same name	2016-06-03 19:43:53 -04:00
Connor Hudson	5bd1f4f2ac	add container div to fix dmca	2016-06-03 15:02:55 -04:00
Connor Hudson	245c9cbe4f	Merge pull request #542 from technoboy10/gh307-newstatic Fix GH-307: Restyle FAQ and legal pages	2016-06-03 14:31:08 -04:00
Technoboy10	acea4f4df1	move imports into .information-page	2016-06-03 14:16:17 -04:00
Technoboy10	fea1fc611f	restrict styles to only informationpage element	2016-06-03 14:14:45 -04:00
Technoboy10	9853f5ba5a	Move all styling into the InformationPage component	2016-06-03 14:02:29 -04:00
Connor Hudson	86e4dd6ce8	Another results -> session fix	2016-06-02 10:04:54 -04:00
Connor Hudson	292a9773fc	fix session.js	2016-06-01 17:23:19 -04:00
Connor Hudson	f280d1d8df	Remove quotes around keys, results -> session	2016-06-01 17:22:11 -04:00
Connor Hudson	11621564f6	why hello there, travis	2016-06-01 17:11:18 -04:00
Connor Hudson	6f39466d9f	Reduxified	2016-06-01 17:07:21 -04:00
Connor Hudson	fd1401fe1b	used stricter comparison	2016-06-01 16:14:58 -04:00
Connor Hudson	4d65d478ed	change to more extensible session	2016-06-01 15:28:18 -04:00
Connor Hudson	00ac15d475	add test, tweak terms	2016-06-01 12:05:03 -04:00
Connor Hudson	1178a50beb	restyle all the things	2016-06-01 11:57:50 -04:00
Connor Hudson	10a4dc656e	fix travis	2016-06-01 10:49:59 -04:00
Connor Hudson	e402363576	initial pass	2016-05-31 16:37:42 -04:00
Ray Schamp	7fb512f4a8	Merge pull request #531 from rschamp/feature/cn-banner [Develop] Homepage module	2016-05-31 12:25:16 -04:00
Ray Schamp	3632f3dc1d	Merge branch 'release/2.2.9' into develop	2016-05-31 12:24:21 -04:00
Ray Schamp	7cf3846231	Merge pull request #530 from rschamp/feature/cn-banner [Master] Homepage module	2016-05-31 10:18:20 -04:00
Ray Schamp	89bdeff631	Don't break up navigation on mobile	2016-05-31 09:32:04 -04:00
Ray Schamp	0335fe1275	Merge pull request #516 from rschamp/upgrade/react-15 Upgrade to React 15	2016-05-31 09:23:49 -04:00
Matthew Taylor	932dab40c7	Some additional mobile changes	2016-05-29 11:59:53 -04:00
Matthew Taylor	6eeebe05c3	Merge pull request #525 from mewtaylor/issue/conference-tweaks For GH-497: conference tweaks for fallout from schedule/typography	2016-05-27 16:40:39 -04:00
Matthew Taylor	ad1e723188	Drop the text below the button thanks @carljbowman!	2016-05-27 16:35:23 -04:00
Matthew Taylor	011032308c	Consolidate text thanks @carljbowman !	2016-05-27 16:19:51 -04:00
Matthew Taylor	c351d54e9b	fix lint warning thanks @rschamp!	2016-05-27 16:02:38 -04:00
Matthew Taylor	74ac6e52bb	conference formatting tweaks for mobile thanks @carljbowman!	2016-05-27 15:55:27 -04:00
Matthew Taylor	b07b61c925	Update conference to reflect being sold out	2016-05-27 15:55:08 -04:00
Ray Schamp	45abaff962	Fix account links on Privacy Policy page	2016-05-27 14:33:12 -04:00
Ray Schamp	992f6d7481	Update footer and nav styles per @carljbowman	2016-05-27 12:02:22 -04:00
Ray Schamp	986341341b	Fix line height and wrapping on splash components	2016-05-27 11:46:35 -04:00
The_Grits	4f75713bd5	Update privacypolicy.jsx	2016-05-27 09:56:56 -04:00
Connor Hudson	a4f15f4ec8	Merge pull request #510 from technoboy10/gh507-scheduleanchor Fix gh-507: Consistently change URI	2016-05-26 16:59:44 -04:00
Connor Hudson	59f4d303c6	Merge pull request #512 from TheGrits/patch-1 Fix gh-29: Migrate Terms of Use	2016-05-26 16:15:21 -04:00
Ray Schamp	2a01ebee84	Fix search button display Update search form submit button from an input[type=submit] to a button. React 15 omits the value prop if it's blank, so the `<input type="submit" value="">` was rendered as `<input type="submit">`. This caused the input to display the default value of "Submit". The button element is more appropriate for this behavior and doesn't have the missing value issue.	2016-05-26 16:00:28 -04:00
Ray Schamp	c966f8a0ba	Fix modal layout The styles in the upgraded react-modal broke our centering. The auto-focusing on the modal made an annoying blue border around it in Chrome.	2016-05-26 16:00:28 -04:00
Ray Schamp	fe08f8c18f	Update final graphic	2016-05-26 14:38:56 -04:00
Ray Schamp	18bb2357c6	Update final copy and links	2016-05-26 14:10:59 -04:00
The_Grits	62f8978edc	Update route	2016-05-26 11:31:54 -04:00
The_Grits	f3fafb7b3a	Rename and Update	2016-05-26 11:31:16 -04:00
The_Grits	9bd63bd11a	Spacing	2016-05-26 11:23:17 -04:00
Ray Schamp	d1f675374b	Localize banner	2016-05-24 17:30:48 -04:00
Ray Schamp	a0a30155af	Hide components route in production	2016-05-24 17:15:03 -04:00
Ray Schamp	448bb8aa3f	Add Power Puff Girls banner	2016-05-24 17:14:12 -04:00
Matthew Taylor	87ce6db1cd	generalize pdf check thanks @rschamp! fyi, I left it in cards only because I'm not sure that we really do this `(English)` thing anywhere else.	2016-05-24 14:27:16 -04:00
Matthew Taylor	ffc1e8d0ca	Fix pdf localization check It was adding the `(English)` suffix no matter what. This fixes it by getting the locale from props, and also by making the conditional check a bit more safe.	2016-05-24 13:09:34 -04:00
The_Grits	7948c8bbc4	Hello Travis	2016-05-24 10:21:19 -04:00
The_Grits	ac96ffc6f6	Squash and Merge	2016-05-24 10:05:17 -04:00
Connor Hudson	e73b26b686	fix spacing issues Fixes Travis testing	2016-05-23 15:35:05 -04:00
Technoboy10	a3fda6be30	use single quotes to appease travis	2016-05-23 14:28:34 -04:00
Technoboy10	6bddc8d2d3	replace anchor when schedule day clicked	2016-05-23 14:10:09 -04:00
Technoboy10	0b6b81e1f1	Merge branch 'release/2.2.9' of https://github.com/llk/scratch-www into release/2.2.9	2016-05-23 10:48:29 -04:00
Technoboy10	b020964ef4	add media query to center links	2016-05-23 10:48:11 -04:00
Connor Hudson	173a7bc52a	Merge pull request #508 from technoboy10/gh505-schedulebackground Fix gh-505: Incorrect time header background	2016-05-23 10:25:02 -04:00
Technoboy10	7bb9c622c7	set time headers to correct color	2016-05-23 10:10:31 -04:00
The_Grits	e41f8b8635	Footer Press link	2016-05-20 12:05:22 -04:00
Matthew Taylor	a477be4814	Some more cleanup 1. typo with splitting token/session out 2. redefine `chunk` as `timeSlot` 3. move timeSlot sorting into its own method	2016-05-19 17:37:51 -04:00
Matthew Taylor	337b6dcfca	fix lint warnings	2016-05-19 17:02:21 -04:00
Matthew Taylor	a860b27941	Some updates to the redux structure 1. split `auth.js` up so it's 1 reducer per file 2. consolidate the conference schedule reducers 3. make conference reducer names more descriptive 4. add error handling for `body === 'undefined'` Thanks @rschamp for all the help!	2016-05-19 16:55:25 -04:00
Matthew Taylor	bca90bd835	Add icons for schedule/details from @carljbowman	2016-05-19 16:40:30 -04:00
Matthew Taylor	d69de477a1	Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/conference-schedule * 'develop' of https://github.com/LLK/scratch-www: (32 commits) Lint Bundle all locale data Don't bundle polyfills Set up Raven within init.js Prefix privacyPolicy message string Exclude minified javascript from linting One space more Changes "interfacesto" to "interfaces to" Remove tag target Filter before mapping to avoid returning undefined Fix Pass condition for "static" routes Spacing2 Mangling is the default Spacing Update for typography fixes Cherry pick PR #476 into master Add invisible spacer to anchored sections For Developers Lint JSON, expand and simplify lint step Fix banned user redirect ... # Conflicts: # src/redux/actions.js # src/redux/reducer.js	2016-05-19 13:25:36 -04:00
Matthew Taylor	cad75217f0	Add schedule/detail components for conference	2016-05-19 11:34:59 -04:00
Matthew Taylor	b969c4e2ed	Split reducers into separate files Use a model of reducer/action files for each component that has them, and make `reducer.js` be the one that imports and configures all of them. This modeling is based on a few examples I've seen which seemed to work for our current case, but I'm totally fine with splitting actions and reducers into separate directories if we'd like too.	2016-05-19 11:34:28 -04:00
Matthew Taylor	4017266327	Fix typo	2016-05-19 11:26:11 -04:00
The_Grits	1b358b773e	Termsofuse route	2016-05-18 21:37:06 -04:00
Ray Schamp	b1be409dea	Merge pull request #491 from rschamp/bugfix/common-chunk-fallout Fix fallout from common chunk refactor	2016-05-17 23:17:06 -04:00
Ray Schamp	f9bb5592d4	Lint Remove min context, we don't use it anymore.	2016-05-17 21:09:18 -04:00
Ray Schamp	650b98c009	Bundle all locale data The npm installed version of react-intl does not include all locales, they must be added manually	2016-05-17 21:02:36 -04:00
Ray Schamp	884e9ff4a7	Don't bundle polyfills They are inherently global, so don't belong in the domain of webpack.	2016-05-17 21:02:36 -04:00
Ray Schamp	b65332c5d4	Set up Raven within init.js Now that Raven is bundled with webpack, it's not available in the global context, so require it and configure it within the init module. I struggled to figure out how to expose the raven-js module as a global, as all the combinations of `externals` and `ProvidePlugin` only applied to webpacked modules, not the global window. The correct way to do it seems to be exports-loader but that looked rather hacky and hard to understand.	2016-05-17 21:02:35 -04:00
Ray Schamp	219d144be2	Prefix privacyPolicy message string So that it matches the rest, and is localized. Not sure, but I think this was fallout from de-localizing the Privacy Policy page.	2016-05-17 21:01:49 -04:00
Ray Schamp	bb0ac87aec	Merge pull request #488 from TheGrits/patch-1 [Privacy Policy] One space more	2016-05-17 16:26:50 -04:00
Ray Schamp	dff9c3d128	Merge pull request #489 from technoboy10/patch-3 Hotfix: Resolve gh-484 (cosmetic issue in developers page)	2016-05-17 16:24:17 -04:00
Ray Schamp	f7e9b7ca38	Merge pull request #473 from rschamp/feature/lint Lint JSON and all of our .js and .scss	2016-05-17 16:01:55 -04:00
The_Grits	2d80c46c74	One space more I can't believe I missed this one earlier. facepalm	2016-05-17 15:46:20 -04:00
Connor Hudson	9808a31d9a	Changes "interfacesto" to "interfaces to"	2016-05-17 13:07:19 -06:00
Rachel Thornton	dc42b317e2	Removed rows from grid, changed explore tabs Grid component now no longer uses row concept, and changed tabs in the Explore page to projects/studios, with categories in a new picker above the tabs. Also compressed svg files.	2016-05-17 12:40:16 -04:00
Matthew Taylor	829cb6ff0c	Merge pull request #478 from mewtaylor/issue/gh-419 Fix GH-419: Some localization cleanup	2016-05-17 11:43:27 -04:00
Ray Schamp	0ede616f44	Merge pull request #481 from TheGrits/patch-2 Fix Spacing Issues on Privacy Policy	2016-05-17 11:03:11 -04:00
The_Grits	792a5c9622	Spacing2 Changed as per @rschamp's comments	2016-05-17 11:02:34 -04:00
Ray Schamp	7f275efdf0	Merge pull request #479 from rschamp/feature/common-chunk Move externals, polyfill and init to common chunk	2016-05-17 10:36:14 -04:00
The_Grits	834f2db463	Spacing I noticed some spacing issues on the page, I thought I would fix them.	2016-05-17 09:52:42 -04:00
Ray Schamp	6b420b4445	Update for typography fixes	2016-05-17 08:30:27 -04:00
Ray Schamp	b7dd55e7e0	Merge branch 'feature/for-developers' into develop	2016-05-17 08:28:25 -04:00
Matthew Taylor	89c2f2628e	Add invisible spacer to anchored sections so that the headers are visible	2016-05-17 08:24:03 -04:00
carljbowman	e885c08ea1	For Developers Add landing page for developers	2016-05-17 07:51:08 -04:00
Ray Schamp	b0b520fe18	Lint JSON, expand and simplify lint step	2016-05-16 13:02:55 -04:00
Ray Schamp	31c2f98afc	Fix banned user redirect	2016-05-16 13:02:55 -04:00
Ray Schamp	8f2697b7f1	Move externals, polyfill and init to common chunk This should allow us to define and update our dependencies more easily (via npm) as well as reducing the number of requests. Additionally, when we add common packages this will avoid the issue after deploys where a user may get a cached HTML page, but new Javascript, leading to the dreaded blank page because the browser didn't download all dependencies. Using mangle with UglifyJS also made the total file size for the common chunk bundle smaller than the current total for all of our external/polyfill scripts (1.18MB vs 1.55MB).	2016-05-16 12:59:58 -04:00
Matthew Taylor	82942b988d	Localize title of page after strings load This doesn't solve the issue of making it crawlable in other languages, but it does allow the title to be translatable for user parsing (and accessibility)	2016-05-16 10:55:51 -04:00
Matthew Taylor	4abebd8194	Remove duplicate `About Scratch` entry Towards #419 – makes "About Scratch" work on the About page. Additionally, removes `defaultMessages` from the footer since we no longer use those.	2016-05-16 10:19:52 -04:00
The_Grits	76c003d854	Lint fixes	2016-05-16 06:45:06 -04:00
The_Grits	5d05d19566	aha Does this fix the lint error?	2016-05-14 23:21:10 -04:00
The_Grits	c2fca9c4c6	Squash and Merge	2016-05-14 22:39:40 -04:00
The_Grits	f3439eba5c	Add privacypolicy route	2016-05-13 20:45:48 -04:00
Matthew Taylor	bf1b3f894d	Some leftovers Thanks @rschamp again!	2016-05-12 22:54:07 -04:00
Matthew Taylor	804a65e3d0	Whoops That change is coming later with more redux in conference :).	2016-05-12 18:39:33 -04:00
Matthew Taylor	82dbfabcec	Constrain view styles to within view name classes So that they don't affect styles declared outside the scope of the view. Thanks @rschamp!	2016-05-12 18:32:57 -04:00
Matthew Taylor	e1cebe46db	Ergonomics – get rid of typography file 1. Merge typography into main 2. Get rid of use of `#view` in scss 3. Make `render` work with conference pages	2016-05-12 18:05:26 -04:00
The_Grits	8d294e4d29	Float	2016-05-11 09:53:39 -04:00
Rachel Thornton	4b632e4f5f	Removed extraneous image file	2016-05-10 08:26:41 -04:00
Rachel Thornton	4a2a2c8ca2	Whitespace added	2016-05-10 08:22:48 -04:00
Rachel Thornton	577ed2c746	Small fix	2016-05-10 08:18:47 -04:00
Rachel Thornton	9c6475aed5	Support for studios Search and Explore now support studios, thought currently the api is not ready for them.	2016-05-10 08:16:46 -04:00
Rachel Thornton	d7c9057cbd	Refactoring, new grid component Significant refactoring of Explore and Search pages, including new grid component for displaying projects	2016-05-10 00:54:46 -04:00
The_Grits	75258be4a4	margin-right 4.4px is the max margin we can put to the right of the button without the "Forgot password?" text wrapping.	2016-05-09 11:27:22 -04:00
Matthew Taylor	fd1016059b	Merge branch 'patch-8' of https://github.com/TheGrits/scratch-www into TheGrits-patch-8 * 'patch-8' of https://github.com/TheGrits/scratch-www: Indent p element Edit spacing Whoops Squash and Merge Add DMCA route # Conflicts: # src/routes.json	2016-05-03 10:23:34 -04:00
Ray Schamp	fb292f3773	Merge pull request #466 from LLK/hotfix/analytics [Develop] Hotfix: Add missing env variables needed for the build	2016-05-02 14:01:55 -04:00
Ray Schamp	e48b04f907	Add missing env variables needed for build	2016-05-02 11:57:46 -04:00
Matthew Taylor	47d7257895	Merge pull request #462 from mewtaylor/hotfix/add-register-faq [Develop] Hotfix: Add Registration to FAQ	2016-05-01 12:48:41 -04:00
Rachel Thornton	fdd78a5433	Style changes Changes to style for lint tests	2016-04-30 16:38:48 -04:00
Rachel Thornton	eb499c929c	Changed path of search page to allow for studio tabs Users and Forum tabs removed	2016-04-30 16:03:11 -04:00

... 19 20 21 22 23 ...

2498 commits