333 commits

Author	SHA1	Message	Date
Matt Lott	cb29d7068b	Add prepaids to payments ... Closes #3402	2016-02-17 10:08:44 -08:00
Nick Winter	6800ea2ff7	Add picoCTFProblem field to levels	2016-02-10 14:16:54 -08:00
Nick Winter	260fd21f4e	Add Segment for teachers, misc analytics cleanup tweaks	2016-02-02 15:13:55 -08:00
Cat Sync	ba63dcde2c	Rearrange level editor task order	2016-02-01 10:53:50 -05:00
Josh Callebaut	8347c8247f	Merge branch 'master' of https://github.com/codecombat/codecombat	2016-01-28 13:57:56 -08:00
Josh Callebaut	aea23072e3	Fix #3348 - don't display score button for levels without a score type	2016-01-22 11:27:38 -08:00
Josh Callebaut	80c2a9e539	New models with default tasks are preintialized with these tasks.	2016-01-20 10:48:53 -08:00
Matt Lott	d2921f66cb	Add approved teacher trials to mail news group	2016-01-17 07:39:30 -08:00
Rob	86d9b081c1	Merge branch 'cashew'	2016-01-06 12:03:49 -08:00
Scott Erickson	220c124780	Remove enum from user gender string ... Fixes a bug where when logging in with G+ with profile gender 'other', login doesn't fail silently.	2016-01-04 16:34:50 -08:00
CodeCombat	41a532cb50	WIP - cashew integration	2016-01-04 16:27:27 -08:00
Scott Erickson	079109145f	Cull recruiting views and translations	2015-12-18 10:34:21 -08:00
Nick Winter	129d3b793d	Add Mandate for modifying simulation throughput on the fly, other things later	2015-12-16 16:39:45 -08:00
Scott Erickson	7c516c4d9f	Move product information to the db	2015-12-14 11:10:50 -08:00
Matt Lott	5ea9b6e8af	Update trial requests to be type course	2015-12-08 16:16:02 -08:00
Nick Winter	1187390fd0	Improve simulation game logic, and re-enable automatic simulations under certain conditions, better targeted toward the matches the player cares about	2015-12-06 09:20:37 -08:00
Nick Winter	88ee363576	Add schoolName field to AuthModal	2015-12-01 17:44:03 -08:00
Nick Winter	46e738a737	Collapse sets of achievements in achievements list	2015-11-28 08:39:05 -08:00
Nick Winter	ec7f17a149	Show level indexes in courses	2015-11-24 08:56:28 -08:00
Nick Winter	e0011ee5d0	Classroom invite codes are now real words like BigFrogFarm	2015-11-22 07:47:28 -08:00
Matt Lott	db5f0171c7	Make trial request created property editable	2015-11-19 16:07:02 -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	c8ceca4d3d	Add user.courseInstances, use it for course ladders	2015-11-19 10:41:31 -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	040f7c94ab	Track ladderAchievementDifficulty in multiplayer human level sessions	2015-11-17 15:25:22 -08:00
Nick Winter	f1b0b4f9c5	Allow achievement query editing in achievement editor	2015-11-17 15:24:33 -08:00
Nick Winter	31a13d69b3	Add playback: playing: false default to scripts, with default editor task to adjust it	2015-11-15 08:03:14 -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	f7f7cd683e	Allow using hero levels as course levels. Refactor current course tracking to use GET parameters.	2015-11-12 10:25:25 -08:00
Scott Erickson	d9d5dce2e0	Merge branch 'master' into course-correction	2015-11-10 16:34:33 -08:00
Nick Winter	2259076800	LoadingScreen -> level intro behavior	2015-11-10 15:22:09 -08:00
Scott Erickson	0c5b39e029	Merge branch 'master' into course-correction ... Some package scripts got in the way of each other	2015-11-09 18:18:02 -08:00
Scott Erickson	c8a47818c2	Initial setup of the hoc page	2015-11-09 16:45:12 -08:00
Scott Erickson	39a60f1cb7	Disabling required fields to make it easier to migrate	2015-11-09 16:07:27 -08:00
Scott Erickson	4b71447877	Have POST /db/prepaid/:id/redeemers set user.coursePrepaidID property	2015-11-05 12:53:25 -08:00
Nick Winter	34715befcc	Increment user's concept stats on level completion	2015-11-04 13:42:09 -08:00
Scott Erickson	0e2305bc3d	Add POST /db/course_instance/:id/members	2015-11-03 14:00:51 -08:00
Scott Erickson	429f50e1c6	Untie CourseInstance creation from prepaids, tie them to classrooms instead	2015-11-03 11:18:44 -08:00
Scott Erickson	27d423a410	Add Classroom server model and endpoints	2015-11-02 17:07:23 -08:00
Scott Erickson	c3735ba0eb	Add exhausted property to prepaid model ... It is true when redeemers.length >= maxRedeemers	2015-11-02 13:06:58 -08:00
Scott Erickson	fa4355f946	Add programming language to options in course instances	2015-10-30 15:56:43 -07:00
Rob	f0e1fc1f77	Let API properties declare their return values should be captured. ... Auto complete will know when to add a variable asingment.	2015-10-29 15:07:19 -04:00
Rob	da92e15bfb	Give some API properties priority in autocomplete.	2015-10-27 23:23:43 -04:00
Scott Erickson	9e04d425cc	Levels link in ControlBarView goes to last visited course instance page for course levels	2015-10-27 17:04:07 -07:00
Scott Erickson	1085731fdd	Fix colorConfig prerendered sprite sheet data, comparison	2015-10-14 10:41:10 -07:00
Scott Erickson	39bddb889e	Have LayerAdapter use prerendered spritesheets (unfinished)	2015-10-13 16:43:56 -07:00
Scott Erickson	919e0605e9	Add spriteSheets to ThangType, export modal to Thang Editor ... Units can be exported as rastered sprite sheets. This is the first part of the project, the second part will be having the game use them.	2015-10-12 16:47:48 -07:00
Nick Winter	5dde55c1f3	Add premium server recognition for Brazil	2015-10-09 08:05:34 -07:00
Scott Erickson	ee138660da	Tweak level schema to get WebStorm to stop thinking it's bad syntax	2015-10-06 11:06:41 -07:00
Matt Lott	686d7ac0a8	Fix course schema typo	2015-09-25 15:28:43 -07:00