1769 commits

Author	SHA1	Message	Date
Ben Wheeler	bc7b31e924	finished draft of intermediary refactor of addtostudio modal redux code, container-presentation code simplified	2018-07-13 09:50:17 -04:00
Ben Wheeler	6a32edb2fe	addtostudiomodal: incomplete progress on 1. container-presentation refactor, 2. redux handling of add and leave studio requests	2018-07-11 15:08:01 -04:00
Ray Schamp	5844fed2e0	Merge branch 'hotfix/update-conference-2018-3' into develop	2018-07-09 16:34:23 -04:00
jokebookservice1	07202ff6ec	Remove unneeded testing file	2018-07-09 16:48:17 +03:00
Andrew Sliwinski	f3bd092482	Merge pull request #1951 from JoelGritter/JoelGritter-patch-1 ... Fix gh-1950: Update parent email age on FAQ page	2018-07-09 08:47:24 -04:00
Ben Wheeler	9cac70ab18	small steps towards addtostudio modal's container-presentation refactor	2018-07-07 14:09:43 -04:00
Connor Hudson	5b520c21ef	Update copy from doc	2018-07-06 13:47:55 -04:00
Connor Hudson	a7aae29041	Tweak small top banner styles	2018-07-06 11:38:41 -04:00
Connor Hudson	917497ab66	Use localization strings for banner copy	2018-07-06 10:37:51 -04:00
Connor Hudson	565eeb776f	Make middle banner image resize properly and keep its aspect ratio	2018-07-06 10:37:10 -04:00
Sean Hickey	377eaf0e61	Conference updates - schedule, logos, room locations	2018-07-06 10:17:57 -04:00
Connor Hudson	61aad76b68	Fix middle banner image styles	2018-07-06 09:52:24 -04:00
Connor Hudson	d1d7b2e711	Adjust middle banner width and margin to match other front page rows	2018-07-05 15:26:34 -04:00
Joel Gritter	b77c5fe837	Update parent email age ... 13 -> 16	2018-07-05 09:27:53 -04:00
Ben Wheeler	af25e44fc6	refactoring add to studio modal into container and presentation; added getCuratedStudios functionality to preview	2018-07-04 18:01:11 -04:00
Connor Hudson	4129a701e7	Second pass at responsive top banner	2018-07-03 16:18:11 -04:00
Connor Hudson	5ebb5fa8db	Fix image weirdness on chrome, safari	2018-07-03 15:02:00 -04:00
Connor Hudson	08178a58e5	Initial work on responsive middle banner	2018-07-03 14:48:20 -04:00
Connor Hudson	0eb12ae469	Style button on top banner	2018-07-03 13:16:01 -04:00
Connor Hudson	97cb50917f	Add initial pass at middle banner	2018-07-03 12:21:21 -04:00
Connor Hudson	142b46b138	Rename image container	2018-07-03 12:07:03 -04:00
Connor Hudson	655625568c	Add initial pass at top banner with assets	2018-07-03 12:03:22 -04:00
Connor Hudson	4eca432811	Style middle banner	2018-07-02 11:41:17 -04:00
Connor Hudson	251f7bf59d	Add middle banner in progress copy	2018-07-02 11:41:10 -04:00
Connor Hudson	dfaee503b8	Style top banner, add placeholder copy	2018-07-02 10:51:19 -04:00
Connor Hudson	5b5eb8cc5a	Tweak class for small top banner	2018-07-02 10:25:58 -04:00
Connor Hudson	cf48231284	Tweak class names, button padding for small top banner	2018-07-02 10:08:38 -04:00
Connor Hudson	918b4b5948	Style small top banner a little more	2018-07-02 09:59:22 -04:00
Connor Hudson	4c49ae1701	Create small top banner component	2018-06-29 09:28:11 -04:00
Connor Hudson	fd9c0df623	Add styles for banners	2018-06-29 09:28:03 -04:00
Connor Hudson	4ee6bfcad2	Add call to action link to banners	2018-06-29 09:27:54 -04:00
Connor Hudson	c469a0ed97	Show MiddleBanner if logged out	2018-06-28 13:58:23 -04:00
Connor Hudson	178ee415e7	Show top banner if logged in and on tablet or desktop	2018-06-28 13:51:51 -04:00
Connor Hudson	1371687a22	Add boilerplate code for beta banners	2018-06-28 13:50:18 -04:00
Connor Hudson	289e17195d	Merge pull request #1932 from technoboy10/feature/projects-extension-display ... Preview - Implement extension info strip	2018-06-27 16:59:47 -04:00
Colby Gutierrez-Kraybill	02c45300d6	Merge pull request #1940 from LLK/hotfix/update-conference-2018-2 ... [DEVELOP] Conference site updates	2018-06-27 12:37:03 -04:00
Sean Hickey	05fd133f27	Updated LEGO Foundation logo to LEGO Education logo. Removed Thursday dinner from expect page.	2018-06-26 15:04:55 -04:00
Connor Hudson	da1fe6a6fc	Use lib/log instead of console.log for project parsing error	2018-06-26 08:41:06 -04:00
Connor Hudson	5ab0aa50ad	Add min-height: 0 to description block to fix notes layout on Firefox	2018-06-25 16:41:39 -04:00
Connor Hudson	80dfaa6a1e	Use l10n ids in extension chip	2018-06-22 10:01:12 -04:00
Connor Hudson	1842be2f1a	Add l10n strings for extension chips	2018-06-22 09:16:20 -04:00
Connor Hudson	363c0fdfb5	Update extension parsing in Preview to match updated VM PR	2018-06-22 09:02:11 -04:00
Connor Hudson	2293eebaec	Try to fetch extensions in constructor of Preview	2018-06-21 09:45:53 -04:00
Connor Hudson	5dfbe422d7	Add additional check to getExtensions function	2018-06-21 09:45:32 -04:00
Ben Wheeler	0a6ec304d3	starting to change addtostudios modal to make changes on the fly	2018-06-20 20:25:46 -04:00
Connor Hudson	ccfd25d864	Use project ID from state instead of props	2018-06-20 17:08:06 -04:00
Connor Hudson	456e99f1be	Catch errors in getExtensions function	2018-06-20 17:04:16 -04:00
Connor Hudson	b2ddc50529	Remove misplaced getExtensions call in handleReportClick (5!)	2018-06-20 15:58:34 -04:00
Connor Hudson	b958567a24	Fix scss lint errors	2018-06-20 10:25:00 -04:00
Connor Hudson	a69ad0ec86	Implement extension fetching in Preview component	2018-06-20 09:55:09 -04:00
Connor Hudson	9f2304b8c9	Add check for extensions prop existence in PreviewPresentation	2018-06-20 09:48:40 -04:00
Connor Hudson	7fb7e9146b	Merge upstream/develop, move logic to preview instead of presentation	2018-06-20 09:28:41 -04:00
Andrew Sliwinski	1fc9ed43a9	Merge pull request #1931 from thisandagain/bugfix/gdpr ... Fix issue with error copy to match new teacher age limit.	2018-06-20 09:18:41 -04:00
Andrew Sliwinski	af1f67a70a	Fix issue with error copy to match new teacher age limit.	2018-06-20 09:06:38 -04:00
Ben Wheeler	c25bfab7bb	improved addtostudio modal variable names	2018-06-20 08:38:16 -04:00
Connor Hudson	bd22d573b6	extension-info.js -> extensions.js	2018-06-19 16:18:08 -04:00
Connor Hudson	168e155ac5	Use EXTENSION_INFO file in presentation.jsx	2018-06-19 16:13:47 -04:00
Connor Hudson	f7987fd568	Don't display image in extension chip if iconURI undefined	2018-06-19 15:58:54 -04:00
Connor Hudson	ea1c0ce4a2	Add initial implementation of loading extension info from sb3 project	2018-06-19 12:26:22 -04:00
Ray Schamp	5740fe8bf8	Merge pull request #1912 from chrisgarrity/feature/preview-restructure ... Feature/preview restructure	2018-06-19 10:47:40 -04:00
Ben Wheeler	16190f1147	got addtostudio modal state changes to work, though not updating to server yet	2018-06-19 10:13:40 -04:00
Ben Wheeler	e05079a28c	mocked my permissioned studios	2018-06-19 00:00:37 -04:00
Ben Wheeler	4c657a1e80	showing actual studio membership, though not unadded studios yet	2018-06-18 23:36:20 -04:00
Ray Schamp	9e02798f7b	Lint	2018-06-18 17:19:12 -04:00
Ray Schamp	0c3221f835	Prevent wrapping the notes and credits column	2018-06-18 17:15:56 -04:00
Ben Wheeler	f8df3c0146	added royal blue color, button styles, small jsx fixes to Add to Studio modal	2018-06-18 15:17:19 -04:00
Ben Wheeler	9d9226f4a4	got rid of bug keeping page from displaying	2018-06-16 19:28:28 -04:00
Ben Wheeler	f0fbc0a57f	add to studio modal appears from project page, looks horrendous	2018-06-16 19:13:50 -04:00
Ben Wheeler	20242af3de	preview view comment	2018-06-16 18:19:31 -04:00
Connor Hudson	b826a1ad2f	Add onExtensionAdded function to bindAll call	2018-06-15 09:52:12 -04:00
Connor Hudson	3b09bf145c	Fix hasStatus prop type	2018-06-15 08:47:52 -04:00
Connor Hudson	1f5075f9d8	Initial (hacky) solution for loading EIABCW content	2018-06-14 16:54:55 -04:00
chrisgarrity	7f41771710	Merge pull request #1925 from LLK/hotfix/update-conference ... [HOTFIX] [DEVELOP] - Content updates for Scratch Conference 2018 website (sponsor logos and keynote descriptions)	2018-06-14 16:32:19 -04:00
Connor Hudson	3eb0e12bf6	Only use extensions with preexisting data URIs for demo chips	2018-06-14 15:11:03 -04:00
Connor Hudson	b40f939566	iconSrc -> iconURI to match CategoryInfo format	2018-06-14 15:10:33 -04:00
Andrew Sliwinski	3f4f413510	Merge pull request #1923 from apple502j/patch-3 ... Change splash to use 30000000	2018-06-14 12:29:17 -04:00
Ray Schamp	1840b9df31	Convert presentation function component ... Fixing a typo let the linter catch that this no longer needs to be a class component	2018-06-14 09:26:44 -04:00
Connor Hudson	b317c12e79	Add some mockup extensions	2018-06-13 16:45:48 -04:00
Connor Hudson	e7e0ba720c	Add extension list styles	2018-06-13 16:45:06 -04:00
Connor Hudson	f9dd4e76aa	Add padding to extension status div	2018-06-13 15:35:58 -04:00
Connor Hudson	0733a5dde4	Fix class name for extension icon	2018-06-13 15:32:31 -04:00
Connor Hudson	11af7fec9b	Add extension status styling, tweak margins and spacing	2018-06-13 15:24:19 -04:00
Sean Hickey	8f0b12c2a6	Updated sponsor logos and keynote descriptions	2018-06-13 15:12:50 -04:00
Connor Hudson	a9e8a06c6d	Add props to ExtensionChip	2018-06-13 14:53:41 -04:00
Connor Hudson	0056e93e4a	Add more margin to extension chip content, use rem where it makes sense	2018-06-13 14:53:26 -04:00
Connor Hudson	6bace1b11e	Add ExtensionChip component with demo content	2018-06-13 14:05:20 -04:00
apple502j	070cbe091f	Change splash (GH-1916) ... It uses "30000000 projects" by default now!	2018-06-13 17:32:35 +09:00
Andrew Sliwinski	ca6d78d928	Use 16 as offset for teacher registration as per GDPR	2018-06-12 15:40:52 -04:00
apple502j	6bb022107d	Changed link from /help to /tips ... #1909	2018-06-05 18:26:34 +09:00
Andrew Sliwinski	680695d8de	Merge pull request #1902 from Kenny2github/fix-research-link ... Fix the /about research page link	2018-06-04 12:22:57 -04:00
Andrew Sliwinski	8824b64c89	Merge pull request #1904 from apple502j/patch-1 ... Updated link to Scratch Wiki - to new domain	2018-06-04 12:22:19 -04:00
jokebookservice1	f95b05467d	Fix search bar's handling of special characters ... `decodeURI` is used for full URIs, not components thereof.	2018-06-03 13:23:52 +01:00
chrisgarrity	74c76fb1cf	Refactor report-modal ... * addresses comments for https://github.com/LLK/scratch-www/pull/1900 * renames report fields to match scratchr2 expectations * restyle modal to allow display of validation messages * removed cruft	2018-06-01 15:25:28 -04:00
chrisgarrity	47b90d449b	Fix formatting of long project description fields ... Description block also needed to be `display: flex`, and the content was missing the `overflow: auto` to make it scrollable.	2018-06-01 09:45:49 -04:00
chrisgarrity	6872cfc51f	FIxing PR #1900 comments ... addresses most comments except modal refactor, and error response from sumitting report. * restore gui as a dev dependency * better separation of view container/presentation * replace absolute heights for textareas with making all sub components `display: flex` * start to make presentation more modular added subcomponents to the view folder: * share-banner (moved from components) * remix-credit * remix-list * studio-list	2018-05-31 21:04:11 -04:00
chrisgarrity	285b2dbcff	Updated styles	2018-05-31 15:02:45 -04:00
chrisgarrity	db3120091d	Fix lint and don’t duplicate the ‘other’ string	2018-05-31 15:02:45 -04:00
chrisgarrity	c6f197f576	Adjust share-date to give action buttons more room	2018-05-31 15:02:45 -04:00
chrisgarrity	0bc5bf745d	Fix up stats line ... * Update for newer version of API - remix count in stats * create projectShape to remove duplication * add approximate-number to limit the size of the stats row.	2018-05-31 15:02:45 -04:00
chrisgarrity	71dfe690be	First pass at correcting project input styles ... * Add placeholders to description input text-areas * fix styling to show box shadow highlight on focus * adjust height for non-remix project * fix lint errors	2018-05-31 15:02:45 -04:00
chrisgarrity	08cf4f4f3d	Refactor report modal ... * move all the report modal presentation into the component * add strings to general l10n file because we don’t handle l10n files in components * Add current project id and username to the data before submitting	2018-05-31 15:02:44 -04:00
chrisgarrity	34042c9e8e	Report first pass ... Report button opens a modal with the report project form. All the content is currently in `preview/presentation` because components cannot have their own l10n files.	2018-05-31 15:02:44 -04:00
chrisgarrity	bd391b422a	presentation first pass ... First pass at project page design using actual assets from Carl, and matching styles with current design. Includes a (negative margin) hack to line up the stage. see https://github.com/LLK/scratch-gui/issues/2132	2018-05-31 14:58:23 -04:00
chrisgarrity	81ac8eeef2	Merge pull request #1907 from LLK/hotfix/conference-2018 ... [DEVELOP]: Hotfix/conference 2018	2018-05-31 14:49:54 -04:00
chrisgarrity	99ed30e2c8	Fix up favorites ... Found a couple of typos now that API can process favorites.	2018-05-30 14:39:25 -04:00
apple502j	2c6ffd6fd9	Updated link to Scratch Wiki - to new domain	2018-05-30 20:14:03 +09:00
Ken	5deff9c9bd	Fix the /about research page link	2018-05-30 11:17:40 +08:00
Sean Hickey	f86bd5b84b	Fixed up page/render include order. Fixed up code readability issue in details page.	2018-05-29 11:07:08 -04:00
Sean Hickey	f54379e0d7	Cleaned up linter errors	2018-05-29 11:07:08 -04:00
Sean Hickey	fd24fbacef	Updated asset paths	2018-05-29 11:07:08 -04:00
Sean Hickey	9ef187aada	Updated conference pages for 2018	2018-05-29 11:07:07 -04:00
chrisgarrity	80de164d02	Handle See inside button (#1890) ... * Handle See inside button Import GUI reducers, initial state and middleware (throttle). Update render to handle state and middleware. Remove preview mode state and use scratchGui.mode from redux instead. URL is getting updated, and mode will be updated based on URL. However, the history needs work - it doesn’t work with the modal back. * Update to latest GUI This is the minimum version of GUI that is needed for see-inside * Really remove cruft.	2018-05-24 16:23:07 -04:00
Andrew Sliwinski	c0ac741065	Remove link from email address	2018-05-23 09:55:56 -04:00
Andrew Sliwinski	0a7bcdf907	Fix mailto link	2018-05-23 09:55:52 -04:00
Andrew Sliwinski	311d7e5959	Fix links to account settings / password	2018-05-23 09:55:48 -04:00
Andrew Sliwinski	59ca64579e	Fix typo	2018-05-23 09:55:42 -04:00
Andrew Sliwinski	244a76149b	Resolve lint issues	2018-05-23 09:55:36 -04:00
Andrew Sliwinski	71af5978ad	Update privacy policy	2018-05-23 09:55:08 -04:00
Andrew Sliwinski	f19a6c6196	Remove link from email address	2018-05-22 16:15:26 -04:00
Andrew Sliwinski	7241164cf7	Fix mailto link	2018-05-22 09:59:08 -04:00
Andrew Sliwinski	8b9df4857f	Fix links to account settings / password	2018-05-22 09:58:17 -04:00
Andrew Sliwinski	495d9e1177	Fix typo	2018-05-22 09:24:36 -04:00
Andrew Sliwinski	585a2e6686	Merge pull request #1891 from thisandagain/hotfix/privacy ... [Develop] Hotfix - Update Privacy Policy	2018-05-21 17:15:21 -04:00
Andrew Sliwinski	88e99e655b	Resolve lint issues	2018-05-21 17:04:50 -04:00
Andrew Sliwinski	881c2affa4	Update privacy policy	2018-05-21 15:55:21 -04:00
Andrew Sliwinski	32fc959ed2	Remove references to Linux in download l10n strings	2018-05-16 09:44:11 -04:00
Andrew Sliwinski	a302d37eef	Remove references to Linux for the Scratch 2.0 offline editor. Resolves GH-1880	2018-05-15 10:19:12 -04:00
chrisgarrity	6df58e41fd	Correct preview route for fastly ... - use more explicit route - handle fastly error in the callback correctly - more succinct parsing of the URL path	2018-05-02 17:04:14 -04:00
chrisgarrity	d1420862ea	Initial GUI embed (#1869) ... - `/preview/editor` will load GUI with an empty project - `/preview/:id/editor` will load GUI with a project from the projects server (not local data) - passes intl object to GUI - `/preview/:id` with show the project page with an embedded player - `/preview/:id/fullscreen` will load the project page with the player in fullscreen mode. * Note that we needed to Increase memory for the build to avoid running out of heap space, and build time increases by about 2 minutes	2018-05-02 15:27:49 -04:00
chrisgarrity	65e7657680	Merge pull request #1868 from LLK/hotfix/close-conf-reg ... [DEVELOP] Close registration when full	2018-04-26 15:00:22 -04:00
chrisgarrity	b8326a3d57	Feature/preview project2 (#1856) ... * Add user-session awareness - only show remix button if user is logged in (TBD: probably will want to hide if project creator == user) * decorate text with @mentions and #hashtags * Add studios, loves, favs * In-place editing of title and description if current user is author and project shared (with validation)	2018-04-24 11:00:47 -04:00
Ray Schamp	c173922df6	Merge pull request #1861 from LLK/hotfix/conference-remove-dorm ... [Develop] Remove dorm information from 2018 Conference page	2018-04-23 16:38:53 -04:00
Ray Schamp	9816846409	Merge pull request #1862 from LLK/hotfix/remove-recent-row ... [Develop] remove recent projects row	2018-04-23 16:37:58 -04:00
chrisgarrity	520bd21cf2	remove obsolete l10n message	2018-04-23 16:29:51 -04:00
chrisgarrity	8cd28baef4	Remove recently shared row	2018-04-20 17:33:38 -04:00
chrisgarrity	ce6d78c715	Remove NEU dorm accomodations ... Dorms are no longer available. Fixes #1851	2018-04-19 17:06:58 -04:00
seotts	9ab5cc9e5c	added p around list	2018-04-10 16:33:41 -05:00
Andrew Sliwinski	b544ccdaa7	Merge pull request #1846 from apple502j/develop ... Added Giga	2018-04-09 08:26:10 -04:00
Ray Schamp	417791b589	Merge pull request #1849 from LLK/release/march-2018 ... [Develop] March 2018 Release	2018-04-05 17:01:47 -04:00
apple502j	3a6c182087	Added Giga	2018-04-04 08:36:04 +09:00
Ray Schamp	52a5d929d1	Render messages inline ... This omits `for...of` which requires Symbol. The Symbol polyfill required by Babel for `for...of` apparently doesn't work for the react-tooltip library. So just don't use `for...of`.	2018-04-03 17:27:06 -04:00
Kenny2github	a516e8d9be	Lint	2018-04-03 19:28:53 +08:00
Kenny2github	bf8baaf7d0	Fix everything ... *Updated to new convention for InformationPages +Added route in routes.json (might be missing previous /info/research path) -Removed package-lock.json to fix conflicts *Updated l10n to not use HTML	2018-04-03 16:22:36 +08:00
chrisgarrity	19039a4905	Catch empty phone number	2018-04-02 13:49:45 -04:00
chrisgarrity	7c46f6957a	Fix up student registration	2018-03-30 10:51:23 -04:00
chrisgarrity	67f292037a	Correcting teacher registration for react16	2018-03-30 10:51:22 -04:00
Ray Schamp	79665e5986	Fix warnings on About	2018-03-30 10:49:58 -04:00
Kenny2github	82c651cece	A New Beginning	2018-03-27 18:33:10 +08:00
chrisgarrity	b7900aca05	Merge pull request #1833 from chrisgarrity/feature/preview-project ... Feature/preview project - part 1 (elements 'above the fold')	2018-03-21 10:29:01 -04:00
chrisgarrity	1b2050c58a	cleanup	2018-03-20 20:19:48 -04:00
chrisgarrity	c5ea057974	Merge pull request #1835 from JoelGritter/patch-2 ... Fix #1825	2018-03-19 10:00:38 -04:00
Joel Gritter	536e4c7e0b	Remove filled jobs ... Removed: Designer, Learning Resource Designer, QA Engineer, Senior Backend Engineer	2018-03-17 18:50:04 -04:00
chrisgarrity	1c6b0dd64c	Cleanup ... Fixing lint problems and removing (most) unused code. I left user and session as they will get used soon even though they aren’t currently.	2018-03-15 17:40:16 -04:00
Andrew Sliwinski	7bf690df5e	Merge pull request #1821 from ktrvs/ktrvs-update-privacy-policy ... Update privacy policy to be more clear. | Fixes #1803	2018-03-15 13:00:48 -04:00
chrisgarrity	9545e53c98	Close registration when full ... Hotfix ready to deploy when conference registration has filled up.	2018-03-15 09:00:49 -04:00
chrisgarrity	f836c6e3a8	Adding in remix metadata ... - Moved preview state into redux - Gets remix credit if the project is a remix - Shows up to 5 remixes (direct children?) - handles empty remixes result (it’s not an array) - Added Column component - based on Grid, but doesn’t use frameless to set width. - allows trailing ‘/‘ on the URL - cleaned up conditional content	2018-03-14 15:50:27 -04:00
chrisgarrity	79199d6d32	Placeholders for everything ‘above the fold’	2018-03-08 15:57:19 -05:00
chrisgarrity	2d6327ba01	Update Northeastern accomodation info	2018-02-28 14:08:16 -05:00
chrisgarrity	f86bd01609	Remove obsolete code	2018-02-28 13:58:22 -05:00
Kerr	cf40bea072	Update privacy policy	2018-02-28 12:50:37 +00:00
chrisgarrity	ea6de54104	[WIP]: embed GUI in a preview page	2018-02-21 14:39:21 -05:00
chrisgarrity	1d42674651	Conference March 1 update ... - Add buttons that link to conference registration - Updated FAQ copy	2018-02-21 11:19:13 -05:00
Ray Schamp	788d24b0f0	Merge pull request #1806 from LLK/release/2.2.27-jan ... [Develop] January 2018 Release	2018-02-13 10:49:55 -05:00
Ray Schamp	2617dc95d1	Add Full Stack Engineer job post ... Also reorder existing posts to be alphabetical	2018-02-12 13:33:20 -05:00
Ray Schamp	c6f7681197	Fix merge issues	2018-02-12 09:26:39 -05:00
Ray Schamp	5513b6a7e9	Merge branch 'develop' of github.com:LLK/scratch-www into issue/gh1400-load-more-button-behavior ... # Conflicts: # src/views/search/search.jsx	2018-02-08 10:42:04 -05:00
chrisgarrity	aff3c33817	Merge pull request #1796 from chrisgarrity/hotfix/conf2018-feb5 ... [DEVELOP] Hotfix Conference page to close session proposals	2018-02-05 08:41:27 -05:00
chrisgarrity	a5f2121fea	Another hotel update	2018-02-02 10:25:12 -05:00
chrisgarrity	901ec9d2f1	Update hotel links	2018-02-02 09:23:46 -05:00
St19_Galla	15982b5699	Fix gh-1780: Corrects Link on About Page (#1781) ... * Update about.jsx * shorten	2018-02-01 17:26:34 -05:00
Linda	358ac9a5b9	fixes #1764/reduce string duplication in teaacher registration (#1791)	2018-02-01 17:25:55 -05:00
Arav Narula	2799d12069	Update credits.jsx (#1770) ... * Update credits.jsx * Fix up ES6 changes.	2018-02-01 17:24:28 -05:00
chrisgarrity	2989857dbe	Update Conference page to close session proposals ... Fixes #1782, needs to be hotfixed on Feb 5	2018-01-31 17:14:42 -05:00
Ray Schamp	cbc5bbd565	Fix search tabs	2018-01-31 13:00:27 -05:00
Ray Schamp	83db222e28	Fix "Load More" on search ... Concatenating a number with null results in NaN, and when NaN was used as an API query argument, resulted in a 503.	2018-01-30 10:50:05 -05:00
Ray Schamp	53d3bb94dc	Revert "Merge pull request #1787 from LLK/revert-1786-hotfix/es6-upgrade" ... This reverts commit 5ce1a9f411, reversing changes made to 5be4c45f08.	2018-01-30 10:33:15 -05:00
Ray Schamp	c7c92c49f7	Revert "[Master] Upgrade to ES6"	2018-01-30 09:53:25 -05:00
chrisgarrity	a7532c49db	Fix projects curated row ... Changed the localization string to use a placeholder to allow translators to re-order if needed. Also added preview-faq to the transifex config.	2018-01-29 14:22:23 -05:00
Ray Schamp	57cc6f8770	Fix padding on Privacy Policy page	2018-01-29 14:18:57 -05:00
Ray Schamp	2ac6ed4c73	Use a prop for refreshSession ... Since dispatch is not passed in anymore.	2018-01-29 14:16:59 -05:00
chrisgarrity	7b15ef2363	Handle search queries	2018-01-29 13:07:48 -05:00
chrisgarrity	0841dc93e7	Fix tips modal	2018-01-29 10:08:17 -05:00
chrisgarrity	f8473b6bc8	Fix FormattedMessage ids	2018-01-26 13:26:13 -05:00
chrisgarrity	0d3db461c4	Fix other page header padding issues	2018-01-25 17:17:45 -05:00
chrisgarrity	273227aab4	Remove extra padding from FAQ page header ... Reorder the import of InformationPage and Page.	2018-01-25 17:06:35 -05:00
chrisgarrity	484c949a92	Remove extra space before messages view ... MessagesPresenation has to be loaded after Page.	2018-01-25 16:35:38 -05:00
Ray Schamp	ff211e312e	Fix teacher registration starting step	2018-01-25 15:44:00 -05:00
Ray Schamp	560538f046	Lint	2018-01-25 15:25:39 -05:00
Ray Schamp	911ba64444	Merge branch 'develop' of github.com:LLK/scratch-www into hotfix/es6-upgrade	2018-01-25 15:23:07 -05:00
Andrew Sliwinski	ad3189c164	Merge pull request #1768 from LiFaytheGoblin/gh-1751/add_abkhaz_to_languages_menu ... Gh 1751/add abkhaz to languages menu	2018-01-24 14:46:56 -05:00
Ray Schamp	f6bffd4192	Merge branch 'develop' of github.com:LLK/scratch-www into hotfix/es6-upgrade ... # Conflicts: # src/views/developers/developers.jsx	2018-01-23 09:50:33 -05:00
Matthew Taylor	6d1f2fbccd	initial es6 commit	2018-01-19 14:06:26 -05:00
LiFaytheGoblin	6341ff4085	Whoops, I somehow deleted the free line at the end, so here, I put it back again...	2018-01-17 13:58:58 +01:00
chrisgarrity	83f0cc1e18	Add a closing paren ... Translators can’t translate a string with unbalanced paren’s.	2018-01-16 10:52:07 -05:00
LiFaytheGoblin	10fb7e032a	up to date	2018-01-15 20:23:24 +01:00
Ken	df070935a3	Move period and migrate to FormattedMessage (#1757) ... * Move period * update l10n with new msg format * update jsx to use FormattedMessage instead of FormattedHTMLMessage	2018-01-13 12:05:29 -05:00
Strudy	14e29c547d	Add Changes to scratch conf website (#1746) (#1748) ... * Update l10n.json	2018-01-11 08:37:17 -05:00
Matthew Taylor	ade9ccef81	Add back in FPC and recently shared rows ... There appears to have been a merge issue between the hotfixes around CSEdWeek and the implementation of the splash refactor, so this rectifies that error.	2018-01-10 17:43:14 -05:00
Matthew Taylor	080df8673b	fix typo in become curator import	2018-01-09 14:58:08 -05:00
Matthew Taylor	3e7bb349ba	match props to rows, rather than object ... this was not detecting row updates well on re-render	2018-01-09 14:47:45 -05:00
Matthew Taylor	c7d4a70878	handle spacing for list items	2018-01-09 13:06:20 -05:00
Matthew Taylor	e4611088ff	extract faq from published page ... after review from @thisandagain – thanks!	2018-01-09 12:55:36 -05:00
Matthew Taylor	85d6636c28	remove superfluous import	2018-01-08 13:42:25 -05:00
Matthew Taylor	3e7ccc6207	Add preview faq page ... Implements #1711	2018-01-08 13:39:29 -05:00
Matthew Taylor	53acea2112	Merge pull request #1670 from mewtaylor/issue/whats-happening ... Implement GH-1628: Use new activity endpoint	2017-12-18 14:59:10 -05:00
chrisgarrity	e0461ca77a	Merge pull request #1738 from LLK/hotfix/revert-HOC-banners ... [DEVELOP] Hotfix/revert hoc banners	2017-12-15 15:51:10 -05:00
Sheshank Shankar	240606b3d0	Fixes #1702: Scratch Conference site - small edits (#1727) ... Update the conference page with new banner image and small copy edits.	2017-12-13 15:25:12 -05:00
chrisgarrity	04e1e36978	revert 2017 HoC top and middle banners	2017-12-12 11:21:35 -05:00
Sheshank Shankar	cc0451ec7b	Fixes #1702: Scratch Conference site - small edits (#1727) ... Update the conference page with new banner image and small copy edits.	2017-12-12 10:27:24 -05:00
Andrew Sliwinski	3c9d7eb57a	Clarify licensing of trademarks in FAQ (#1735) ... * Clarify logo licensing in FAQ	2017-12-11 17:02:11 -05:00
Kerr Travers	d3b8acbb56	Fixes #1700 | Update about page (#1714) ... Fixes #1700 adds 'Siegel Family Endowment' to the credits. Also changes all uses of `FormattedHTMLMessage` to `FormattedMessage` with placeholders.	2017-12-11 15:16:06 -05:00
Carl-Myer R. Flor	36b90980a6	Adds button behavior for various search result state	2017-12-11 23:24:02 +08:00
Matthew Taylor	24e65e707f	Revert "[Master] temporarily take out curator row and recently shared row"	2017-12-11 08:40:16 -05:00
Kerr Travers	34093e6aa9	Fixes #1728 | Add new member to credits (#1729)	2017-12-07 13:02:00 -05:00
Matthew Taylor	67dec709a0	Merge pull request #1716 from mewtaylor/hotfix/temp-row-remove ... [Develop] temporarily take out curator row and recently shared row	2017-12-03 13:26:48 -05:00
Matthew Taylor	9fbd5b691c	temporarily take out curator row and recently shared row	2017-12-01 15:12:49 -05:00
chrisgarrity	ec507b73c5	Merge pull request #1654 from chrisgarrity/feature/hoc-2017 ... Top and middle banners for HoC 2017	2017-12-01 13:22:31 -05:00
Kerr	8722a1d374	Update jobs.jsx	2017-11-29 22:12:24 +00:00
Matthew Taylor	6524856bf1	use parentheses around message values ... for readability. thanks @rschamp!	2017-11-27 16:25:57 -05:00
Matthew Taylor	8ea1f621ef	use mapDispatchToProps ... thanks @rschamp!	2017-11-27 16:25:19 -05:00
Matthew Taylor	87146c3193	Merge branch 'hotfix/dec-1' of https://github.com/LLK/scratch-www into develop ... * 'hotfix/dec-1' of https://github.com/LLK/scratch-www: update transifex config to reflect new conference page fix lint update translations to just use `FormattedMessage` Change back routeAlias for conference pages Add Learning Resource designer (#1676) Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673) Fix #1649: Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650) (#1663) # Conflicts: # src/routes.json # src/views/conference/2018/index/index.jsx # src/views/conference/2018/index/l10n.json	2017-11-21 17:14:19 -05:00
Matthew Taylor	666a893dad	fix lint ... whoops!	2017-11-21 14:19:18 -05:00
Matthew Taylor	d55caf7e96	update translations to just use FormattedMessage	2017-11-21 11:17:35 -05:00
Sheshank Shankar	3283904bb9	Add Learning Resource designer (#1676)	2017-11-21 09:19:45 -05:00
Sheshank Shankar	4f14dfcbe3	Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673) ... * add 2018 conference page (new subdirectory and index page) * Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences. * Update mailto link in the footer	2017-11-21 09:19:37 -05:00
Sheshank Shankar	4ae8edd193	Add Learning Resource designer (#1676)	2017-11-20 09:13:11 -05:00
Sheshank Shankar	2ba03708c3	Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673) ... * add 2018 conference page (new subdirectory and index page) * Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences. * Update mailto link in the footer	2017-11-20 09:12:12 -05:00
Matthew Taylor	91a0e865ad	Use new activity endpoint ... This also moves homepage row retrieval into redux to further move towards using redux to handle functionality. This implements #1628.	2017-11-15 12:49:23 -05:00
Kerr	f2f51453bf	Update l10n.json	2017-11-14 17:48:47 +00:00
chrisgarrity	ef4f851e6d	Switch CTA button based on logged in state ... Invite logged-out users to ‘Get Started with Coding!’, and make the whole Scratch animation clickable (goes to the Animate a Name tutorial). See #1664	2017-11-08 16:53:42 -05:00
chrisgarrity	048d5c1383	Switch CTA button based on logged in state ... Invite logged-out users to ‘Get Started with Coding!’, and make the whole Scratch animation clickable (goes to the Animate a Name tutorial). See #1664	2017-11-08 16:50:14 -05:00
chrisgarrity	3de61d092f	Merge pull request #1662 from chrisgarrity/feature/hoc-2017 ... Feature/hoc 2017	2017-11-08 14:36:03 -05:00
Matthew Taylor	081e3c5327	Fix #1649: Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650) (#1663) ... * Adds fix to #1644 * Update l10n.json * Add files via upload * Add files via upload * Delete index.jsx * Delete index.scss * Delete l10n.json * Update index.jsx * Update l10n.json * Update l10n.json * Update index.jsx	2017-11-08 13:30:16 -05:00
chrisgarrity	60a2a51bb5	minor formatting changes for consistency	2017-11-08 09:04:33 -05:00
Sheshank Shankar	c143d6c706	Fixes #1645 and #1644 (#1646) ... * Fixes #1645 * Fixes #1644 as well * hopefully this should fix it * Update download.jsx * Update download.jsx	2017-11-07 17:31:52 -05:00
The_Grits	39c6915884	Fix gh-1634: Fix Localization on Developers Page (#1636) ... * Add ScratchJr Section Localization * Add Localization for ScratchJr and "Projects" * Update ScratchJr String / Remove ScratchJr Title * Readd "ScratchJr"	2017-11-07 17:30:11 -05:00
Sheshank Shankar	58ddff4001	Fix #1649: Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650) ... * Adds fix to #1644 * Update l10n.json * Add files via upload * Add files via upload * Delete index.jsx * Delete index.scss * Delete l10n.json * Update index.jsx * Update l10n.json * Update l10n.json * Update index.jsx	2017-11-07 16:42:53 -05:00
chrisgarrity	4fe3997df4	Top and middle banners for HoC 2017 ... Css animated top banner Middle banner of activities - responsive https://github.com/LLK/scratchr2/issues/4869 Also updated ttt see-more/open- modal link to be consistent with the new icon from Carl.	2017-11-03 16:50:26 -04:00
Matthew Taylor	8489918805	resolve typo ... I think this happened when I was resolving a merge conflict, and I confused the naming from previous/new along the way. Thanks @jwzimmer! Fixes #1652	2017-11-03 10:16:01 -04:00
Matthew Taylor	a1da26b0c9	Point at @GulpTea’s avatar	2017-10-30 08:39:42 -04:00
Matthew Taylor	18f82fce3f	Merge branch 'issue/gh-1546' into develop ... * issue/gh-1546: Make api request on filter change render load more even if messages not there # Conflicts: # src/views/messages/container.jsx # src/views/messages/presentation.jsx	2017-10-26 08:41:54 -04:00
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
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	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	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
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
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
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	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	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	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
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	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	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	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
Matthew Taylor	6493052725	Use username, not user id, for profile link	2017-09-05 09:10:41 -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	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
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
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	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	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
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	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
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
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
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
Andrew Sliwinski	a16a189a7f	Update compatibility requirements to clarify support for ChromeOS	2017-06-26 09:42:56 -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
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	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	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	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	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	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
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
The_Grits	f901d3b429	Restyle the Download Page	2017-05-03 16:19:56 -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
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	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	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
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	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	3a299e06f7	Merge pull request #1240 from TheGrits/patch-3 ... Fix gh-1239: Update Conference Dates	2017-03-22 08:32:54 -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	46a3cea40c	Fix gh-1234: Update China Conference	2017-03-02 22:14:26 -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	c26e42f715	Change parenthesis	2017-02-28 09:34:20 -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
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	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
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	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
Matthew Taylor	674270483d	Fix title for conference in China ... Also add 2017 to date	2017-02-17 17:28:51 -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	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
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
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	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	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	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	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
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	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
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
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
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
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	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	9ae4e5a963	Move validationRequired into general ... thanks @rschamp!	2016-12-07 17:24:48 -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
The_Grits	52a57b05a7	Localize Search Header	2016-11-22 12:15:17 -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
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
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	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	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	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
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	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
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
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
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
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
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
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
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
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	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	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
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
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	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
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	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	278f7c8819	more tweaks	2016-08-23 09:26:21 -06:00
Technoboy10	cca9b4a7ed	style tweaks	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	db2b7ebc34	Merge pull request #851 from St19Galla/patch-1 ... Fix GH-850 // Add image links	2016-08-19 06:42:40 -04:00
St19_Galla	43bcbaf2ac	what was i thinking lol	2016-08-17 18:30:39 -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
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	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	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	537104c56b	Add username validation to student complete registration ... Fixes #760	2016-08-12 08:10:20 -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
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
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
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	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
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	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
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
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
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
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	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	19d67dc0b4	Resurrect old invite step design for new users	2016-07-27 19:32:08 -04:00
Ray Schamp	d1f73c3ef4	Redesign invite step, add option to log out ... Resolves #752	2016-07-27 10:24:37 -04:00
Matthew Taylor	806fd25e46	Move to the view ... thanks @rschamp!	2016-07-26 17:03:41 -04:00
Technoboy10	2a5f330884	hide intro if not desktop width	2016-07-26 11:29:45 -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
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	a9def9c1ae	tweak splash to not be terrible on mobile	2016-07-22 14:53:39 -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	a4dd1611d1	Add student registration update view	2016-07-21 21:08:06 -04:00