1291 commits

Author	SHA1	Message	Date
Matthew Taylor	f8a1548cda	Merge pull request #1310 from thisandagain/hotfix/cm ... [Master] Hotfix - Remove "Trust & Safety Manager" role from jobs page	2017-05-17 17:24:45 -04:00
Matthew Taylor	ae53dcd746	Remove 10th banner	2017-05-15 11:08:15 -04:00
Andrew Sliwinski	042ae48408	Remove 'Trust & Safety Manager' role from jobs page	2017-05-14 12:52:53 -04:00
Matthew Taylor	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	aed3093bc0	Change invalidation to year	2017-04-21 07:51:03 -04:00
Matthew Taylor	f61fe17353	use birthOffset for age validation ... Fixes #1278	2017-04-20 16:47:35 -04:00
Matthew Taylor	76c46be17b	Merge pull request #1269 from mewtaylor/issue/r2-4470 ... Fix R2-4470: Only allows birthdays >= 13 yrs old for teacher reg	2017-04-19 16:41:09 -04:00
Matthew Taylor	9c50f31ce3	Merge pull request #1270 from TheGrits/patch-4 ... Fix gh-728: Align Misaligned Nav-bar Dropdown	2017-04-19 16:40:15 -04:00
Matthew Taylor	f2e4858868	Revert "[Master] Temp Hotfix: remove custom rows"	2017-04-18 06:36:39 -04:00
Matthew Taylor	6b513f82e0	Merge pull request #1268 from mewtaylor/issue/gh-1265 ... [Develop] Hotfix GH-1265: Update jobs route to include moderator	2017-04-14 14:20:20 -04:00
Matthew Taylor	cd3fb9245a	Only apply offset to teachers ... thanks @chrisgarrity!	2017-04-14 14:18:32 -04:00
The_Grits	7c9f6f4fad	Fix gh-728 ... Fixes mis-aligned nav-bar dropdown	2017-04-14 06:46:50 -04:00
Matthew Taylor	cb7ce8c71d	update language for age validation ... thanks @TheGrits!	2017-04-13 07:41:47 -04:00
Matthew Taylor	2c472b607a	Only allows birthdays > 13 yrs old for teacher reg ... Helps fix https://github.com/LLK/scratchr2/issues/4470 from the UX side of things	2017-04-12 17:41:43 -04:00
Matthew Taylor	12e87df7c3	Merge pull request #1257 from TheGrits/patch-4 ... Nit-picky Developer Class Type	2017-04-11 12:58:09 -04:00
Matthew Taylor	a56c8d0b37	Update jobs route to include moderator ... Fixes #1265 by updating the logic for checking the route to include an optional moderator endpoint check	2017-04-11 12:57:02 -04:00
Matthew Taylor	5ca5c149f3	temporarily remove custom homepage rows ... redis emptied when mc1 restarted, so this is all going to mysql at the moment	2017-04-11 09:27:19 -04:00
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	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
Matthew Taylor	d8ef3110e2	don’t apply to top banners	2017-03-31 10:26:56 -04:00
Matthew Taylor	0e645ce954	Reset banner on new login	2017-03-31 10:00:40 -04:00
Matthew Taylor	d66e11fced	Banner updates	2017-03-31 09:02:54 -04:00
Matthew Taylor	7522be4c03	Merge pull request #1253 from TheGrits/patch-4 ... Fix gh-1194: Remove Scratch Day from Localization	2017-03-22 08:41:51 -04:00
Matthew Taylor	3a299e06f7	Merge pull request #1240 from TheGrits/patch-3 ... Fix gh-1239: Update Conference Dates	2017-03-22 08:32:54 -04:00
The_Grits	77bdd356d8	Remove Scratch Day from Localization File	2017-03-20 11:06:28 -04:00
The_Grits	bc43e89d36	Remove localization of Scratch Day	2017-03-20 11:05:52 -04:00
Matthew Taylor	e9f7748fdf	Merge pull request #1243 from TheGrits/patch-4 ... Fix gh-1242: Update Credits Page	2017-03-16 11:57:11 -04:00
Matthew Taylor	0bb60700ba	Merge pull request #1244 from mewtaylor/issue/opt-in ... [Develop] Hotfix: re-add checkbox to opt-in to email list for teacher	2017-03-15 10:15:16 -04:00
Matthew Taylor	63c6bf59f2	Merge pull request #1149 from mewtaylor/issue/r2-4092 ... For R2-4092: Add checkbox to opt-in to teacher emails	2017-03-15 10:08:35 -04:00
The_Grits	c45663e966	Add Juanita Buitrago to Previous Members	2017-03-13 17:09:08 -04:00
The_Grits	f1880e47d5	Remove Juanita Buitrago	2017-03-13 17:08:39 -04:00
The_Grits	7e9a6ef410	Add, remove, and resort! (2)	2017-03-13 16:17:12 -04:00
The_Grits	b5cebffe11	Add, remove, resort!	2017-03-13 16:06:37 -04:00
The_Grits	715b05fbdf	whoops ... 12th not 15th	2017-03-08 18:20:28 -05:00
The_Grits	1794b30079	Update dates ... Costa Rica dates were updated, plus fixed a gotcha with the China dates	2017-03-08 18:18:22 -05:00
The_Grits	86b5e462c6	Between, not Around	2017-03-06 16:34:21 -05:00
Matthew Taylor	f76707381a	Merge pull request #1235 from TheGrits/patch-3 ... Fix gh-1234: Update China Conference	2017-03-06 11:10:03 -05:00
Matthew Taylor	56bf384459	Merge pull request #1233 from mewtaylor/issue/max-chars ... Match `routeAlias` with that of `/jobs` route	2017-03-06 10:23:44 -05:00
Matthew Taylor	8d2a43530e	Merge pull request #1205 from TheGrits/patch-2 ... Fix gh-1183: Remove slashes	2017-03-06 10:11:43 -05:00
The_Grits	46a3cea40c	Fix gh-1234: Update China Conference	2017-03-02 22:14:26 -05:00
Matthew Taylor	2954d0916b	match routeAlias with that of /jobs route ... this `routeAlias` is being added as it’s own path pattern since it’s not matching the other one, causing us to hit our 512 char limit.	2017-02-28 09:55:16 -05:00
Matthew Taylor	a170aec6d2	Merge pull request #1220 from TheGrits/patch-4 ... Fix gh-1218: Community Moderator Page	2017-02-28 09:38:44 -05:00
The_Grits	82af7786a0	Put back some slashes	2017-02-28 09:38:43 -05:00
The_Grits	c26e42f715	Change parenthesis	2017-02-28 09:34:20 -05:00
The_Grits	8772ab5605	Fix jobs-moderator route	2017-02-28 09:33:18 -05:00