1498 commits

Author	SHA1	Message	Date
Nick Winter	6d890051a9	Merge branch 'master' into production	2015-12-04 14:07:42 -08:00
Scott Erickson	7598236c21	Remove redundant lowercasing in classroom handler	2015-12-04 13:38:35 -08:00
Nick Winter	0c8a5dabb0	Merge branch 'master' into production	2015-12-04 12:06:48 -08:00
Scott Erickson	9d36d33051	Make fetch Classroom by code case insensitive	2015-12-04 11:30:10 -08:00
Matt Lott	ccbb7c6317	Merge branch 'master' into production	2015-12-04 09:28:52 -08:00
Nick Winter	055a6f7eeb	Update next steps email	2015-12-03 12:25:59 -08:00
Nick Winter	3677146c4a	Merge branch 'master' into production	2015-12-03 11:15:40 -08:00
Nick Winter	e3db0dea3a	Add Classroom, Clan, and Achievement indexes. Fix logging for undefined slugs indentation.	2015-12-03 11:15:34 -08:00
Nick Winter	6c1f7c789a	Merge branch 'master' into production	2015-12-03 10:55:27 -08:00
Nick Winter	b3edafe285	Add missing CourseInstance indexes. Log undefined slug lookups.	2015-12-03 10:55:08 -08:00
Matt Lott	1d51b063c4	Merge branch 'master' into production	2015-12-02 17:00:45 -08:00
Scott Erickson	704ed75f55	Fix classroom invite link	2015-12-02 15:04:56 -08:00
Scott Erickson	6be512621f	Merge branch 'master' into production	2015-12-02 14:01:44 -08:00
Scott Erickson	4403347290	Fix removing members from classrooms and course instances	2015-12-02 13:59:47 -08:00
Rob	ba2b49a5cb	Merge branch 'master' into production	2015-12-02 13:34:29 -08:00
Nick Winter	28f6dd1fe1	Merge branch 'master' into production	2015-12-02 12:07:50 -08:00
Rob	6d4c17f724	Merge branch 'master' into courses-vhoc	2015-12-02 12:03:55 -08:00
Scott Erickson	7f2ddba089	Add remove student modal to ClassroomView	2015-12-02 11:56:38 -08:00
Rob	abfce4299c	Send unique users to perfmon	2015-12-02 10:58:02 -08:00
Nick Winter	0d65d73024	Finish merging master into courses-vhoc	2015-12-02 10:10:50 -08:00
Nick Winter	da2d4507b5	Merge branch 'master' into production	2015-12-01 17:48:17 -08:00
Nick Winter	88ee363576	Add schoolName field to AuthModal	2015-12-01 17:44:03 -08:00
Nick Winter	8e1143b519	Add schoolName field to AuthModal	2015-12-01 17:32:02 -08:00
Nick Winter	2dc7800b37	Fix getting classrooms by CamelCase codes	2015-12-01 14:12:56 -08:00
Nick Winter	ae6eca583a	Present 'Play Classroom Version' before playing a campaign level when appropriate	2015-12-01 11:24:16 -08:00
Nick Winter	c44dccd59b	Merge branch 'master' into production	2015-12-01 06:05:50 -08:00
Nick Winter	ecfd982847	Note PayPal payment method. End limited-time year sale.	2015-11-30 10:50:34 -08:00
Scott Erickson	07ad8382cc	Project sessions loaded in /courses	2015-11-29 16:17:55 -05:00
Nick Winter	e8665f7299	Merge branch 'master' into production	2015-11-29 12:33:16 -08:00
Nick Winter	95c703a7df	Simulate games in background while playing levels if we think there's extra compute power	2015-11-29 12:30:19 -08:00
Scott Erickson	ea0c274a3c	Fix /courses initial implementation	2015-11-29 15:26:17 -05:00
Nick Winter	c6bb6580ab	Merge branch 'master' into production	2015-11-27 12:13:08 -08:00
Nick Winter	81af63a763	Support for calling reset account progress from scripts	2015-11-27 12:12:47 -08:00
Scott Erickson	d4540af780	Merge branch 'master' into courses-vhoc	2015-11-27 10:43:15 -05:00
Nick Winter	162a291925	Merge branch 'master' into production	2015-11-26 06:55:10 -08:00
Nick Winter	7a317370b5	Add a couple scripts for resetting user progress and migrating course sessions to hero levels	2015-11-26 06:54:23 -08:00
Matt Lott	c385aaa414	Merge branch 'master' into courses-vhoc	2015-11-25 16:11:36 -08:00
Nick Winter	7b88eb772a	Merge branch 'master' into production	2015-11-24 13:54:14 -08:00
Nick Winter	67f14c7928	Try putting AI players in league ladders	2015-11-24 13:18:38 -08:00
Matt Lott	d7a66722b9	Update teacher surveys ... Removing trial subscriptions Updating trial page copy Adding special HoC trial Introducing a new course prepaid property endDate, which won’t be returned or redeemed after the date.	2015-11-24 10:32:19 -08:00
Nick Winter	747856bd4c	Merge branch 'master' into production	2015-11-24 08:56:36 -08:00
Nick Winter	ec7f17a149	Show level indexes in courses	2015-11-24 08:56:28 -08:00
Nick Winter	ebc081d105	Only fetch hero campaigns for overworld route	2015-11-23 12:38:51 -08:00
Nick Winter	3b1f21eff5	Merge branch 'master' into production	2015-11-22 08:02:51 -08:00
Nick Winter	e0011ee5d0	Classroom invite codes are now real words like BigFrogFarm	2015-11-22 07:47:28 -08:00
Scott Erickson	a98d0b1b2a	Partial work on /courses view when signed in	2015-11-22 00:08:46 -08:00
Nick Winter	2dfaa1b7f3	Fix #3193: show completed levels again in campaign selector	2015-11-21 15:12:12 -08:00
Scott Erickson	27b21d0c4e	Add classroom code handling to StudentSignUpModal	2015-11-20 18:02:02 -08:00
Matt Lott	0140361555	Merge branch 'master' into production	2015-11-20 13:19:07 -08:00
Scott Erickson	66b1e1b61d	Fix /db/prepaid/<id>/redeemers when the creator is one of the redeemed, and prepaid tests in general	2015-11-20 13:17:33 -08:00
Matt Lott	f32316a7f7	Merge branch 'master' into production	2015-11-19 16:07:50 -08:00
Matt Lott	db5f0171c7	Make trial request created property editable	2015-11-19 16:07:02 -08:00
Matt Lott	2efc93a93f	Merge branch 'master' into production	2015-11-19 15:23:55 -08:00
Matt Lott	804c62e13b	Add created field to trial requests ... Necessary for importing external trial requests.	2015-11-19 15:20:42 -08:00
Nick Winter	c867b1f5b4	Merge branch 'master' into production	2015-11-19 14:52:04 -08:00
Nick Winter	ef7618497f	Fix #3184: get more of our campaign overworld properties we need	2015-11-19 13:20:42 -08:00
Nick Winter	04c6b27bed	Merge branch 'master' into production	2015-11-19 10:41:37 -08:00
Nick Winter	c8ceca4d3d	Add user.courseInstances, use it for course ladders	2015-11-19 10:41:31 -08:00
Scott Erickson	7a6c42b89f	Set up course-ladder level handling ... * LadderView displays course info, different style for course-ladder levels * LadderView hides simulate tab for course-ladder levels * HeroVictoryModal links to LadderView for course-ladder levels * CourseDetails page links to LadderView for course-ladder levels * Enable course instances for league simulation	2015-11-18 14:02:45 -08:00
Rob	c761e8de3b	Merge branch 'master' into production	2015-11-17 16:24:33 -08:00
Matt Lott	4abace927a	Add getPrepaidCodes API null check ... https://app.asana.com/0/53713686567836/63657760462910	2015-11-17 16:21:08 -08:00
Scott Erickson	6a54c7cf54	Add classroom name, description, and language editing, and classroom language infrastructure	2015-11-17 16:10:23 -08:00
Nick Winter	08c7ad71a5	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-11-17 15:26:51 -08:00
Nick Winter	f96a0a018c	Track ladderAchievementDifficulty in multiplayer human level sessions	2015-11-17 15:23:35 -08:00
Rob	7a377350e8	Tabs -> Spaces	2015-11-17 15:19:17 -08:00
Rob	32861b025a	Support sending performance information to stats.	2015-11-17 14:57:12 -08:00
Rob	7a86f754df	Add flavor to overworld.	2015-11-17 11:27:08 -08:00
Rob	7f3426cc09	adjacentCampaigns should be an object not an array.	2015-11-17 11:22:55 -08:00
Rob	991fead0f6	Create specific campaign view for campaign selection screen.	2015-11-17 11:15:56 -08:00
Nick Winter	d65fd3d954	Merge branch 'master' into production	2015-11-15 08:23:23 -08:00
Nick Winter	8838095a0c	Add a (very high) limit to the UserCodeProblem aggregation	2015-11-14 17:07:55 -08:00
Nick Winter	82da5b50bc	Remove one unneeded LevelSession index (there are likely more)	2015-11-14 17:00:54 -08:00
Nick Winter	34819f2d04	Add index for /db/level.session/-/recent	2015-11-14 16:47:55 -08:00
Nick Winter	9624885fe2	Aggregating UserCodeProblems by level with an index instead of aggregating all ever	2015-11-14 16:34:35 -08:00
Nick Winter	b31e5fc93a	Fix user.code.problem routes to use . instead of _	2015-11-14 16:32:21 -08:00
Matt Lott	ea3d241903	Merge branch 'master' into production	2015-11-13 13:29:19 -08:00
Rob	6ecd54baa5	Use grep to find other mismapped routes.	2015-11-13 15:13:47 -05:00
Matt Lott	2fd8334398	Merge branch 'master' into production	2015-11-13 12:01:43 -08:00
Rob	24f352fb72	Fix route mappings for trail requests.	2015-11-13 14:57:15 -05:00
Matt Lott	5ad9edb3d5	Merge branch 'master' into production	2015-11-13 11:24:12 -08:00
Rob	631cc7766d	Fix analytics mapping.	2015-11-13 14:11:07 -05:00
Matt Lott	c953fd32d8	Merge branch 'master' into production	2015-11-13 10:31:40 -08:00
Matt Lott	9189adcff0	Update teacher surveys ... Gives 2 course headcount too.	2015-11-12 16:36:31 -08:00
Nick Winter	9ab2ccd905	Merge branch 'master' into production	2015-11-12 15:36:26 -08:00
Nick Winter	9e61928080	Add reset progress feature in account settings	2015-11-12 15:27:28 -08:00
Rob	62cd00e328	Merge branch 'handler-restructure'	2015-11-12 17:34:03 -05:00
Matt Lott	e6e0617945	Tracking property for admin added course headcount	2015-11-12 12:16:40 -08:00
Rob	836a01d1a8	Pull out schema fetching, as some times we fetch schemas when we don't actually have a handler for the type.	2015-11-12 15:01:33 -05:00
Rob	234d1b5950	Bind express /db roots one at a time. ... Don't forget about the module root! Route maps better.	2015-11-12 14:43:50 -05:00
Nick Winter	a262dc781d	Merge branch 'master' into production	2015-11-12 11:01:10 -08:00
Nick Winter	910dd8e6b6	Use course access control for shared course hero levels	2015-11-12 11:00:54 -08:00
Nick Winter	44fb30b81e	Merge branch 'master' into production	2015-11-12 10:25:51 -08:00
Nick Winter	fe05e66458	Give Campaigns types so that course campaigns can share hero levels	2015-11-12 10:25:25 -08:00
Nick Winter	29892a9619	Add user country to contact messages ... https://app.asana.com/0/54275583589675/64698696631078/f	2015-11-11 15:43:25 -08:00
Nick Winter	6bf61dab39	Merge branch 'master' into production	2015-11-11 05:53:17 -08:00
Scott Erickson	30e05f3720	Restrict prepaids ... * For GET prepaids, ignore prepaids made before today * For POST prepaid redeemer, do not allow redeeming users made before today * For POST prepaid redeemer, disable db query for being a member of a different prepaid (not relevant since no one had paid before) * For POST prepaid redeemer, only allow for prepaids of type course	2015-11-10 16:32:31 -08:00
Scott Erickson	5c5db0e546	Remove named plugin from classroom ... Since we're sourcing from course instances which did not have such a limitation	2015-11-10 16:08:18 -08:00
Scott Erickson	cddf000276	Add way for admins to grant users course prepaids	2015-11-10 14:33:27 -08:00
Scott Erickson	4561ff42ce	Update prepaid course price	2015-11-10 11:37:21 -08:00
Scott Erickson	b63daf5a18	Guard against prepaid maxRedeemer properties being strings	2015-11-10 11:27:46 -08:00