1272 commits

Author	SHA1	Message	Date
Ray Schamp	5b288e4d3e	Merge pull request #648 from rschamp/feature/username-clarity ... Clarify username field is not for logging in	2016-06-30 16:17:14 -04:00
Ray Schamp	0816b0ec0f	Clarify username field is not for logging in	2016-06-30 16:16:31 -04:00
Connor Hudson	7f3af0f8be	Merge pull request #639 from technoboy10/gh637-relativepaths ... Fix GH-637: Make links to help and tips window relative	2016-06-30 15:57:43 -04:00
Ray Schamp	a0a82ef5a7	Merge pull request #646 from rschamp/bugfix/608 ... Fix localization of address validation message	2016-06-30 15:55:26 -04:00
Ray Schamp	554e21cd15	Fix localization of address validation message ... Fixes #608	2016-06-30 15:54:32 -04:00
Matthew Taylor	5cc6eb3ecb	use empty string if no cookie value found ... redux doesn't like getting null values for actions, so give empty ones /cc @rschamp	2016-06-30 15:29:53 -04:00
Matthew Taylor	300831c1e1	Merge pull request #641 from mewtaylor/issue/gh-636-tfaq-link ... Fix GH-636: point landing page to teacher faq page	2016-06-30 13:48:57 -04:00
Matthew Taylor	2017e1573d	point landing page to teacher faq page ... Fixes #636	2016-06-30 13:37:12 -04:00
Matthew Taylor	04aa7e01ef	check for the null value in get ... thanks @rschamp!	2016-06-30 11:40:05 -04:00
Matthew Taylor	794c3e2cba	Set null contents to null instead of error throw ... Before, if a cookie didn't exist, it would throw an error, not causing permissions/tokens to change to empty values. This fixes that (and #626) by setting the value to undefined instead.	2016-06-30 11:27:46 -04:00
Technoboy10	b5bf0298d7	Make s.m.e links relative	2016-06-30 10:06:10 -04:00
Technoboy10	088eb7cc66	inherit width on iframe	2016-06-30 09:46:39 -04:00
Technoboy10	b0f0bce211	enable fullscreen, fix border radius and aspect ratio	2016-06-30 09:43:24 -04:00
Matthew Taylor	f2b8e9025d	switch ordering in defaults ... This was assigning `props` to defaults, rather than the other way around. Fixes #618.	2016-06-30 08:00:40 -04:00
Matthew Taylor	b874d05bda	Override devault input style for login ... so that it looks like it used to, and not to tall. Fixes #618.	2016-06-29 14:54:00 -04:00
Matthew Taylor	9fb6170569	style error-step like last-step ... Since they're both mostly info cards. Fixes #627.	2016-06-29 14:08:16 -04:00
Connor Hudson	9bafdf6067	Merge pull request #619 from technoboy10/darken-dropdown ... Darken Account Nav Link when Menu Open	2016-06-29 13:31:27 -04:00
Technoboy10	41d9b1f526	use classNames before return	2016-06-29 13:24:37 -04:00
Matthew Taylor	8f60b020cb	fix educator faq link ... `info` is not in there anymore	2016-06-29 12:35:53 -04:00
Matthew Taylor	19bbd5ae7b	Link icon to splash page ... fixes #623	2016-06-29 10:53:55 -04:00
Connor Hudson	42ccc6c0a0	Merge pull request #622 from technoboy10/gh620-coming-soon ... Fix GH-620: Replace "Request account" with "Coming Soon"	2016-06-29 10:41:28 -04:00
Technoboy10	ce4069fdb1	tweak padding	2016-06-29 09:56:15 -04:00
Technoboy10	db039739dd	change request account button to coming soon	2016-06-29 09:51:23 -04:00
Connor Hudson	221170a9ff	Merge pull request #616 from technoboy10/gh537-dropdown-gap ... Fix GH-537: Logged-in user dropdown gap	2016-06-29 08:58:16 -04:00
Technoboy10	52d834c3fa	darken account nav link when menu open	2016-06-28 21:10:33 -04:00
Matthew Taylor	7bb52c25fe	move permissions checks to mirror session more ... thanks @rschamp!	2016-06-28 14:25:11 -04:00
Technoboy10	c4a98c5571	close gap, use border-box for box-sizing	2016-06-28 13:50:58 -04:00
Matthew Taylor	f2310170b2	Add permissions dispatch for WillReceiveProps ... We still need `componentWillMount` to handle the initial render for a logged in teacher first visting the page. Fixes issue in which a teacher would not see the banner immediately after dynamic login.	2016-06-28 13:30:36 -04:00
Matthew Taylor	16fe86b2fd	Fix scratch ed links ... they are not domain agnostic. fyi @rschamp	2016-06-28 08:35:01 -04:00
Matthew Taylor	c5f85022f3	Copy edits for conference site	2016-06-28 07:51:49 -04:00
Matthew Taylor	91de6f7912	Merge pull request #614 from mewtaylor/issue/gh-611-teacher-banner ... Fix GH-611: Connect `TeacherBanner` to redux	2016-06-27 22:40:13 -04:00
Technoboy10	5f62e5ffaf	scoping tweak	2016-06-24 11:42:35 -04:00
Matthew Taylor	c4a365a0e8	Connect TeacherBanner to redux ... whoops! Thanks @rschamp. Fixes #611	2016-06-24 11:40:50 -04:00
Technoboy10	172dd3cd62	set the size of the language chooser	2016-06-24 11:34:11 -04:00
Matthew Taylor	ef881a07f9	Merge pull request #610 from mewtaylor/cleanup/teacher-styling ... styling cleanup for teacher registration	2016-06-24 11:25:25 -04:00
Connor Hudson	49edaf0247	Merge pull request #609 from technoboy10/gh605-language-dropdown-state ... Fix GH-605: Make languagechooser keep locale state	2016-06-24 11:22:54 -04:00
Matthew Taylor	97516b1e1d	styling cleanup for teacher registration ... some scoping, as well as class labeling	2016-06-24 11:19:41 -04:00
Technoboy10	93054cf393	change from defaultValue to value because of formsy	2016-06-24 11:13:05 -04:00
Connor Hudson	5724a4c609	Merge pull request #606 from technoboy10/gh604-localize-educator-landing ... Fix GH-604: Localize Educator Landing Page	2016-06-24 10:51:34 -04:00
Technoboy10	0277b96698	move teacher accounts string to general	2016-06-24 10:39:55 -04:00
Technoboy10	3d18f04a43	localize educator landing page	2016-06-24 10:05:44 -04:00
Matthew Taylor	633fee162a	Merge pull request #603 from TheGrits/patch-2 ... Fix gh-602: Remove Community Counselor	2016-06-24 08:58:10 -04:00
Connor Hudson	5cb46b1579	Merge pull request #601 from technoboy10/educator-landing ... Fix GH-311: Educator landing page	2016-06-24 08:21:02 -04:00
Matthew Taylor	ebf45c6f1d	Fix linting errors ... Signed-off-by: Connor Hudson <technoboy10@fake.email>	2016-06-24 08:13:32 -04:00
Matthew Taylor	92883d3cbe	swap logos in conference footer	2016-06-23 22:46:11 -04:00
The_Grits	f233f660b0	Fix gh-602: Remove Community Counselor	2016-06-23 18:28:24 -04:00
Connor Hudson	1da0978029	routes.json	2016-06-23 17:26:28 -04:00
Connor Hudson	53eb56c1df	style tweaks	2016-06-23 17:23:35 -04:00
Matthew Taylor	e71aff5df1	Merge pull request #594 from St19Galla/develop ... Navbar issues; :hover	2016-06-23 17:20:44 -04:00
St19_Galla	49f6a6bee2	Update navigation.scss ... Changed padding rather than height	2016-06-23 17:06:40 -04:00
Matthew Taylor	74bd2b3255	Merge pull request #599 from mewtaylor/feature/teacher-registration-flow ... [Updates] Teacher registration flow	2016-06-23 16:48:58 -04:00
Connor Hudson	7de13d029b	get rid of carousel, make things centered if they need it	2016-06-23 15:46:02 -04:00
Matthew Taylor	0c1abada3a	Small tweaks ... 1. left-align form elements even in mobile 2. Bolden input labels, except for checkboxes and radio elements /cc @carljbowman	2016-06-23 15:44:14 -04:00
Andrew Sliwinski	89f8434d71	Move GA tracking code into page head	2016-06-23 15:34:47 -04:00
Matthew Taylor	6aeee284bc	style waiting room ... also "deep purple" :)	2016-06-23 15:25:22 -04:00
Matthew Taylor	86a8f94919	some code formatting tweaks	2016-06-23 15:10:51 -04:00
Matthew Taylor	10f154ca10	accidentally took this out	2016-06-23 15:10:41 -04:00
Matthew Taylor	f00aedd17e	linter error	2016-06-23 14:27:42 -04:00
Matthew Taylor	1a08e7ae49	Finalize styling for registration flow ... /cc @carljbowman One issue we ran into is that our `frameless` configuration is in `em` rather than `rem`, making it difficult to have an aboslute grid applied uniformly at all hierarchies. For now, we're using straight `rem` calculations instead of `$cols{1,8}` in the styling until we can refactor `frameless` to use `em`.	2016-06-23 14:06:36 -04:00
Connor Hudson	6d3d8b7446	more styling	2016-06-23 13:48:18 -04:00
Connor Hudson	c52a6e16e9	attempted mobile styling	2016-06-23 13:18:45 -04:00
Matthew Taylor	1910d38bc6	Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow ... * 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www: Add teacher waiting room view Only pass necessary props to steps # Conflicts: # src/components/registration/steps.jsx # src/views/teacherregistration/teacherregistration.jsx	2016-06-23 07:35:06 -04:00
Matthew Taylor	8fb16bf397	Add formatting for teacher reg flow	2016-06-23 07:27:43 -04:00
Connor Hudson	3624e18e08	inherit line height, remove margin	2016-06-22 16:58:58 -04:00
Connor Hudson	230cadffa5	more styling, carousel	2016-06-22 16:48:58 -04:00
Ray Schamp	93ed60cd0d	Add teacher waiting room view	2016-06-22 13:35:38 -04:00
Connor Hudson	9c14f7cb3f	create landing page	2016-06-22 13:18:19 -04:00
St19_Galla	ab2dc47921	Update navigation.scss	2016-06-22 11:22:30 -04:00
Ray Schamp	de8ac6c56a	Only pass necessary props to steps ... Rather than lazily including all form progress to every step, just give each step what it needs.	2016-06-21 18:45:41 -04:00
carljbowman	ee8d6bf0c5	Update Jobs page ... - Add 'Web Designer' position - Adjusted typography to match new Type Standards - Add Hex Value to Colors for consistency	2016-06-21 15:00:51 -04:00
Matthew Taylor	9d6fb63d18	Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow ... * 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www: (46 commits) Add serverside email validation Clean up Move registration step to main component Submit the rest of the fields when registering This help text is redundant now Fix organization "other" field enablement Get the form creating regular accounts Add method to api for submitting forms Update language chooser for formsy Add missing string Add progress indicators Style pass Remove unused label component Remove unused mixin factory Fixup api refactor Add serverside username validation L10n pass Explain the GeneralError component Add help text when a field is not required L10n WIP ... # Conflicts: # src/l10n.json # src/views/splash/splash.jsx	2016-06-17 15:32:49 -04:00
Connor Hudson	5d12e5773d	Merge pull request #584 from technoboy10/gh554-localize-faq ... Fix GH-554: Localize FAQ title	2016-06-17 14:47:46 -04:00
Matthew Taylor	b337b47590	Merge pull request #586 from mewtaylor/issue/conference-updates ... Fix GH-[571,563] – updates to the conference site	2016-06-17 14:14:53 -04:00
Ray Schamp	bf76e88ca2	Add serverside email validation	2016-06-17 13:01:53 -04:00
Ray Schamp	11b9876930	Clean up	2016-06-17 12:22:29 -04:00
Ray Schamp	078463ac25	Move registration step to main component ... Add a placeholder error step	2016-06-17 12:22:11 -04:00
Ray Schamp	8646bd84b3	Submit the rest of the fields when registering	2016-06-17 11:01:34 -04:00
Ray Schamp	532a1cce57	This help text is redundant now	2016-06-17 11:01:10 -04:00
Ray Schamp	ad5da0f543	Fix organization "other" field enablement	2016-06-17 11:00:48 -04:00
Matthew Taylor	f0b178c290	Merge pull request #583 from mewtaylor/issue/gh-541-faq-schools ... Fix GH-541: Add "schools" section to faq	2016-06-17 09:39:41 -04:00
Ray Schamp	d7ca0166ab	Get the form creating regular accounts	2016-06-16 17:25:14 -04:00
Ray Schamp	26e1ee553b	Add method to api for submitting forms ... Some of our legacy endpoints expect this style rather than json. Also clean up the way useCsrf works — don't always set json attribute to an empty object.	2016-06-16 17:24:31 -04:00
Matthew Taylor	32e9b089c5	updates to the conference site ... 1. new collaborators 2. new sold out language 3. some copy edits	2016-06-16 17:07:22 -04:00
Ray Schamp	d27b0a2433	Update language chooser for formsy	2016-06-16 16:31:13 -04:00
Ray Schamp	9a3b83f8c6	Add missing string	2016-06-16 16:30:59 -04:00
Connor Hudson	1e571d0e2d	localize FAQ title	2016-06-16 15:11:43 -04:00
Matthew Taylor	f5cbdfa2c9	Merge pull request #582 from mewtaylor/issue/teacher-faq ... Add teacher faq page	2016-06-16 11:31:29 -04:00
Connor Hudson	c188a268e2	Merge pull request #568 from TheGrits/patch-1 ... Fix gh-555: Squished News Icons	2016-06-16 11:17:44 -04:00
Ray Schamp	e062096445	Add progress indicators	2016-06-16 10:54:36 -04:00
Matthew Taylor	b13a388425	Fix typo ... thanks @technoboy10!	2016-06-16 10:54:35 -04:00
Matthew Taylor	8ef3acd5d9	Merge pull request #560 from mewtaylor/issue/gh-556-footer ... Fix GH-556: Add "For Developers" to the footer	2016-06-16 10:28:19 -04:00
Matthew Taylor	098bc8618a	Merge pull request #577 from mewtaylor/issue/gh-573-grid-align ... Fix GH-573: center align grid while left aligning projects	2016-06-16 10:24:53 -04:00
Matthew Taylor	b828200e94	add teacher faq page	2016-06-16 10:22:37 -04:00
Matthew Taylor	2ea2cfa6c5	Add "schools" section to faq	2016-06-15 15:22:41 -04:00
Ray Schamp	1fba322d01	Style pass	2016-06-15 15:08:56 -04:00
Matthew Taylor	626b3f008e	Merge branch 'develop' of https://github.com/LLK/scratch-www into issue/gh-543-teacher-banner ... * 'develop' of https://github.com/LLK/scratch-www: (29 commits) Add explore redirects Allow access to 2014 and 2015 pages use route aliases for generalizable route patterns remove `/components` from `routes.json` Remove Make it Fly banner Fix issues in FAQ of /developers page. move shuffle to utility module fix error with shuffleArray function add shuffleArray function, shuffle most loved and most remixed use `image` to get studio thumbnail quick formatting fix for box header on search Fix merge issue Add localizations, minor style changes Removed rows from grid, changed explore tabs Removed extraneous image file Whitespace added Small fix Support for studios Refactoring, new grid component Style changes ... # Conflicts: # src/views/splash/splash.jsx # src/views/splash/splash.scss	2016-06-15 09:45:05 -04:00
Matthew Taylor	2193914650	center align grid while left aligning projects ... Fixes #573	2016-06-15 09:34:15 -04:00
Matthew Taylor	311f431ca1	Add explore redirects ... for `/explore`, `/explore/projects` and `/explore/studios` to `/explore/<projects|studios>/all`	2016-06-15 08:19:27 -04:00
Ray Schamp	fb57c25afd	Remove unused label component	2016-06-14 17:47:56 -04:00
Ray Schamp	333d52d2b6	Remove unused mixin factory	2016-06-14 17:41:12 -04:00
Ray Schamp	dffea48299	Fixup api refactor ... Updates after a rebase	2016-06-14 17:33:54 -04:00
Ray Schamp	8da8ab4100	Add serverside username validation ... With this we get cleanspeak for free	2016-06-14 17:29:31 -04:00
Ray Schamp	8dac67f292	L10n pass	2016-06-14 17:29:31 -04:00
Ray Schamp	97c4e9beb9	Explain the GeneralError component	2016-06-14 17:29:31 -04:00
Ray Schamp	f74a078afb	Add help text when a field is not required ... Most of our fields are required, so it makes more sense to display help when they are optional than to asterisk every required field	2016-06-14 17:29:31 -04:00
Ray Schamp	667ff08a36	L10n WIP	2016-06-14 17:29:31 -04:00
Ray Schamp	ce007d64f8	Change password confirmation to "show password"	2016-06-14 17:29:30 -04:00
Ray Schamp	4e0d54df98	Split up concerns of form progression and display ... Still thinking of a good name for the form "card" component...	2016-06-14 17:29:30 -04:00
Ray Schamp	da2a4ce48c	Add bot honeypot	2016-06-14 17:29:30 -04:00
Ray Schamp	cfa85427b1	Add address validation	2016-06-14 17:29:30 -04:00
Ray Schamp	f8037f6767	Lint	2016-06-14 17:29:30 -04:00
Ray Schamp	d7df1e980f	Move api mixin to lib, remove mixin ... The mixin doesn't gain us anything except complexity	2016-06-14 17:29:30 -04:00
Ray Schamp	56e16bc0dc	Actually provide every state in world choice	2016-06-14 17:29:30 -04:00
Ray Schamp	0512b614be	Fixup use iso	2016-06-14 17:29:29 -04:00
Ray Schamp	0206a4da9d	Lint	2016-06-14 17:29:29 -04:00
Ray Schamp	f126a71336	Use iso-31660-2 package for country data	2016-06-14 17:29:29 -04:00
Ray Schamp	9da2bb29a8	Base phone and address country on user country	2016-06-14 17:29:29 -04:00
Ray Schamp	3ea1c64184	Split out steps from the view	2016-06-14 17:29:29 -04:00
Ray Schamp	0f3485534b	Organize form data into objects	2016-06-14 17:29:29 -04:00
Ray Schamp	fe74208f32	Add international phone validation	2016-06-14 17:29:29 -04:00
Ray Schamp	bcda082014	Add validation to the rest of the form	2016-06-14 17:29:29 -04:00
Ray Schamp	175a71711d	Update existing forms on the site to use formsy ... Or not in the case of the search form	2016-06-14 17:29:29 -04:00
Ray Schamp	b5c615b1fa	Use formsy-react for validation ... Complete validation for username/password form (except for checking if a username exists).	2016-06-14 17:27:53 -04:00
Ray Schamp	de3151924c	Lint	2016-06-14 17:27:53 -04:00
Ray Schamp	1eaf6effcc	Tiny bit of style	2016-06-14 17:27:53 -04:00
Ray Schamp	04c8650512	Allow other types other than form in FormStep	2016-06-14 17:27:53 -04:00
Ray Schamp	2ca846f826	Use Scratch components for the form and clean up	2016-06-14 17:27:52 -04:00
Ray Schamp	350a573fc5	Move formset into forms	2016-06-14 17:27:52 -04:00
Ray Schamp	17a3f1ebcb	Add initial form data	2016-06-14 17:27:52 -04:00
Ray Schamp	68d49a84dc	Update FormSet to advance steps onSubmit	2016-06-14 17:27:52 -04:00
Ray Schamp	144d6e3754	wip	2016-06-14 17:27:52 -04:00
Ray Schamp	a080b2b64f	wip	2016-06-14 17:27:52 -04:00
Matthew Taylor	60187d4a75	Allow access to 2014 and 2015 pages	2016-06-14 12:42:13 -04:00
Matthew Taylor	dfc4f9574d	use route aliases for generalizable route patterns ... 1. match all `^/explore` to www 2. match all `^/search` to www 3. match all `^/conference` to www	2016-06-14 11:28:20 -04:00
Matthew Taylor	45d78b9c7c	remove /components from routes.json ... It's a dev-only route, and is in `dev-routes.json` already	2016-06-14 11:26:17 -04:00
The_Grits	1785c767b4	whoops	2016-06-13 15:37:31 -04:00
The_Grits	554dcb100c	Fix gh-555: Squished News Icons	2016-06-13 15:06:41 -04:00
Ray Schamp	01b662f77f	Merge pull request #567 from rschamp/hotfix/remove-banner ... [Develop] Remove Make it Fly banner	2016-06-13 14:43:37 -04:00
Ray Schamp	e2dcd6c647	Remove Make it Fly banner ... This reverts commit 7cf3846231, reversing changes made to afe14ebe88.	2016-06-13 14:35:08 -04:00
Andrew Sliwinski	e05572dc0a	Fix issues in FAQ of /developers page.	2016-06-13 11:38:11 -04:00
Matthew Taylor	e04b314656	remove dashes ... Thanks @rschamp!	2016-06-13 10:07:00 -04:00
Matthew Taylor	5b73c4192d	change name to getUnsignedValue ... thanks @rschamp!	2016-06-13 10:06:43 -04:00
Matthew Taylor	0c2a73a910	Don't use dash in name ... It's used for grouping in `build-locales`.	2016-06-13 09:41:12 -04:00
Connor Hudson	fde193ca06	move shuffle to utility module	2016-06-13 09:40:32 -04:00
Matthew Taylor	e5f274933b	Add final copy for teacher account banner	2016-06-13 07:47:43 -04:00
Connor Hudson	3d6a95e84b	fix error with shuffleArray function	2016-06-09 17:33:49 -04:00
Connor Hudson	04166ab423	add shuffleArray function, shuffle most loved and most remixed	2016-06-09 17:22:31 -04:00
Matthew Taylor	e5467e5f45	Add "For Developers" to the footer ... Fixes #556	2016-06-09 11:54:14 -04:00
Matthew Taylor	ef0037942e	use image to get studio thumbnail ... same as with `project`	2016-06-09 09:44:09 -04:00
Matthew Taylor	b065ed5254	quick formatting fix for box header on search	2016-06-09 07:57:41 -04:00
Matthew Taylor	365c3d0bad	Fix merge issue	2016-06-09 07:44:28 -04:00
Matthew Taylor	9fad938eb8	Add localizations, minor style changes	2016-06-09 07:32:25 -04:00
Matthew Taylor	ac17850491	Add teacher banner to splash page ... This only shows if the logged in user is a teacher, and persists for teachers.	2016-06-08 13:47:11 -04:00
Matthew Taylor	0894724dfd	Merge branch 'develop' of https://github.com/rthorn/scratch-www into feature/explore-from-rthorn ... * 'develop' of https://github.com/rthorn/scratch-www: Removed rows from grid, changed explore tabs Removed extraneous image file Whitespace added Small fix Support for studios Refactoring, new grid component Style changes Changed path of search page to allow for studio tabs Changes to path for search results Removed unnecessary files Search page functions Starting mock of search page Fixed problem with loading Load button and tabs functioning Merge remote-tracking branch 'LLK/develop' into develop Early Explore Page # Conflicts: # src/components/navigation/www/navigation.jsx	2016-06-07 09:06:01 -04:00
Matthew Taylor	bf1fa2934d	Merge pull request #552 from mewtaylor/bugfix/mobile-nav-conference ... [Develop] hotfix: mobile nav conference	2016-06-06 11:01:12 -04:00
Connor Hudson	8022d76aaa	Merge pull request #553 from technoboy10/gh548-signout ... Fix GH-548: Sign out should take effect before reload	2016-06-06 09:06:36 -04:00
Connor Hudson	75ce6378a2	remove comment	2016-06-06 08:46:28 -04:00
Connor Hudson	9c66939bc3	use defaults instead of defaultsDeep	2016-06-06 08:45:35 -04:00
Matthew Taylor	fb4464d0d4	Correction for Nichole Pinkard's name on /expect ... Apologies for the copy error!	2016-06-06 08:32:48 -04:00
Matthew Taylor	fce41dc32e	use row wrap instead of columns ... apparently mobile doesn't like columns as much as row wrap for flexbox.	2016-06-06 08:29:51 -04:00
Matthew Taylor	bcec3d8fc6	Merge pull request #549 from mewtaylor/bugfix/conference-schedule ... [Develop] Hotfix: conference schedule bug fixes	2016-06-03 19:52:16 -04:00
Matthew Taylor	c8f6c36b1f	Fix schedule formatting ... 1. Sort schedule by 24-hour time to handle 12-o-clock 2. Sort chunks by type AND time, since multiple chunks have the same name	2016-06-03 19:43:53 -04:00
Connor Hudson	5bd1f4f2ac	add container div to fix dmca	2016-06-03 15:02:55 -04:00
Connor Hudson	245c9cbe4f	Merge pull request #542 from technoboy10/gh307-newstatic ... Fix GH-307: Restyle FAQ and legal pages	2016-06-03 14:31:08 -04:00
Technoboy10	acea4f4df1	move imports into .information-page	2016-06-03 14:16:17 -04:00
Technoboy10	fea1fc611f	restrict styles to only informationpage element	2016-06-03 14:14:45 -04:00
Technoboy10	9853f5ba5a	Move all styling into the InformationPage component	2016-06-03 14:02:29 -04:00
Connor Hudson	86e4dd6ce8	Another results -> session fix	2016-06-02 10:04:54 -04:00
Connor Hudson	292a9773fc	fix session.js	2016-06-01 17:23:19 -04:00
Connor Hudson	f280d1d8df	Remove quotes around keys, results -> session	2016-06-01 17:22:11 -04:00
Connor Hudson	11621564f6	why hello there, travis	2016-06-01 17:11:18 -04:00
Connor Hudson	6f39466d9f	Reduxified	2016-06-01 17:07:21 -04:00
Connor Hudson	fd1401fe1b	used stricter comparison	2016-06-01 16:14:58 -04:00
Connor Hudson	4d65d478ed	change to more extensible session	2016-06-01 15:28:18 -04:00
Connor Hudson	00ac15d475	add test, tweak terms	2016-06-01 12:05:03 -04:00
Connor Hudson	1178a50beb	restyle all the things	2016-06-01 11:57:50 -04:00
Connor Hudson	10a4dc656e	fix travis	2016-06-01 10:49:59 -04:00
Connor Hudson	e402363576	initial pass	2016-05-31 16:37:42 -04:00
Ray Schamp	7fb512f4a8	Merge pull request #531 from rschamp/feature/cn-banner ... [Develop] Homepage module	2016-05-31 12:25:16 -04:00
Ray Schamp	3632f3dc1d	Merge branch 'release/2.2.9' into develop	2016-05-31 12:24:21 -04:00
Ray Schamp	7cf3846231	Merge pull request #530 from rschamp/feature/cn-banner ... [Master] Homepage module	2016-05-31 10:18:20 -04:00
Ray Schamp	89bdeff631	Don't break up navigation on mobile	2016-05-31 09:32:04 -04:00
Ray Schamp	0335fe1275	Merge pull request #516 from rschamp/upgrade/react-15 ... Upgrade to React 15	2016-05-31 09:23:49 -04:00
Matthew Taylor	932dab40c7	Some additional mobile changes	2016-05-29 11:59:53 -04:00
Matthew Taylor	6eeebe05c3	Merge pull request #525 from mewtaylor/issue/conference-tweaks ... For GH-497: conference tweaks for fallout from schedule/typography	2016-05-27 16:40:39 -04:00
Matthew Taylor	ad1e723188	Drop the text below the button ... thanks @carljbowman!	2016-05-27 16:35:23 -04:00
Matthew Taylor	011032308c	Consolidate text ... thanks @carljbowman !	2016-05-27 16:19:51 -04:00
Matthew Taylor	c351d54e9b	fix lint warning ... thanks @rschamp!	2016-05-27 16:02:38 -04:00
Matthew Taylor	74ac6e52bb	conference formatting tweaks for mobile ... thanks @carljbowman!	2016-05-27 15:55:27 -04:00
Matthew Taylor	b07b61c925	Update conference to reflect being sold out	2016-05-27 15:55:08 -04:00
Ray Schamp	45abaff962	Fix account links on Privacy Policy page	2016-05-27 14:33:12 -04:00
Ray Schamp	992f6d7481	Update footer and nav styles per @carljbowman	2016-05-27 12:02:22 -04:00
Ray Schamp	986341341b	Fix line height and wrapping on splash components	2016-05-27 11:46:35 -04:00
The_Grits	4f75713bd5	Update privacypolicy.jsx	2016-05-27 09:56:56 -04:00
Connor Hudson	a4f15f4ec8	Merge pull request #510 from technoboy10/gh507-scheduleanchor ... Fix gh-507: Consistently change URI	2016-05-26 16:59:44 -04:00
Connor Hudson	59f4d303c6	Merge pull request #512 from TheGrits/patch-1 ... Fix gh-29: Migrate Terms of Use	2016-05-26 16:15:21 -04:00
Ray Schamp	2a01ebee84	Fix search button display ... Update search form submit button from an input[type=submit] to a button. React 15 omits the value prop if it's blank, so the `<input type="submit" value="">` was rendered as `<input type="submit">`. This caused the input to display the default value of "Submit". The button element is more appropriate for this behavior and doesn't have the missing value issue.	2016-05-26 16:00:28 -04:00
Ray Schamp	c966f8a0ba	Fix modal layout ... The styles in the upgraded react-modal broke our centering. The auto-focusing on the modal made an annoying blue border around it in Chrome.	2016-05-26 16:00:28 -04:00
Ray Schamp	fe08f8c18f	Update final graphic	2016-05-26 14:38:56 -04:00
Ray Schamp	18bb2357c6	Update final copy and links	2016-05-26 14:10:59 -04:00
The_Grits	62f8978edc	Update route	2016-05-26 11:31:54 -04:00
The_Grits	f3fafb7b3a	Rename and Update	2016-05-26 11:31:16 -04:00
The_Grits	9bd63bd11a	Spacing	2016-05-26 11:23:17 -04:00
Ray Schamp	d1f675374b	Localize banner	2016-05-24 17:30:48 -04:00
Ray Schamp	a0a30155af	Hide components route in production	2016-05-24 17:15:03 -04:00
Ray Schamp	448bb8aa3f	Add Power Puff Girls banner	2016-05-24 17:14:12 -04:00
Matthew Taylor	87ce6db1cd	generalize pdf check ... thanks @rschamp! fyi, I left it in cards only because I'm not sure that we really do this `(English)` thing anywhere else.	2016-05-24 14:27:16 -04:00
Matthew Taylor	ffc1e8d0ca	Fix pdf localization check ... It was adding the `(English)` suffix no matter what. This fixes it by getting the locale from props, and also by making the conditional check a bit more safe.	2016-05-24 13:09:34 -04:00
The_Grits	7948c8bbc4	Hello Travis	2016-05-24 10:21:19 -04:00
The_Grits	ac96ffc6f6	Squash and Merge	2016-05-24 10:05:17 -04:00
Connor Hudson	e73b26b686	fix spacing issues ... Fixes Travis testing	2016-05-23 15:35:05 -04:00
Technoboy10	a3fda6be30	use single quotes to appease travis	2016-05-23 14:28:34 -04:00
Technoboy10	6bddc8d2d3	replace anchor when schedule day clicked	2016-05-23 14:10:09 -04:00
Technoboy10	0b6b81e1f1	Merge branch 'release/2.2.9' of https://github.com/llk/scratch-www into release/2.2.9	2016-05-23 10:48:29 -04:00
Technoboy10	b020964ef4	add media query to center links	2016-05-23 10:48:11 -04:00
Connor Hudson	173a7bc52a	Merge pull request #508 from technoboy10/gh505-schedulebackground ... Fix gh-505: Incorrect time header background	2016-05-23 10:25:02 -04:00
Technoboy10	7bb9c622c7	set time headers to correct color	2016-05-23 10:10:31 -04:00
The_Grits	e41f8b8635	Footer Press link	2016-05-20 12:05:22 -04:00
Matthew Taylor	a477be4814	Some more cleanup ... 1. typo with splitting token/session out 2. redefine `chunk` as `timeSlot` 3. move timeSlot sorting into its own method	2016-05-19 17:37:51 -04:00
Matthew Taylor	337b6dcfca	fix lint warnings	2016-05-19 17:02:21 -04:00
Matthew Taylor	a860b27941	Some updates to the redux structure ... 1. split `auth.js` up so it's 1 reducer per file 2. consolidate the conference schedule reducers 3. make conference reducer names more descriptive 4. add error handling for `body === 'undefined'` Thanks @rschamp for all the help!	2016-05-19 16:55:25 -04:00
Matthew Taylor	bca90bd835	Add icons for schedule/details ... from @carljbowman	2016-05-19 16:40:30 -04:00
Matthew Taylor	d69de477a1	Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/conference-schedule ... * 'develop' of https://github.com/LLK/scratch-www: (32 commits) Lint Bundle all locale data Don't bundle polyfills Set up Raven within init.js Prefix privacyPolicy message string Exclude minified javascript from linting One space more Changes "interfacesto" to "interfaces to" Remove tag target Filter before mapping to avoid returning undefined Fix Pass condition for "static" routes Spacing2 Mangling is the default Spacing Update for typography fixes Cherry pick PR #476 into master Add invisible spacer to anchored sections For Developers Lint JSON, expand and simplify lint step Fix banned user redirect ... # Conflicts: # src/redux/actions.js # src/redux/reducer.js	2016-05-19 13:25:36 -04:00
Matthew Taylor	cad75217f0	Add schedule/detail components for conference	2016-05-19 11:34:59 -04:00
Matthew Taylor	b969c4e2ed	Split reducers into separate files ... Use a model of reducer/action files for each component that has them, and make `reducer.js` be the one that imports and configures all of them. This modeling is based on a few examples I've seen which seemed to work for our current case, but I'm totally fine with splitting actions and reducers into separate directories if we'd like too.	2016-05-19 11:34:28 -04:00
Matthew Taylor	4017266327	Fix typo	2016-05-19 11:26:11 -04:00
The_Grits	1b358b773e	Termsofuse route	2016-05-18 21:37:06 -04:00
Ray Schamp	b1be409dea	Merge pull request #491 from rschamp/bugfix/common-chunk-fallout ... Fix fallout from common chunk refactor	2016-05-17 23:17:06 -04:00
Ray Schamp	f9bb5592d4	Lint ... Remove min context, we don't use it anymore.	2016-05-17 21:09:18 -04:00
Ray Schamp	650b98c009	Bundle all locale data ... The npm installed version of react-intl does not include all locales, they must be added manually	2016-05-17 21:02:36 -04:00
Ray Schamp	884e9ff4a7	Don't bundle polyfills ... They are inherently global, so don't belong in the domain of webpack.	2016-05-17 21:02:36 -04:00
Ray Schamp	b65332c5d4	Set up Raven within init.js ... Now that Raven is bundled with webpack, it's not available in the global context, so require it and configure it within the init module. I struggled to figure out how to expose the raven-js module as a global, as all the combinations of `externals` and `ProvidePlugin` only applied to webpacked modules, not the global window. The correct way to do it seems to be exports-loader but that looked rather hacky and hard to understand.	2016-05-17 21:02:35 -04:00
Ray Schamp	219d144be2	Prefix privacyPolicy message string ... So that it matches the rest, and is localized. Not sure, but I think this was fallout from de-localizing the Privacy Policy page.	2016-05-17 21:01:49 -04:00
Ray Schamp	bb0ac87aec	Merge pull request #488 from TheGrits/patch-1 ... [Privacy Policy] One space more	2016-05-17 16:26:50 -04:00
Ray Schamp	dff9c3d128	Merge pull request #489 from technoboy10/patch-3 ... Hotfix: Resolve gh-484 (cosmetic issue in developers page)	2016-05-17 16:24:17 -04:00
Ray Schamp	f7e9b7ca38	Merge pull request #473 from rschamp/feature/lint ... Lint JSON and all of our .js and .scss	2016-05-17 16:01:55 -04:00
The_Grits	2d80c46c74	One space more ... I can't believe I missed this one earlier. *facepalm*	2016-05-17 15:46:20 -04:00
Connor Hudson	9808a31d9a	Changes "interfacesto" to "interfaces to"	2016-05-17 13:07:19 -06:00
Rachel Thornton	dc42b317e2	Removed rows from grid, changed explore tabs ... Grid component now no longer uses row concept, and changed tabs in the Explore page to projects/studios, with categories in a new picker above the tabs. Also compressed svg files.	2016-05-17 12:40:16 -04:00
Matthew Taylor	829cb6ff0c	Merge pull request #478 from mewtaylor/issue/gh-419 ... Fix GH-419: Some localization cleanup	2016-05-17 11:43:27 -04:00
Ray Schamp	0ede616f44	Merge pull request #481 from TheGrits/patch-2 ... Fix Spacing Issues on Privacy Policy	2016-05-17 11:03:11 -04:00
The_Grits	792a5c9622	Spacing2 ... Changed as per @rschamp's comments	2016-05-17 11:02:34 -04:00
Ray Schamp	7f275efdf0	Merge pull request #479 from rschamp/feature/common-chunk ... Move externals, polyfill and init to common chunk	2016-05-17 10:36:14 -04:00
The_Grits	834f2db463	Spacing ... I noticed some spacing issues on the page, I thought I would fix them.	2016-05-17 09:52:42 -04:00
Ray Schamp	6b420b4445	Update for typography fixes	2016-05-17 08:30:27 -04:00
Ray Schamp	b7dd55e7e0	Merge branch 'feature/for-developers' into develop	2016-05-17 08:28:25 -04:00
Matthew Taylor	89c2f2628e	Add invisible spacer to anchored sections ... so that the headers are visible	2016-05-17 08:24:03 -04:00
carljbowman	e885c08ea1	For Developers ... Add landing page for developers	2016-05-17 07:51:08 -04:00
Ray Schamp	b0b520fe18	Lint JSON, expand and simplify lint step	2016-05-16 13:02:55 -04:00
Ray Schamp	31c2f98afc	Fix banned user redirect	2016-05-16 13:02:55 -04:00
Ray Schamp	8f2697b7f1	Move externals, polyfill and init to common chunk ... This should allow us to define and update our dependencies more easily (via npm) as well as reducing the number of requests. Additionally, when we add common packages this will avoid the issue after deploys where a user may get a cached HTML page, but new Javascript, leading to the dreaded blank page because the browser didn't download all dependencies. Using mangle with UglifyJS also made the total file size for the common chunk bundle smaller than the current total for all of our external/polyfill scripts (1.18MB vs 1.55MB).	2016-05-16 12:59:58 -04:00
Matthew Taylor	82942b988d	Localize title of page after strings load ... This doesn't solve the issue of making it crawlable in other languages, but it does allow the title to be translatable for user parsing (and accessibility)	2016-05-16 10:55:51 -04:00
Matthew Taylor	4abebd8194	Remove duplicate About Scratch entry ... Towards #419 – makes "About Scratch" work on the About page. Additionally, removes `defaultMessages` from the footer since we no longer use those.	2016-05-16 10:19:52 -04:00
The_Grits	76c003d854	Lint fixes	2016-05-16 06:45:06 -04:00
The_Grits	5d05d19566	aha ... Does this fix the lint error?	2016-05-14 23:21:10 -04:00
The_Grits	c2fca9c4c6	Squash and Merge	2016-05-14 22:39:40 -04:00
The_Grits	f3439eba5c	Add privacypolicy route	2016-05-13 20:45:48 -04:00
Matthew Taylor	bf1b3f894d	Some leftovers ... Thanks @rschamp again!	2016-05-12 22:54:07 -04:00
Matthew Taylor	804a65e3d0	Whoops ... That change is coming later with more redux in conference :).	2016-05-12 18:39:33 -04:00
Matthew Taylor	82dbfabcec	Constrain view styles to within view name classes ... So that they don't affect styles declared outside the scope of the view. Thanks @rschamp!	2016-05-12 18:32:57 -04:00
Matthew Taylor	e1cebe46db	Ergonomics – get rid of typography file ... 1. Merge typography into main 2. Get rid of use of `#view` in scss 3. Make `render` work with conference pages	2016-05-12 18:05:26 -04:00
The_Grits	8d294e4d29	Float	2016-05-11 09:53:39 -04:00
Rachel Thornton	4b632e4f5f	Removed extraneous image file	2016-05-10 08:26:41 -04:00
Rachel Thornton	4a2a2c8ca2	Whitespace added	2016-05-10 08:22:48 -04:00
Rachel Thornton	577ed2c746	Small fix	2016-05-10 08:18:47 -04:00
Rachel Thornton	9c6475aed5	Support for studios ... Search and Explore now support studios, thought currently the api is not ready for them.	2016-05-10 08:16:46 -04:00
Rachel Thornton	d7c9057cbd	Refactoring, new grid component ... Significant refactoring of Explore and Search pages, including new grid component for displaying projects	2016-05-10 00:54:46 -04:00
The_Grits	75258be4a4	margin-right ... 4.4px is the max margin we can put to the right of the button without the "Forgot password?" text wrapping.	2016-05-09 11:27:22 -04:00
Matthew Taylor	fd1016059b	Merge branch 'patch-8' of https://github.com/TheGrits/scratch-www into TheGrits-patch-8 ... * 'patch-8' of https://github.com/TheGrits/scratch-www: Indent p element Edit spacing Whoops Squash and Merge Add DMCA route # Conflicts: # src/routes.json	2016-05-03 10:23:34 -04:00
Ray Schamp	fb292f3773	Merge pull request #466 from LLK/hotfix/analytics ... [Develop] Hotfix: Add missing env variables needed for the build	2016-05-02 14:01:55 -04:00
Ray Schamp	e48b04f907	Add missing env variables needed for build	2016-05-02 11:57:46 -04:00
Matthew Taylor	47d7257895	Merge pull request #462 from mewtaylor/hotfix/add-register-faq ... [Develop] Hotfix: Add Registration to FAQ	2016-05-01 12:48:41 -04:00
Rachel Thornton	fdd78a5433	Style changes ... Changes to style for lint tests	2016-04-30 16:38:48 -04:00
Rachel Thornton	eb499c929c	Changed path of search page to allow for studio tabs ... Users and Forum tabs removed	2016-04-30 16:03:11 -04:00
Rachel Thornton	e2a7698cde	Changes to path for search results ... No longer uses google_results in url Also now has correct link to project page from clicking on projects in explore and search	2016-04-30 14:50:11 -04:00
Rachel Thornton	bca374b88f	Merged changes to routing, separated Tabs into a component	2016-04-30 14:07:11 -04:00
Rachel Thornton	74a6d132bd	Search page functions	2016-04-30 11:44:10 -04:00
Matthew Taylor	c28f90857b	Add registration faq question	2016-04-29 17:37:41 -04:00
Matthew Taylor	07bbc38822	Merge pull request #433 from TheGrits/patch-7 ... Fix gh-19: Migrate Community Guidelines	2016-04-29 17:32:35 -04:00
The_Grits	20dcf8eb4f	switch	2016-04-29 17:27:39 -04:00
The_Grits	64143704d5	Thanks Travis ... Got rid of a trailing space	2016-04-29 17:22:49 -04:00
The_Grits	aaf4ee5b49	oops lol ... Gotta love those duplicate lines!	2016-04-29 17:18:09 -04:00
The_Grits	09775ad4a5	Squash and Merge	2016-04-29 17:15:26 -04:00
Matthew Taylor	cc8f53939d	Merge branch 'patch-3' of https://github.com/TheGrits/scratch-www into TheGrits-patch-3 ... * 'patch-3' of https://github.com/TheGrits/scratch-www: Disable mobile Safari phone numbers	2016-04-29 16:39:42 -04:00
Matthew Taylor	87009babae	Merge pull request #431 from TheGrits/patch-6 ... Fix gh-426: Update Project Count	2016-04-29 16:38:02 -04:00
Ray Schamp	fbaa2d2ed9	Consolidate pass condition to one req.url~ check	2016-04-28 14:18:42 -04:00
The_Grits	9ae31c132f	Indent p element	2016-04-28 09:18:26 -04:00
Matthew Taylor	cf71520875	final content update for conference ... "coming soon" image for schedule, and schedule reference on landing page. Also background image for the landing page.	2016-04-27 23:23:43 -04:00
Matthew Taylor	5ea59cb1ec	Make viewport width a variable value ... So that we can allow some pages to be responsive	2016-04-26 14:19:21 -04:00
Matthew Taylor	7d7fb9797d	Cleanup for scratch conference ... 1. s/collaborators/sponsors 2. open footer links in new window 3. remove superfluous require statement 4. increase spacing for scratch family links	2016-04-26 12:24:55 -04:00
The_Grits	df8c036daf	Edit spacing ... As per @mewtaylor 's suggestions on #435	2016-04-26 09:09:07 -04:00
Matthew Taylor	a4e19a5edc	Temporarily remove "View Full Schedule" link ... Since we don't have one yet	2016-04-25 17:39:31 -04:00
The_Grits	ac9717a095	Whoops ... Seems like Travis would rather not have the guidelines route included	2016-04-25 08:00:36 -04:00
The_Grits	c657a4b5f9	Squash and Merge	2016-04-25 07:52:20 -04:00
The_Grits	4a31a7882b	Add DMCA route ... I also included the guidelines route to avoid future branch conflict.	2016-04-25 07:44:57 -04:00
The_Grits	117eed5eb3	Squash and Merge	2016-04-23 14:27:08 -04:00
The_Grits	c7a864450a	Add guidelines route	2016-04-23 08:14:17 -04:00
The_Grits	e73d3fabcc	All other references	2016-04-22 14:16:59 -04:00
The_Grits	123b366180	13mil -> 14mil	2016-04-22 14:11:25 -04:00
Matthew Taylor	3c487163a0	Last minute copy updates	2016-04-22 09:07:32 -04:00
Matthew Taylor	2eb62e8ab3	move component convention back to what it was ... formerly presentation components such as `navigation` and `footer` have been nested, and renamed to `container` inside their respective component subdirs	2016-04-21 18:13:21 -04:00
Matthew Taylor	66113e1c58	Add conference sub-site	2016-04-21 16:22:39 -04:00
Matthew Taylor	017d58fb1b	Split out footer container/presentation	2016-04-21 16:22:16 -04:00
Matthew Taylor	f05cb39501	Add flex-row component ... Just a container with some default flexbox formatting.	2016-04-21 16:21:22 -04:00
Matthew Taylor	3c8a7db834	Take margins out of typography ... They won't be the same margins for text-heavy and text-lite pages, so we should make thess view-specific for now	2016-04-21 16:19:20 -04:00
Matthew Taylor	38c4566e2b	Split out name and view for routes ... This will help for the conference urls, which will be sub-urls, all under `conference`	2016-04-21 16:16:59 -04:00
Matthew Taylor	eed6f1fc08	Restructure src ... 1. Put formatting-specific components into the `presentation` subdir of `components` 2. Put content-specific components into the `container` subdir of `components` 3. Put views that are sub-urls of the site into a subdir of `views` (i.e. `microworlds`, and eventually `conference`)	2016-04-21 15:46:32 -04:00
Ray Schamp	d3d8d34848	Merge pull request #425 from LLK/s3 ... Move app to S3 hosting	2016-04-21 15:27:51 -04:00
Ray Schamp	b8bfe46890	Configure redirect routes in Fastly	2016-04-19 18:42:03 -04:00
Ray Schamp	59227e3272	Merge branch 'add_redirects' of github.com:sclements/scratch-www into s3 ... # Conflicts: # .eslintrc # server/handler.js	2016-04-19 16:56:22 -04:00
Rachel Thornton	405f666109	Merge remote-tracking branch 'LLK/develop' into develop	2016-04-18 16:51:53 -04:00
Rachel Thornton	dfa7b9e582	Starting mock of search page	2016-04-18 16:51:45 -04:00
Ray Schamp	43788eb7d8	Split server and routes/config ... Turn HtmlGeneratorPlugin into a module Turn server into dev-server and simplify it	2016-04-18 14:07:11 -04:00
Matthew Taylor	a6e199b5f4	Merge pull request #414 from TheGrits/patch-4 ... Fix gh-413: Update supporting organizations	2016-04-15 16:22:54 -04:00
The_Grits	c9492ae38b	Update l10n.json	2016-04-15 16:12:17 -04:00
The_Grits	08ccaa7721	Spaces and Intel	2016-04-15 15:59:32 -04:00
The_Grits	1a2e30fccd	mailto anchor	2016-04-15 15:58:11 -04:00
The_Grits	d6b08a0bff	Add Chris and Julia ... As per https://github.com/LLK/scratch-www/issues/413#issuecomment-209889924	2016-04-14 12:36:20 -04:00
The_Grits	174b351845	Delete the extra space	2016-04-09 14:28:05 -04:00
Matthew Taylor	7aeaaeb480	Wrap wedo2 view in page component	2016-04-07 16:49:35 -04:00
The_Grits	855154edcf	Update CN url ... As per https://github.com/LLK/scratch-www/pull/414#issuecomment-206880466	2016-04-07 09:36:45 -04:00
The_Grits	6d349cb7f9	Update supporting organizations ... Changed according to #413	2016-04-06 17:49:30 -04:00
The_Grits	09d095b963	Change supporting organizations ... As per #413. Specific additions: - Cartoon Network - Lemann Foundation	2016-04-06 17:42:05 -04:00
Matthew Taylor	27b55082f0	Merge pull request #407 from mewtaylor/issue/gh-406-counselor-link ... GH-406: Add community counselor job	2016-04-04 14:55:36 -04:00
Rachel Thornton	f545d8acf7	Fixed problem with loading	2016-04-04 14:11:35 -04:00
Rachel Thornton	ce8849e4aa	Merge remote-tracking branch 'LLK/develop' into develop ... # Conflicts: # src/components/navigation/navigation.jsx	2016-04-03 16:46:23 -04:00
Rachel Thornton	8e6921cd82	Load button and tabs functioning ... Users can now load more projects by clicking a button at the bottom of the page, and check out different genres of project using the tabs.	2016-04-03 16:45:31 -04:00
Ray Schamp	53e508dd24	Merge pull request #411 from sayamindu/develop ... Add view for community blocks interview recruitment	2016-04-01 16:34:57 -04:00
Sayamindu Dasgupta	bd81438800	Add view for community blocks interview recruitment ... We are recruiting Scratchers for interviews on the Scratch Community blocks feature; this is a part of my PhD disseration. This commit has the PDF forms and the views that are needed for the recruitment.	2016-04-01 13:23:48 -04:00
Matthew Taylor	7734ee8931	Add community counselor job ... Fixes #406	2016-04-01 10:29:13 -04:00
Ray Schamp	c9157e70b9	Fix reference to session ... Caused by merging an old branch which didn't have conflicts, but did have a different understanding of session.	2016-03-29 18:38:39 -04:00
Matthew Taylor	1adb8ecf5b	Add page component to jobs view ... Fixes #398	2016-03-28 14:18:44 -04:00
Rachel Thornton	bfd3fac6a0	Merge remote-tracking branch 'LLK/develop' into develop ... # Conflicts: # src/components/navigation/navigation.jsx	2016-03-26 21:15:36 -04:00
Ray Schamp	78649b69e2	Merge pull request #353 from morantsur/feature/microworlds ... Moving Microworlds pages to scratch-www & adding arts	2016-03-25 15:43:10 -04:00
Ray Schamp	ea04658b4a	Merge pull request #387 from rschamp/feature/scratchr2#2937-student-nav ... Add "My Class" to student nav	2016-03-25 14:32:22 -04:00
Rachel Thornton	ff228e022c	Merge remote-tracking branch 'LLK/develop' into develop	2016-03-25 11:35:47 -04:00
Ray Schamp	6e0d35efaa	Fix incorrect nesting in search styles	2016-03-24 13:12:41 -04:00
Ray Schamp	74d23d05dc	Remove inline default messages	2016-03-24 12:29:40 -04:00
Ray Schamp	2d6a38800b	Add "My Class" to student nav	2016-03-24 12:28:32 -04:00
Ray Schamp	29fa914b9a	Merge pull request #391 from rschamp/feature/token-from-cookie ... Add method to retrieve token from session cookie and use it	2016-03-24 12:27:07 -04:00
Ray Schamp	042ef65070	Merge pull request #393 from rschamp/feature/silence ... Upgrade sass-lint, quiet various warnings	2016-03-24 12:02:40 -04:00
Ray Schamp	dce35a4bee	Add keys to children where necessary	2016-03-24 11:29:26 -04:00
Rachel Thornton	d4277cabae	Early Explore Page ... Added an early prototype of the new Explore page	2016-03-24 10:16:53 -04:00
Ray Schamp	19f469db48	Upgrade and quiet sass-linter ... These warnings were annoying me because the noise makes it easy to miss real issues. The `no-mergeable-selectors` rule is one that we do want to have, but right now it asks that you merge selectors in different `@media` blocks. When the next release happens we should put that back. https://github.com/sasstools/sass-lint/issues/307 Similarly, we want `force-element-nesting` but there is a problem with that because there's no easy way to have a nested selector in a list of selectors. https://github.com/sasstools/sass-lint/issues/575 Finally, until they implement per-line overrides, we have to silence `class-name-format` because we don't have control over the ReactModal class names. It's a useful rule to keep class names consistent though. Per-line ignores should be coming soon: https://github.com/sasstools/sass-lint/issues/70	2016-03-23 18:34:54 -04:00
Matthew Taylor	56787ee09c	Add spot check for cards, use new Page paradigm	2016-03-23 16:47:55 -04:00
Matthew Taylor	b903067658	Update the cards with new grouped structure	2016-03-23 16:37:15 -04:00
Matthew Taylor	f95b62bf67	Change name to cards to prevent interaction fx ... thanks @rschamp !	2016-03-23 16:37:15 -04:00
Matthew Taylor	5d693ed53d	Add /info/cards/ route ... Also implements a method for handling translation of static files as described in https://github.com/LLK/scratch-www/issues/372#issuecomment-193350144	2016-03-23 16:37:15 -04:00
Ray Schamp	339c23a64e	Add some sources to the unsign method	2016-03-23 10:02:20 -04:00
Ray Schamp	21dffa73f0	Fix indentation	2016-03-23 09:50:41 -04:00
Ray Schamp	1eb8c537c1	Add method for using token in api requests ... Requires a change on the api to read the token from the querystring.	2016-03-22 15:46:44 -04:00
Ray Schamp	32b7d5a41b	Retrieve token from session cookie	2016-03-22 14:43:07 -04:00
Matthew Taylor	9a2a923b7b	Remove projectCount from intro.jsx ... thanks @rschamp!	2016-03-22 12:09:51 -04:00
Matthew Taylor	4914ba6d85	Use formatNumber to localize project count ... `toLocaleString()` is not supported in Safari, but react-intl has a polyfill, and so it is. This also localized the intro description string, which wasn't previously. This also fixes #366 by doing as @rschamp suggested and checking if the count is the default count before setting the value.	2016-03-22 11:00:37 -04:00
Ray Schamp	96bc1b1ab1	Add method for reading session cookie ... Assumes the session cookie is stored as JSON which may or may not have been compressed via zlib (indicated by a leading `.`), which is then base64-encoded, and made URL-safe by replacing all `+` and `/` characters with `-` and `_` respectively.	2016-03-22 09:11:09 -04:00
Ray Schamp	9cd5c98004	Make Jar formatting consistent with everything else	2016-03-22 09:09:42 -04:00
Ray Schamp	7b72e6cdcd	Fix lint errors	2016-03-18 12:40:30 -04:00
Ray Schamp	a5e336a175	Use redux for session handling	2016-03-18 11:51:22 -04:00
Ray Schamp	1205ed019d	Make Api mixin usable as a standalone module	2016-03-18 10:55:12 -04:00
Ray Schamp	faabc63e65	Move component structure to one tree ... Instead of inserting `Navigation` and `Footer` into every `render`ed component, just compose them in the views with a new `Page` component.	2016-03-18 10:54:26 -04:00
morant	99772ca41a	* Fix alignment of Editor link in Microworlds. ... * Remove fixed width from most components (replace with relative width).	2016-03-17 15:58:26 -04:00
morant	2e5a0e1439	Merge remote-tracking branch 'upstream/develop' into feature/microworlds ... * Removed microwords from server/routes for now. # Conflicts: # server/routes.json # src/components/thumbnail/thumbnail.jsx	2016-03-11 21:14:27 -05:00
morant	d735d38d91	* Fix aligning of thumbnails inside a NestedCarousel ... * Remove links from thumbnail image * Fix vertical aligning when a thumbnail has more than one line of text	2016-03-11 18:17:34 -05:00
Matthew Taylor	cb81ae550a	Merge pull request #382 from mewtaylor/hotfix/wedo-appstore-link ... [Develop] Hotfix: wedo appstore link	2016-03-10 15:28:50 -05:00
Matthew Taylor	c514d814c9	Update device manager app store link	2016-03-10 15:14:08 -05:00
Matthew Taylor	b484480e1e	Merge branch 'wedo-landing' into develop ... * wedo-landing: Update with links, fix linter issues, center setup [WIP] Add WeDo Landing page # Conflicts: # server/routes.json	2016-03-10 09:05:51 -05:00
Matthew Taylor	aeaa02aae8	Update with links, fix linter issues, center setup	2016-03-09 23:04:25 -05:00
carljbowman	3220fd1b9d	[WIP] Add WeDo Landing page ... Adding LEGO WeDO landing page. This also includes the initial pass on Global Typographic Standards. Needs Work -Add URLs to all links on the page (still being generated) -Ater URLs have been added, update translation JSON to include messages that include links	2016-03-09 14:33:17 -05:00
Matthew Taylor	6f8a916426	Merge pull request #376 from mewtaylor/issue/gh-374-tips-link ... [Develop] Fix GH-374: Add tips to create link for logged out	2016-03-04 14:44:27 -05:00
Matthew Taylor	4a40482f74	Add tips to create link for logged out user ... Fixes #374	2016-03-04 10:27:00 -05:00
Andrew Sliwinski	47ab0a0ae0	Update jobs to match Media Lab listings	2016-03-02 09:42:51 -05:00
Andrew Sliwinski	7511121972	Merge branch 'develop' into feature/jobs	2016-03-01 10:19:34 -05:00
Matthew Taylor	0ac9f5edc5	Merge pull request #359 from TheGrits/patch-2 ... Fix gh-357: Splash - Initial value of project count is arbitrary	2016-02-23 11:43:26 -05:00
morant	c7cc1b626f	Revert "Revert "Fix review comments, and organize code a bit."" ... This reverts commit e9cb08d273.	2016-02-19 15:11:23 -05:00
morant	e9cb08d273	Revert "Fix review comments, and organize code a bit." ... This reverts commit 3d9d280bb9.	2016-02-19 14:39:43 -05:00
morant	3d9d280bb9	Fix review comments, and organize code a bit. ... The only visible change should be that the tips thumbnails are no longer links.	2016-02-19 14:30:07 -05:00
The_Grits	8d05ed84b4	singlequotes ... Apparently double quotes don't work	2016-02-18 14:34:02 -05:00
The_Grits	9f2325bd83	"over 13 million" ... Changed as per @mewtaylor's suggestion	2016-02-18 14:29:58 -05:00
The_Grits	7992c43b87	Update credits.jsx ... Travis was complaining that link 188 had over 120 characters, this should fix it.	2016-02-12 07:37:25 -05:00
Matthew Taylor	212a2d2c41	Merge pull request #352 from technoboy10/gh333-creditspage ... Fix gh-333: Add/Remove Moderators on Credits Page	2016-02-10 22:51:54 -05:00
Matthew Taylor	b961891e66	Merge pull request #355 from TheGrits/patch-1 ... Fix gh-354: 'Supported Organizations' in credits overflows	2016-02-10 22:51:05 -05:00
Technoboy10	a4c24b2c6c	oops	2016-02-09 08:19:29 -07:00
Technoboy10	2666975508	removed padding	2016-02-09 08:14:59 -07:00
The_Grits	91f3de0682	link formatting in paragraphs	2016-02-08 14:50:56 -05:00
Technoboy10	f99472afe1	fixed horizontal scrollbar	2016-02-08 10:08:32 -07:00
The_Grits	53cf85a4c2	Update project count ... Updated the number with a more recent number, I wasn't sure if using a string like "Loading..." would damage anything.	2016-02-08 10:04:38 -05:00
The_Grits	3939dde44e	Update credits.scss	2016-02-08 08:10:41 -05:00
The_Grits	2a6f30cdb7	word-wrap for p elements ... Should fix #354, I'll test on a local machine.	2016-02-05 07:59:09 -05:00
Technoboy10	e1b9cf5716	Removed Megan Haddadi, added Linda and Lily	2016-02-03 08:36:05 -07:00
Andrew Sliwinski	6204b52479	WIP	2016-01-31 13:02:10 -05:00
Ray Schamp	fd584b1d67	Heed some SCSS warnings	2016-01-29 15:22:06 -05:00
Ray Schamp	f90198d7c3	Fix tall carousel ... I am mystified by how this changed. But this fixes #345.	2016-01-29 15:22:02 -05:00
morant	7c411845c2	Remove addition to HREF	2016-01-29 12:29:17 -05:00
Matthew Taylor	c46e42e83c	fix test	2016-01-25 09:07:55 -05:00
Matthew Taylor	581f071c0e	Add missing alt tags	2016-01-25 08:30:10 -05:00
Matthew Taylor	41c23f76c0	Get rid of superfluous checks ... thanks @rschamp!	2016-01-20 14:01:51 -05:00
Matthew Taylor	e85563c96e	surround redirect check in try/catch ... based on the suggestion by @rschamp!	2016-01-20 08:36:05 -05:00
Matthew Taylor	2e79a5aa6b	Merge pull request #323 from mewtaylor/bugfix/readme-update ... Added some more documentation	2016-01-19 16:11:49 -05:00
Matthew Taylor	5858bb94bb	Added a bit more info on what csrf does ... Thanks @rschamp for the suggestion!	2016-01-19 16:04:08 -05:00
morant	6e682269fb	Align tips slider with the rest of the studios	2016-01-15 12:23:39 -05:00
morant	f7fe1125c8	fix play button positioning	2016-01-15 11:40:21 -05:00
Matthew Taylor	5e055fb6ea	Merge pull request #321 from mewtaylor/issue/scratchr2-3245-logout-post ... Change logout to do a POST request	2016-01-15 11:23:44 -05:00
Matthew Taylor	7303b7963b	import main.scss in render.jsx ... Fallout from #305, fixes #324	2016-01-14 14:55:24 -05:00
Matthew Taylor	dddc867c1e	Merge pull request #319 from mewtaylor/feature/gh-288-accessibility ... GH-288: accessibility	2016-01-14 10:27:29 -05:00
Matthew Taylor	112cad14e3	Added some more documentation	2016-01-14 10:25:03 -05:00
Matthew Taylor	9e58efc7e2	Merge pull request #305 from mewtaylor/feature/266-componentize-locale-strings ... GH-266: view-ify locale strings	2016-01-14 10:10:02 -05:00
Matthew Taylor	98d0f0de6e	Updates based on feedback ... 1. changes intl filenames to `[view].intl.js` 2. Move nav/footer rendering to `render.jsx` 3. Set locale cookie before submitting language change form Thanks @thisandagain !	2016-01-14 08:32:43 -05:00
morant	d002e0c63a	Turn microworld to a component, and create paths to all three microworlds	2016-01-13 14:21:59 -05:00
Matthew Taylor	a15842a582	Add back in the session refresh ... Thanks @thisandagain!	2016-01-13 13:36:36 -05:00
morant	793b8c025d	remove unneeded imports, and show design studio without a propmpt project as a carousel	2016-01-13 12:32:53 -05:00
Matthew Taylor	f00d07b0bf	edit all indentation ... ht @thisandagain!	2016-01-13 11:52:38 -05:00
Matthew Taylor	31d4173ef5	Change logout to do a POST request	2016-01-13 11:36:04 -05:00
Matthew Taylor	592f66c9a8	Fix credits link ... Fixes #297	2016-01-13 10:35:26 -05:00
Matthew Taylor	2ac3e5337f	Add alternative labels for input and links ... See https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_01	2016-01-12 13:27:36 -05:00
Matthew Taylor	01975b7e4d	Add alt attribute to image tags ... See https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_02	2016-01-12 13:27:09 -05:00
Matthew Taylor	4821383d00	Merge pull request #315 from mewtaylor/issue/gh-289-overlapping-text ... Fix GH-289: Allow white space to wrap in welcome text	2016-01-12 10:30:02 -05:00
Andrew Sliwinski	3721ecfd14	Fix error in parsing count from updated API route. Re: GH-316	2016-01-11 19:10:38 -05:00
morant	2cf6befeaf	add hip hop and fashion JSONs, and minor fixes to microworlds.jsx	2016-01-11 18:38:15 -05:00
Matthew Taylor	c88fc6f27d	Make general nowrap more specific to paragraphs ... And remove the overrides that were already there. ht @rschamp and @carljbowman!	2016-01-11 14:58:55 -05:00
Andrew Sliwinski	86c93df740	Migrate to new API route for message count. Resolves GH-316 Resolves GH-95	2016-01-11 14:13:34 -05:00
Matthew Taylor	d578d4a800	Allow white space to wrap in welcome text ... It's in an href, so override the default and include wrapping. Fixes #289.	2016-01-11 09:11:13 -05:00
Matthew Taylor	1382fc48f6	log error for session request if there ... And only try to update the session if a body is present	2016-01-11 08:15:08 -05:00
morant	6aa93b1711	Error Handling - when a component isn't declared, don't show it.	2016-01-08 18:35:17 -05:00
morant	2593d7aaf5	Generic version of the Microworlds. ... No arts specific features anymore. Still fails when a component is missing	2016-01-08 16:18:51 -05:00
morant	cca175154c	First version of generic microworlds. ... Reads videos information from JSON, other parts still not generic.	2016-01-08 14:43:39 -05:00
morant	5c919506cf	Add tips	2016-01-08 14:42:35 -05:00
Matthew Taylor	ceec694b2a	Revert "Migrate to using a loader method" ... This reverts commit 214430b0c4.	2016-01-08 13:50:58 -05:00
Matthew Taylor	214430b0c4	Migrate to using a loader method ... This moves all locale/translation building to a dependency, `scratch-www-intl-loader`, as well as tests associated with it. Also gets rid of the `make translations` step.	2016-01-07 17:01:57 -05:00
Matthew Taylor	d5ffd9fcc0	Flatten messages for components into one object ... thanks @rschamp!	2016-01-07 11:02:14 -05:00
Matthew Taylor	398f9cb95a	Move component strings into views ... Handle localization and string loading in views only. Components should just of default text, but not the actual text for the page itself – all text handling should be at the view level.	2016-01-07 10:11:03 -05:00
Matthew Taylor	448ca0b103	Remove main bundle ... Render footer and nav on each view directly instead of globally in a separate bundle	2016-01-06 14:23:47 -05:00
Matthew Taylor	8ae98d703f	Make localizations view-based ... 1. Load locale strings into `window._messages` in a separate file added to `template.html`, which contains view-specific and general strings 2. Update build-locales to compile separate files	2016-01-06 14:09:32 -05:00
Matthew Taylor	0a313ad29b	default to pt-br if browser is set to pt ... If the user has not yet set their own language, but has pt in their browser, use pt-br for now, to accommodate for our large Brasilian base. Fixes #273.	2016-01-04 14:18:55 -05:00
morant	77a4bd2d10	adding tips to the microworld	2015-12-21 13:30:22 -05:00
Matthew Taylor	f52ac1f17f	Move intl loading into separate, overridden file ... ht @rschamp, thanks!	2015-12-16 12:00:42 -05:00
Matthew Taylor	8c374e096d	Move custom loader to main.jsx ... So that it's only done once.	2015-12-16 10:43:37 -05:00
Matthew Taylor	6ff652e788	Revert "Move custom-locales.js to static/js/lib" ... This reverts commit 4f541b8831.	2015-12-16 10:09:15 -05:00
Matthew Taylor	4f541b8831	Move custom-locales.js to static/js/lib ... So it can be loaded ahead of time and cached. Also remove the json since it's being loaded outside of react now, and put it into the js file directly.	2015-12-16 08:32:25 -05:00
Matthew Taylor	b495beaeba	Also add Latin, Aragonés	2015-12-15 18:06:03 -05:00
Matthew Taylor	08a91f8521	Add custom languages explicitly	2015-12-15 17:55:44 -05:00
Ray Schamp	458c112e6c	Merge pull request #259 from rschamp/bugfix/GH-238 ... Support redirect responses from API calls	2015-12-11 09:41:57 -05:00
Ray Schamp	68bcbf7511	Explain strange redirect behavior	2015-12-10 17:11:25 -05:00
Matthew Taylor	1c802f9230	Some translations cleanup ... A couple missing translations	2015-12-09 14:03:30 -05:00
Andrew Sliwinski	66d9c390fe	Change 'View All' link in news component to redirect towards announcements. Resolves GH-280	2015-12-08 14:05:03 -05:00
Andrew Sliwinski	fc59793aff	Merge pull request #244 from thisandagain/feature/about ... Migrate - About View	2015-12-08 13:52:27 -05:00
Andrew Sliwinski	64546a2410	Merge pull request #245 from thisandagain/feature/credits ... Migrate - Credits View	2015-12-08 13:52:18 -05:00
Andrew Sliwinski	2fdc6458e0	Address feedback from review	2015-12-08 10:53:12 -05:00
Andrew Sliwinski	aa7efc7e4f	Merge branch 'develop' of github.com:llk/scratch-www into feature/about	2015-12-08 10:31:48 -05:00
Ray Schamp	b85775b20f	Merge pull request #276 from thisandagain/hotfix/hoc ... Hotfix - Legal fixes for HOC page	2015-12-04 13:01:21 -05:00
Andrew Sliwinski	30f4feff48	Hotfix for HOC legal notices	2015-12-04 10:41:25 -05:00
Hannah Cole	92dc1727e2	fixed tests, formatting	2015-12-01 16:14:37 -05:00
Hannah Cole	97877b1fbd	jobs page styling changes	2015-12-01 16:00:52 -05:00
Hannah Cole	1eadc19d5e	localized jobs page	2015-12-01 15:50:29 -05:00
Ray Schamp	961d97eb67	Use FormattedMessage for My Classes text ... I had matched it to My Stuff, but that's different since the top nav needs the text for a title attribute. h/t @mewtaylor	2015-11-30 16:25:11 -05:00
Hannah Cole	6ec9f7da11	created jobs page	2015-11-29 13:53:03 -05:00
Hannah Cole	c82aecf1f7	created jobs page	2015-11-29 13:42:26 -05:00
morant	bd1319edff	Add interactive design studio, and make studios show arts projects. ... Also many design changes.	2015-11-29 09:32:01 -05:00
Ray Schamp	9c6cf5f449	Fix GH-237: Show My Classes in nav to educators	2015-11-26 12:08:28 -08:00
Ray Schamp	815c4b3f57	Support redirect responses from API calls ... Several scratchr2 views do a thing and then redirect (project, studio creation, the student password reset middleware). This allows the client to redirect to that response. Fixes GH-238. Requires LLK/scratchr2@bf451a95ea	2015-11-26 11:59:25 -08:00
morant	9f0d36624a	Fresh version of arts microworld	2015-11-22 21:40:08 -05:00
Matthew Taylor	45b44204b4	Merge pull request #250 from carljbowman/HOC-Collab-Update ... Hoc collab update	2015-11-20 17:41:59 -05:00
carljbowman	ba2902f979	Add Made with Code Logo	2015-11-20 09:56:10 -05:00
Matthew Taylor	7bc85bec0d	Merge pull request #223 from mewtaylor/cleanup/locale-updates ... Clean up `build-locales` and add tests for it.	2015-11-19 15:40:42 -05:00
Matthew Taylor	fc834b8817	Move scripts to new lib folder ... Thanks @thisandagain for the tip!	2015-11-19 10:05:38 -05:00
Andrew Sliwinski	167353c68d	Migrate credits page. Resolves GH-30. Resolves GH-174. Resolves GH-215	2015-11-18 21:14:54 -05:00
Andrew Sliwinski	82eedaaf13	Resolve merge conflicts	2015-11-18 20:06:54 -05:00
Andrew Sliwinski	8a2ac5f24e	Resolve lint errors	2015-11-18 20:06:05 -05:00
Andrew Sliwinski	f2561fbc03	Migrate about view. Resolves GH-63	2015-11-18 19:57:07 -05:00
Matthew Taylor	15641ee244	scratch foundation, not code to learn	2015-11-13 10:07:28 -05:00
Ray Schamp	7ed45cb5dd	Stop spinner and display XHR errors if they occur ... Resolves GH-232	2015-11-12 12:49:40 -05:00
Ray Schamp	c15b6a9681	Remove headers entirely to avoid XDR error ... Even "no headers" is seen as setting headers to IE.	2015-11-12 10:44:17 -05:00
Ray Schamp	7c0363e99b	Merge pull request #211 from rschamp/bugfix/GH-195 ... Fix GH-195: Use a spinner component to convey activity while logging in	2015-11-11 11:11:02 -05:00
Ray Schamp	e25eb1fc90	Merge pull request #225 from rschamp/bugfix/GH-224 ... Use XDR when making cross-origin api requests	2015-11-11 11:10:23 -05:00
carljbowman	4cfd7cc02e	Add new backgrounds for Dance and Name	2015-11-10 16:20:48 -08:00
carljbowman	37843fa3a2	Merge branch 'develop' of github.com:LLK/scratch-www into HOC-content-update	2015-11-10 16:12:55 -08:00
Ray Schamp	a8a05c4fdc	Merge pull request #220 from rschamp/bugfix/activity-key-warnings ... Quiet warnings about keys in Activity component	2015-11-10 14:55:02 -05:00
carljbowman	96b1dba277	Update HOC tutorials and linking ... - Swapped Pong Game with B-Ball Hoops - Changed Bearstack Story's thumbnail to clear up confusion around similar thumbnails - Added 'B-Ball Hoops' to localization JSON - Added anchor link to resource section for easy acess.	2015-11-10 10:58:08 -08:00
Ray Schamp	51734e4f1e	Use XDR when making cross-origin api requests ... Fixes GH-224. IE < 10 needs to use "cross domain requests" for cross-origin XHR requests. These don't support custom headers which doesn't affect us at the moment, but might become annoying later.	2015-11-10 13:33:06 -05:00
Matthew Taylor	ca10232498	Clean up build-locales and add tests for it. ... 1. Use md5 compare instead of string compare for determining presence of translation 2. Strip out whitespace before doing md5 compare	2015-11-09 11:40:36 -05:00
Ray Schamp	ae8c25e2c4	Update sass-lint ... This reverts commit bad6e1cca6.	2015-11-06 11:52:16 -05:00
Ray Schamp	bad6e1cca6	sass-lint pls	2015-11-06 11:46:47 -05:00
Ray Schamp	5dc6cd220d	Quiet warnings about keys in Activity component	2015-11-06 11:36:35 -05:00
Andrew Sliwinski	35a3e4c192	Merge pull request #216 from rschamp/bugfix/GH-128 ... Fix GH-128: Use table layout in IE 9 for navigation and homepage	2015-11-06 10:14:22 -05:00
Ray Schamp	b1694c1adc	Fix GH-128 again: use table layout for IE 9	2015-11-05 19:33:02 -05:00
Ray Schamp	bfaccaaed4	Fix navigation for IE9	2015-11-05 18:42:16 -05:00
Ray Schamp	0420457bdc	Use blue for the spinner color. H/t @carljbowman	2015-11-04 14:30:58 -05:00
Matthew Taylor	21e1e73c95	Fix HOC links ... bearstack, dance studio	2015-11-04 10:33:26 -05:00
Matthew Taylor	a5e6ea4a61	Merge pull request #189 from mewtaylor/feature/hoc ... Update hoc page formatting	2015-11-04 06:22:45 -05:00
Matthew Taylor	ad8d32474f	Update HOC page with new mobile, styling & content ... Mobile styling is from the frameless framework from #198 (ht @rthorn!). Localization also in as well. Use `white-space: normal` instead of `inline-block` Prep for componetizing Sub-Nav - Fixed top banner extra margin - Updated HTML containers and SCSS Add subnavigation component Added more content - More projects (still need photos) - Added section about Studios (need to create links to studios) WIP: adding frameless to HOC page Remove Grid elements on Sections Made the implmentation more granular with breakpoints in mind. More formatting adjustments Cards in box now working. Update responsive behavior and spacing Updated all elements to respond to new grid system breakpoints. Update content and organize HOC assets - Added studios section with studio elements - Reorganized the image assets for HOC 2015 Fix SCSS linting errors Update addtional activities photo assets Generalize `info` class on subnav Move onto one line left-align single-column studio links Add strings for localization Some rebase conflicts Code review feedback ht @thisandagain! Fix alignment of studios Keep `inline-block` for mobile	2015-11-03 23:50:51 -05:00
Ray Schamp	6f50282fc3	Lint	2015-11-03 19:02:28 -05:00
Ray Schamp	1304f9e7ba	Use a Spinner to convey activity when logging in ... Resolves GH-195	2015-11-03 18:47:10 -05:00
Ray Schamp	f97e3f51ee	Add Spinner component ... Using one found on http://tobiasahlin.com/spinkit/ for now. @carljbowman please help	2015-11-03 18:45:38 -05:00
Ray Schamp	40b5727613	Fix GH-128: Make video float right of the intro	2015-11-03 15:20:05 -05:00
Andrew Sliwinski	f247761390	Merge branch 'develop' of github.com:llk/scratch-www into bugfix/199	2015-11-03 10:49:39 -05:00
Andrew Sliwinski	06de644ae6	Remove ./src/environment from Webpack config and bind environment to window. Resolves GH-199.	2015-11-03 10:49:32 -05:00
Matthew Taylor	a44894be6d	Merge pull request #191 from mewtaylor/issue/95-message-notification-persists ... WIP #95 – Reset `unreadMessageCount` state	2015-11-03 09:48:57 -05:00
Matthew Taylor	b2d05a996f	Reset unreadMessageCount state ... 1. When the component is unmounted 2. When the user's state changes to logged out I think this should fix any state-side issues with the persistence for #95.	2015-11-02 22:31:27 -05:00
Matthew Taylor	311c156947	Add missing translations to en.json ... Also add `Search` to translatable strings	2015-10-30 10:05:08 -04:00
Matthew Taylor	46742459bf	Add empty host for clear-cache proxy request ... So that it actually goes to scratchr2, not scratch-api	2015-10-30 09:14:49 -04:00
Andrew Sliwinski	18cd13701f	Merge pull request #186 from mewtaylor/issue/180-clear-homepage-cache ... #180 – Use xhr to clear cache instead of form	2015-10-29 18:36:00 -04:00
Ray Schamp	b08bb2aa20	Merge pull request #178 from rschamp/bugfix/GH-177 ... Fix GH-177: Lower z-index for banners to 9	2015-10-29 15:48:08 -04:00
Matthew Taylor	d897d4387d	Use xhr to clear cache instead of form ... because csrf. also, since we don't have a definite message/banner system in place yet, use the button itself for feedback rather than messages. The button will disable if it has been successfully used, or turn pink if there was an error (and it will not be disabled in that case).	2015-10-29 10:28:32 -04:00
Ray Schamp	ac3fcd0096	Fix GH-177: Lower z-index for banners to 9 ... The navigation is at 10, so we want the banners to be underneath that.	2015-10-26 13:29:07 -04:00
Ray Schamp	f62618dadf	Expand view to wrap contents on small screens ... `inline-block` causes #view width to expand to its children's width. `min-width: 100%` is necessary for larger screens, so that the `inline-block` element is still grows to contain all the available width. The 1px of padding is apparently needed for Android Chrome, otherwise the right edge has blue from the body background showing.	2015-10-26 12:06:41 -04:00
Andrew Sliwinski	73b3a91a05	Merge pull request #172 from thisandagain/bugfix/120 ... Fix call to jar.get. Resolves GH-120	2015-10-25 18:40:10 -04:00
Andrew Sliwinski	44f3101069	Fix call to jar.get. Resolves GH-120	2015-10-25 18:21:07 -04:00
Ray Schamp	399d91fea5	Use shouldShowWelcome method to show welcome panel ... Fixes GH-153. Again...	2015-10-25 16:34:32 -04:00
Ray Schamp	b7f795f2d9	Merge pull request #139 from rschamp/feature/email-confirmation-banner ... Add email confirmation banner to homepage	2015-10-25 12:19:42 -04:00
Ray Schamp	2eb63e604d	Scope message handler to confirmation iframe	2015-10-25 12:13:48 -04:00
Ray Schamp	3b729fcb0a	Move "should show banner" test to one function	2015-10-25 12:13:48 -04:00
Ray Schamp	8cde05fdc8	Fix remaining Modal styles	2015-10-25 12:13:47 -04:00
Ray Schamp	7e74c4a105	Use classNames everywhere with dynamic classNames ... Fixes GH-141, and keeps it from being introduced on Banner	2015-10-25 12:13:23 -04:00
Matthew Taylor	8014925cce	Merge branch 'develop' of https://github.com/LLK/scratch-www into bugfix/GH-148 ... # By Ray Schamp # Via Andrew Sliwinski (2) and Ray Schamp (2) * 'develop' of https://github.com/LLK/scratch-www: Fix GH-168: Rehabilitate the `Modal` props.style Fix GH-162: Show "user deletion canceled" modal Clean up activity item rendering logic Add some padding to the empty message Make sure boxes aren't transparent Add empty state for What's Happening box # Conflicts: # src/components/registration/registration.jsx	2015-10-25 09:11:43 -04:00
Matthew Taylor	ccd048893f	Merge branch 'develop' into feature/email-confirmation-banner ... * develop: Fix GH-168: Rehabilitate the `Modal` props.style Fix GH-162: Show "user deletion canceled" modal Set empty states on sign out Clean up activity item rendering logic Add some padding to the empty message Make sure boxes aren't transparent Add empty state for What's Happening box Fix GH-124: Fix studio thumbnail URLs Only show "Welcome" panel if user is < 2 weeks old Fix #152: Don't output activity without a message Fix #102: Add remix and love icons Update arrow icons on Carousels # Conflicts: # src/components/modal/modal.jsx # src/views/splash/splash.jsx	2015-10-25 09:05:35 -04:00
Andrew Sliwinski	b09d191dd5	Merge pull request #167 from rschamp/bugfix/GH-162 ... Fix GH-162: Show "user deletion canceled" modal	2015-10-25 05:26:06 -04:00
Andrew Sliwinski	790b765fc8	Merge pull request #169 from rschamp/bugfix/GH-168 ... Fix GH-168: Rehabilitate the `Modal` props.style	2015-10-25 05:25:59 -04:00
Ray Schamp	3963a15caa	Merge pull request #143 from rschamp/feature/empty-activity ... Add empty state for What's Happening box	2015-10-24 18:58:53 -04:00
Ray Schamp	a2327632a5	Handle relaunch requests from the iframe ... Only attach the message listener when the modal is displaying. This prevents multiple listeners being set up by multiple registration components on the page. Also, scope the `onMessage` handler to that component's iframe, so that we don't respond to other component's messages.	2015-10-24 18:41:13 -04:00
Ray Schamp	14fd4c5860	Fix GH-168: Rehabilitate the Modal props.style ... This makes it more sane, and consistent with the way the react-modal `Modal` works. The old way made multiple modals on the page have the same `style` prop.	2015-10-24 17:15:03 -04:00
Ray Schamp	02cf7d0bcb	Fix GH-162: Show "user deletion canceled" modal ... The look of the modals is all messed up. Will fix that separately.	2015-10-24 16:06:00 -04:00
Matthew Taylor	eb38951f06	Set empty states on sign out ... also make state setting a bit more uniform	2015-10-24 14:52:11 -04:00
Matthew Taylor	07bd1f215f	Move to using iframe in modal ... like registration	2015-10-24 14:33:34 -04:00
Matthew Taylor	ade0959d94	Merge pull request #165 from rschamp/bugfix/GH-124 ... Fix GH-124: Fix studio thumbnail URLs	2015-10-24 14:03:09 -04:00
Ray Schamp	d6de9ffe37	Clean up activity item rendering logic	2015-10-24 12:44:20 -04:00
Ray Schamp	5865b6d619	Add some padding to the empty message	2015-10-24 12:38:23 -04:00
Ray Schamp	0b26be7036	Make sure boxes aren't transparent	2015-10-24 12:33:23 -04:00
Ray Schamp	c8834ed251	Add empty state for What's Happening box	2015-10-24 12:33:23 -04:00
Ray Schamp	21b7386270	Merge pull request #157 from rschamp/bugfix/GH-152 ... Fix #152: Don't output activity without a message	2015-10-24 12:25:55 -04:00
Ray Schamp	718a6c1aae	Merge pull request #164 from rschamp/bugfix/GH-153 ... Only show "Welcome" panel if user is < 2 weeks old	2015-10-24 12:22:01 -04:00
Ray Schamp	99d7055a48	Fix GH-124: Fix studio thumbnail URLs	2015-10-24 12:20:59 -04:00
Ray Schamp	616e99c631	Only show "Welcome" panel if user is < 2 weeks old ... Or if they've dismissed it. Fixes GH-153.	2015-10-24 12:06:16 -04:00
Ray Schamp	39550d805a	Fix #152: Don't output activity without a message	2015-10-23 17:41:50 -04:00
Ray Schamp	717ede8afd	Fix #102: Add remix and love icons	2015-10-23 17:07:40 -04:00
Matthew Taylor	cfb7fa0307	Merge branch 'develop' into feature/email-confirmation-banner ... * develop: separate out arrows var from settings object Handle arrow display dynamically Deploy from Travis Adjust nitpicks, remove whitespace in (), add around + display title and extras differently Add registration component to `JOIN SCRATCH` Explicitly set `Accept-Language` to cookie lang Remove the session listener on unmount Localize the welcome panel Update spacing on Splash page elements Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions Update entire Tutorial cards to be clickable Add window.Intl polyfill. Resolves GH-96 Override `Slider`'s `arrows` setting by row length use ellipsis if text overflows and urlify username Test the build when we test our build Default admin panel to closed Set 'black' default props for thumbnails and carousel Remove localhost from api call for message count	2015-10-23 15:30:13 -04:00
Ray Schamp	0b47ac87c4	Merge pull request #150 from carljbowman/Splash-Page-tweaks ... Update arrow icons on Carousels	2015-10-23 15:18:46 -04:00
Matthew Taylor	c6095d6425	separate out arrows var from settings object ... seems to be returning false when it shouldn't. When I was testing before it appears I was getting a cached js, so it didn't actually work.	2015-10-23 14:47:49 -04:00
Matthew Taylor	fd8515668f	Merge pull request #144 from mewtaylor/issue/122-register-from-gobo ... Add registration component to `JOIN SCRATCH`	2015-10-23 13:38:19 -04:00
Matthew Taylor	1a156cc2a4	Merge pull request #147 from mewtaylor/issue/130-studio-arrow-fix ... Handle arrow display dynamically in carousel component	2015-10-23 13:28:41 -04:00
Matthew Taylor	317b520220	Handle arrow display dynamically ... And handle specific case for studio homepage row. Fixes #130 and also stuff left over from #105	2015-10-23 13:28:11 -04:00
carljbowman	3034abc2b4	Update arrow icons on Carousels ... Had to overwrite slick-slider's iconfont with background image for a quick fix.	2015-10-23 13:05:48 -04:00
Matthew Taylor	438401bde0	display title and extras differently ... So that the creator username appear on the same line as other text, but so that studio titles still get cut off properly	2015-10-23 09:01:01 -04:00
Andrew Sliwinski	7e2751be62	Merge pull request #142 from mewtaylor/issue/forward-accept-language ... Explicitly set `Accept-Language` to cookie lang	2015-10-23 08:50:44 -04:00
Andrew Sliwinski	9374d917dc	Merge pull request #140 from rschamp/feature/remove-session-listener-on-unmount ... Remove the session listener on unmount	2015-10-23 08:48:56 -04:00
Andrew Sliwinski	3545ed9382	Merge pull request #135 from carljbowman/Splash-Page-tweaks ... Update spacing on Splash page elements	2015-10-23 08:48:20 -04:00
Matthew Taylor	237e663794	Add registration component to JOIN SCRATCH ... fixes #122	2015-10-23 08:33:07 -04:00
Matthew Taylor	714355349f	Explicitly set Accept-Language to cookie lang ... So that xhr requests to scratchr2 can get the right language	2015-10-22 23:36:57 -04:00
Ray Schamp	be6358fba9	Merge pull request #138 from rschamp/feature/welcome-panel ... Add welcome panel component to homepage	2015-10-22 22:42:47 -04:00
Ray Schamp	ce3fd38a10	Remove the session listener on unmount ... This will prevent bugs if we ever use the mixin on a component that isn't a view	2015-10-22 20:57:04 -04:00
Ray Schamp	cb2f639d07	Localize the welcome panel	2015-10-22 20:55:17 -04:00
Ray Schamp	b6a6b7faad	WIP	2015-10-22 18:40:04 -04:00
carljbowman	87b583dc58	Update spacing on Splash page elements ... Added some spacing love to Intro, Video, and Carousel elements.	2015-10-22 17:44:49 -04:00
Ray Schamp	429aa03507	Add dismissable email confirmation banner	2015-10-22 17:19:31 -04:00
Ray Schamp	af415e1bf3	Set template cue to dismiss welcome panel	2015-10-22 17:17:27 -04:00
Ray Schamp	58d3ed4ecb	Add welcome component and show it conditionally ... Move some of the colors used on the splash page into _colors.scss so they can be reused.	2015-10-22 12:21:47 -04:00
carljbowman	dc13d63d2e	Update entire Tutorial cards to be clickable ... Wrapped the Tutorial cards in link tags, rather than just the button.	2015-10-22 10:34:18 -04:00
Matthew Taylor	36eff8a9db	Merge pull request #117 from mewtaylor/issue/105-hide-carousel-arrows ... Override `Slider`'s `arrows` setting by row length	2015-10-22 09:15:40 -04:00
Andrew Sliwinski	7ce053e810	Merge pull request #121 from thisandagain/bugfix/96 ... Add window.Intl polyfill. Resolves GH-96	2015-10-22 08:33:19 -04:00
Andrew Sliwinski	d86703e5db	Add window.Intl polyfill. Resolves GH-96	2015-10-21 20:49:31 -04:00
Matthew Taylor	fe96c6fa71	Override Slider's arrows setting by row length ... If the row length is less than `slidesToShow`, don't show the arrows.	2015-10-21 16:49:50 -04:00
Matthew Taylor	1c567574d5	Merge pull request #114 from mewtaylor/issue/103-truncate-thumb-username ... use ellipsis if text overflows	2015-10-21 16:22:54 -04:00
Ray Schamp	713317cb09	Merge pull request #115 from rschamp/feature/organize-splash-methods ... Organize view methods	2015-10-21 15:23:27 -04:00
Matthew Taylor	a40915c60a	use ellipsis if text overflows and urlify username ... fixes #103 and #113	2015-10-21 15:22:59 -04:00
Ray Schamp	345540aa20	Organize view methods ... Proposing this ordering: attributes, lifecycle, getters, handlers, rendering	2015-10-21 15:12:41 -04:00
Ray Schamp	41770ad549	Merge pull request #94 from thisandagain/bugfix/messages ... Fix messages XHR request and prop defaults	2015-10-21 14:54:32 -04:00
Ray Schamp	b847777d09	Merge pull request #111 from rschamp/feature/hide-empty-rows ... Only display custom rows that exist and have items	2015-10-21 14:34:37 -04:00
Ray Schamp	8df5e41991	Only display custom rows that exist and have items	2015-10-21 14:27:29 -04:00
Ray Schamp	60a9681f3f	Merge pull request #104 from rschamp/bugfix/message-count ... Fix GH-97: Grow message bubble with count	2015-10-21 14:17:07 -04:00
Matthew Taylor	43ea666141	Get project count from api when logged out	2015-10-21 14:12:34 -04:00
Ray Schamp	849cc30e1a	Fix GH-97: Grow message bubble with count	2015-10-21 14:07:18 -04:00
Andrew Sliwinski	9ed814cbda	Default admin panel to closed	2015-10-20 21:53:24 -04:00
Andrew Sliwinski	2553c69653	Set 'black' default props for thumbnails and carousel	2015-10-20 21:33:00 -04:00
Andrew Sliwinski	5960f72e81	Remove localhost from api call for message count	2015-10-20 21:22:54 -04:00
Ray Schamp	cad69eb33e	Remove mixin import ... ht @thisandagain	2015-10-20 19:38:43 -04:00
Ray Schamp	715ef7d675	Lint	2015-10-20 19:35:19 -04:00
Ray Schamp	65734a9577	Adapt to upgraded react-modal style handling	2015-10-20 19:28:28 -04:00
Ray Schamp	66105f989c	Re-enable join click handler	2015-10-20 17:58:28 -04:00
Matthew Taylor	23558f583f	change max to limit for new api	2015-10-20 17:07:16 -04:00
Matthew Taylor	5d4dbf638c	Merge pull request #90 from mewtaylor/issue/update-language-footer ... Use language dropdown form to change language	2015-10-20 16:52:42 -04:00
Ray Schamp	be9642627e	Merge pull request #89 from rschamp/feature/handle-bans ... Redirect to ban appeal if the user is banned	2015-10-20 16:51:40 -04:00
Matthew Taylor	7e4555e6b6	Use language dropdown form to change language ... xhr was not updating the session/cookie for some reason. So just force state change, and force form submission to change language	2015-10-20 16:51:30 -04:00
Ray Schamp	ad7be2dad8	Redirect to ban appeal if the user is banned ... The default behavior is for the `/session/` request to be redirected to the ban appeal page. Unfortunately we can't detect this 302 response, as the browser transparently handles it and javascript just sees a 200 response with a weird body. So I've updated scratchr2 to return a special response for banned `/session/` requests.	2015-10-20 16:17:53 -04:00
Ray Schamp	804241a544	Merge pull request #87 from rschamp/bugfix/fix-login ... Use ReactDOM.findDOMNode for login field values	2015-10-20 15:44:09 -04:00
Ray Schamp	13ee5ad86d	Use ReactDOM.findDOMNode for login field values ... The direct reference didn't work as expected I think because we're nesting the `input` within our own `Input` components.	2015-10-20 15:24:56 -04:00
Ray Schamp	50646b6c3c	Localize homepage row content	2015-10-20 14:49:25 -04:00
Ray Schamp	6259cb5b97	Pull homepage rows from the API ... Not localized yet	2015-10-20 14:49:25 -04:00
Ray Schamp	abfb485560	Merge pull request #83 from mewtaylor/issue/65-splash-activity-hookup ... Get *What's Happening?* box data from api	2015-10-20 13:59:46 -04:00
Matthew Taylor	22e8ceca5e	Activity with current friends-activity format ... This updates `activity.jsx` to handle the current `friends-activity` format (which is a bit hacky atm), and uses `FormattedRelative` to handle relative timestamps	2015-10-20 13:41:17 -04:00
Andrew Sliwinski	0868a70f00	Remove unused responsive styles from modal.scss	2015-10-20 13:13:08 -04:00
Matthew Taylor	6c34e0bc6a	get message count at minute intervals	2015-10-20 10:25:28 -04:00
Ray Schamp	bde208e16b	Merge pull request #76 from mewtaylor/refactor/set-language-via-api ... Use api to set language instead of cookie	2015-10-19 20:39:45 -04:00
Andrew Sliwinski	8647d01e1f	Merge pull request #75 from mewtaylor/bugfix/define-format-message ... Define `formatMessage` when used.	2015-10-19 20:37:24 -04:00
Andrew Sliwinski	dae7288395	Merge pull request #73 from rschamp/feature/login-captcha-redirect ... Redirect to CAPTCHA when too many login attempts fail	2015-10-19 20:34:10 -04:00
Matthew Taylor	010109a767	Use api to set language instead of cookie ... just to be safe. But i'm leaving in the `set` method of `jar.js` so we can easily move to it in the future.	2015-10-19 19:49:24 -04:00
Matthew Taylor	e9d24b083a	define formateMessage ... I was forgetting to define it, like is done in `activity.jsx`. I was also incorrectly interpreting the documentation	2015-10-19 19:36:56 -04:00
Matthew Taylor	44aac35660	Merge pull request #71 from mewtaylor/feature/splash-admin-panel ... Add `AdminPanel` component	2015-10-19 18:45:33 -04:00
Matthew Taylor	b6f77c7c77	Generate output dir if it doesn't exist	2015-10-19 18:16:13 -04:00
Ray Schamp	70f06b6be8	Redirect to CAPTCHA when too many attempts fail	2015-10-19 16:36:46 -04:00
Matthew Taylor	43786861c8	Add AdminPanel component ... And include it on the splash page.	2015-10-19 14:55:38 -04:00
Matthew Taylor	58ef98016a	General cleanup	2015-10-16 15:10:27 -04:00
Matthew Taylor	7b704e878f	Give name to the exported module	2015-10-16 15:10:17 -04:00