3175 commits

Author	SHA1	Message	Date
Rob	86d9b081c1	Merge branch 'cashew'	2016-01-06 12:03:49 -08:00
Nick Winter	7864d3708b	Change traditional Chinese label to be in traditional Chinese	2016-01-05 15:20:22 -08:00
Daniel Fiore	a215c2e01c	Fix Earned Achievements Check	2016-01-04 19:23:14 -08:00
Rob	3b4433e312	Use hero instead of this. Also use published aether package.	2016-01-04 17:23:58 -08:00
Rob	3baea9683c	Additional java support.	2016-01-04 16:41:24 -08:00
CodeCombat	41a532cb50	WIP - cashew integration	2016-01-04 16:27:27 -08:00
Nick Winter	187a6f87a9	Include course info in contact message session links	2015-12-28 08:15:48 -08:00
Imperadeiro98	f369c73b2a	Remove unnecessary sound	2015-12-28 16:11:09 +00:00
Imperadeiro98	bf6601c3cc	Fix for GenerateTerrainModal	2015-12-26 21:56:05 +00:00
Imperadeiro98	b7ba677b00	Use view in template	2015-12-26 14:21:06 +00:00
Nick Winter	208073ffdb	Fix saving levels from #3276 refactoring	2015-12-24 11:21:12 -08:00
Nick Winter	c0d58c3786	Tweak style and add i18n for #3280	2015-12-24 06:34:54 -08:00
Pulkit Agarwal	357e8c0bcd	Add level to user profile page	2015-12-24 15:52:30 +05:30
Nick Winter	71fc8d5230	Don't risk destruction of level unlock links	2015-12-23 12:08:09 -08:00
Nick Winter	40da26f99c	Remove misc typo. Fix NewModelModal name field focus while at it.	2015-12-23 10:33:55 -08:00
Nick Winter	08f983db59	Propagate i18n	2015-12-23 10:07:32 -08:00
Nick Winter	b42ed395c0	Small fix for #3276 NewLevelComponentModal	2015-12-23 08:41:00 -08:00
Nick Winter	6b02a7a31f	Merge pull request #3276 from Imperadeiro98/master ... Use view in template	2015-12-23 08:29:54 -08:00
Nick Winter	3be6abf2e1	Merge Router.coffee	2015-12-23 08:23:23 -08:00
Nick Winter	08d0440c71	Link to language-specific forum categories when available	2015-12-23 08:22:19 -08:00
Matt Lott	b971ce3492	Enroll single student without modal in classroom view	2015-12-21 15:45:14 -08:00
Josh Callebaut	314f8256ee	Improves style further.	2015-12-21 15:42:46 -08:00
Matt Lott	bde8e6721c	Add enroll students button to /courses/teachers	2015-12-21 15:04:21 -08:00
Nick Winter	e070c70b9d	Put /schools into the main flow in place of anonymous /teachers for now	2015-12-21 15:02:11 -08:00
Nick Winter	2adb255a48	Merge pull request #3275 from taptapdan/fix-issue-3243 ... Fix achievements notifications animation	2015-12-21 13:32:44 -08:00
Matt Lott	11d24e939b	Add smooth down arrow navigation to /schools	2015-12-21 13:00:39 -08:00
Josh Callebaut	79ff058117	Adds the Thang Task View.	2015-12-21 12:44:22 -08:00
Imperadeiro98	025d2bea2f	Couple fixes	2015-12-21 16:03:28 +00:00
Imperadeiro98	e70cbed4e4	Use view in template	2015-12-21 15:51:46 +00:00
Daniel Fiore	25531477c5	Fix achievements notifications animation ... This fixes #3243. Achievement notification animation now slides in from off-screen left and then hides back to off-screen left.	2015-12-20 22:28:09 -08:00
Nick Winter	105c2c9497	Get prerenderedSpriteSheetData in level editor	2015-12-20 07:02:15 -08:00
Scott Erickson	079109145f	Cull recruiting views and translations	2015-12-18 10:34:21 -08:00
Scott Erickson	53f8bca26b	Add logoutRedirectURL property to RootView, default to /, add exceptions	2015-12-18 10:02:03 -08:00
Matt Lott	94cf5654ff	Update /teachers with post-HoC copy	2015-12-18 05:39:25 -08:00
Scott Erickson	e1130ff1e8	Clean up legal string interpolation	2015-12-16 16:39:46 -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
Nick Winter	31eb6e6045	Fix #3017	2015-12-16 16:39:45 -08:00
Scott Erickson	3f6afa6580	Interpolate discount in year sub description	2015-12-16 16:39:45 -08:00
Scott Erickson	96e6920722	Update some copy to use db products	2015-12-16 16:39:44 -08:00
Scott Erickson	ef3f847932	Remove SubscriptionSaleView	2015-12-16 16:39:44 -08:00
Scott Erickson	a28e7bde2c	Update tests for db products, some cleanup	2015-12-16 16:39:44 -08:00
Nick Winter	9821195ec9	Turn off HoC homepage play redirect	2015-12-16 16:39:44 -08:00
Matt Lott	d369c0b47c	Update /schools contact us button styling	2015-12-16 16:39:43 -08:00
Matt Lott	646aa56716	/schools page	2015-12-16 16:39:43 -08:00
Scott Erickson	7c516c4d9f	Move product information to the db	2015-12-14 11:10:50 -08:00
Nainufar	16033f2a5e	Update DiplomatView.coffee	2015-12-13 22:28:48 +01:00
Scott Erickson	703671940f	Make Facebook login only happen when user explicitly clicks to do so	2015-12-11 14:47:42 -08:00
Scott Erickson	71bca28148	Have level list in CourseDetailsView include play buttons up through the last level completed and any levels started	2015-12-11 12:59:53 -08:00
Barry	3db216a341	Fetched from master repo	2015-12-10 19:25:42 -05:00
Nick Winter	4458a57771	Save our MongoDB oplog	2015-12-10 14:51:34 -08:00