10763 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	b3362c8d0d	Add courses to top menu ... Bumping about to bottom menu, removing clans.	2015-11-13 11:33:03 -08: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	17a5073a72	Add courses 3 & 4 to update courses script	2015-11-13 10:51:56 -08:00
Matt Lott	c953fd32d8	Merge branch 'master' into production	2015-11-13 10:31:40 -08:00
Matt Lott	c7a7a9d3ac	Redirect /teachers to /courses/teachers?hoc=true ... Will update /teachers soon with relevant information, but at the moment it is too outdated.	2015-11-13 10:30:37 -08:00
Matt Lott	c7118d69e5	Redirect 2014 HoC link to 2015 HoC link ... https://app.asana.com/0/54276215890539/65805646890763	2015-11-13 10:17:05 -08:00
Imperadeiro98	12523dd247	Update pt-PT.coffee	2015-11-13 13:21:08 +00:00
Imperadeiro98	d555b04ca4	Merge pull request #3173 from Ikuyadeu/patch-1 ... Update ja.coffee	2015-11-13 13:00:36 +00:00
Imperadeiro98	d641aa2b37	Merge pull request #3175 from Imperadeiro98/master ... Fix build	2015-11-13 13:00:12 +00:00
Imperadeiro98	fc4008567c	Fix build	2015-11-13 12:59:34 +00:00
Yuki Ueda	e6d769bab0	Update ja.coffee	2015-11-13 15:59:19 +09:00
Nick Winter	d744d2db2b	Propagate i18n	2015-11-12 16:42:37 -08:00
Matt Lott	840970c267	🐛Fix greek translation file indentation	2015-11-12 16:39:44 -08:00
Matt Lott	9189adcff0	Update teacher surveys ... Gives 2 course headcount too.	2015-11-12 16:36:31 -08:00
Nick Winter	3c62b5b39e	Merge pull request #3172 from zsdregas/master ... Greek Translation	2015-11-12 16:36:15 -08:00
Nick Winter	356f65561c	Add ladder banner images to ladder home	2015-11-12 16:30:56 -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
Zacharias Sdregas	fdeb86e353	Greek Translation 121115	2015-11-12 23:09:22 +02:00
Zacharias Sdregas	b9d2b7b07b	Almost Done	2015-11-12 23:07:38 +02: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	cb101c7905	Replace simple loops while while True in course level sample code	2015-11-12 11:00:51 -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	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	8b00c38350	Merge pull request #3168 from Imperadeiro98/use-view ... Refactor to use view in template for issue #3138	2015-11-12 09:58:49 -08:00
Matt Lott	df57e99957	Don't block videos in guide for course levels ... https://app.asana.com/0/54269205393657/61779149610165	2015-11-12 06:05:21 -08:00
Zacharias Sdregas	ca0e5af481	Some more translated	2015-11-12 15:03:07 +02:00
Matt Lott	5ca68ff682	🐛Fix analytics dashboard date oboe	2015-11-11 20:21:35 -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	b9deb363d2	Add Brazil office address	2015-11-11 10:33:21 -08:00
Nick Winter	2f2d32d843	Merge branch 'master' into production	2015-11-11 09:07:26 -08:00
Nick Winter	fae1411e3a	Fix hourOfCode initialization for unregistered players with inconsistent system time or coming to /hoc after 5 minutes	2015-11-11 09:07:16 -08:00
Zacharias Sdregas	88eeb2b3b7	some 250 more strings translated	2015-11-11 18:16:41 +02:00
Nick Winter	5752aead2f	Merge branch 'master' into production	2015-11-11 07:41:58 -08:00
Nick Winter	f6307ac04e	Made while True snippets work in course levels	2015-11-11 07:41:52 -08:00
Nick Winter	24cf607421	Merge branch 'master' into production	2015-11-11 06:42:21 -08:00
Nick Winter	42b53dff20	Fix camera and spectate bugs with new loading intro behavior	2015-11-11 06:42:12 -08:00
Imperadeiro98	18eef3b0ec	Merge pull request #3171 from probil/patch-4 ... Update ukrainian l18n	2015-11-11 14:25:34 +00:00
Imperadeiro98	a36220694a	Indentation fix	2015-11-11 14:25:17 +00:00
Imperadeiro98	871738ecdb	Merge pull request #3134 from janjoos/patch-2 ... Smart update	2015-11-11 14:24:41 +00:00
Nick Winter	6bf61dab39	Merge branch 'master' into production	2015-11-11 05:53:17 -08:00