Commit graph

176 commits

Author SHA1 Message Date
Nick Winter
5ae6875260 Adjust Facebook login according to #3310 2016-01-14 10:23:16 -08:00
Nick Winter
7aff24b3a6 Cleaned up a couple SubscribeModal things 2016-01-12 12:34:10 -08:00
Scott Erickson
13b9d81e4c Fix some demo views 2016-01-07 09:40:35 -08:00
Scott Erickson
93b9aa3c2c Add DesignElementsView (mostly complete) 2016-01-06 16:11:28 -08:00
Rob
86d9b081c1 Merge branch 'cashew' 2016-01-06 12:03:49 -08:00
Scott Erickson
d1e7055b1a Add code highlighting to solution treema nodes in level editor 2016-01-06 09:58:04 -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
3be6abf2e1 Merge Router.coffee 2015-12-23 08:23:23 -08:00
Josh Callebaut
79ff058117 Adds the Thang Task View. 2015-12-21 12:44:22 -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
Scott Erickson
ef3f847932 Remove SubscriptionSaleView 2015-12-16 16:39:44 -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
Scott Erickson
d081f7553d Fix FacebookHandler and its test 2015-12-11 15:39:07 -08: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
7e24cda7f8 Redirect logouts to /hoc always for now
Generic solution to replace commit 77a8347.
Will have all redirects go to / once HoC is over.
2015-12-10 12:26:03 -08:00
Nick Winter
608d45ba70 Don't do undefined slug collection scans 2015-12-10 09:05:34 -08:00
Matt Lott
f3279863d4 Track pageviews analytics internally 2015-12-04 16:07:58 -08:00
Matt Lott
05497f023f Add /Courses to router 2015-12-03 11:39:13 -08:00
Rob
6d4c17f724 Merge branch 'master' into courses-vhoc 2015-12-02 12:03:55 -08:00
Rob
2ecf6dfec6 Log when we prevent keystrokes so that we can solve a crazy bug. 2015-12-02 12:03:27 -08:00
Nick Winter
0d65d73024 Finish merging master into courses-vhoc 2015-12-02 10:10:50 -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
Rob
38a4ca4ec0 Load fonts locally when in development. 2015-12-01 16:47:11 -08:00
Scott Erickson
0c45e3f96c Add ClassroomView, incomplete 2015-11-30 14:14:27 -05: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
Matt Lott
e7acf9c798 🐛Fix local env analytics log event URL
Found another one @basicer
2015-11-25 16:33:27 -08:00
Rob
4dde97153c Don't panic if we didn't load stripe. (Makes game run offline). 2015-11-24 13:42:00 -05:00
Nick Winter
ef72286864 Don't autoplay hero or course levels by default. Fix Course: Known Enemy autocomplete string format. 2015-11-15 07:59:20 -08:00
Matt Lott
5ca68ff682 🐛Fix analytics dashboard date oboe 2015-11-11 20:21:35 -08:00
Matt Lott
1c0550ff9f 🐛Fix admin analytics date bugs 2015-11-10 17:26:15 -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
Matt Lott
e33323e7eb Add line charts to admin analytics dashboard
https://app.asana.com/0/54276215890539/64369256136957
2015-11-10 14:55:48 -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
7d686c5194 Add Backbone events to stripe handler 2015-11-05 15:31:25 -08:00
Scott Erickson
b36bf7b171 Add PurchaseCoursesView 2015-11-05 15:30:57 -08:00
Matt Lott
722540f3be Remove old user analytics page 2015-11-04 10:59:10 -08:00
Matt Lott
d445024cb6 Add admin analytics page with MAUs
Includes updating analytics insert script used to inject aggregated
data into production database.
2015-11-04 10:59:10 -08:00
Scott Erickson
66432990f4 Add framework for new courses pages 2015-11-03 16:41:06 -08:00
Nick Winter
f100d6dba6 Merge pull request #3118 from codecombat/soffes/ipad
[WIP] Changes for iPad app
2015-10-29 16:24:39 -07:00
Scott Erickson
31367f39c1 Add class "ie10" to body when using IE10 2015-10-28 11:33:36 -07:00
Matt Lott
38242eb55e Add /Careers routing entry 2015-10-26 20:39:40 -07:00
Scott Erickson
94d29d2e8a Move trailing slash removal to client Router, make client route "/play/" work for facebook 2015-10-21 16:55:48 -07:00
Sam Soffes
d2052980c4 Send sign out message directly 2015-10-16 15:02:33 -07:00
Sam Soffes
59f987e105 Check for new iPad User-Agent 2015-10-16 14:42:25 -07:00
Matt Lott
708f78153b Route /hoc to courses
When in HoC mode:
Students have an option to play through as a single player, in addition
to entering a code to join an existing class.
Teachers get the normal course enrollment flow, without a sales blurb
on /courses.
2015-10-12 16:25:23 -07:00