Commit graph

12373 commits

Author SHA1 Message Date
phoenixeliot
efeabe7a34 Merge branch 'master' into production 2016-07-22 10:43:39 -07:00
phoenixeliot
cac87559c6 Remove frequent console logs in web levels 2016-07-22 10:43:08 -07:00
phoenixeliot
f9d0adaca6 Fix levelType refactor 2016-07-22 10:43:08 -07:00
Scott Erickson
c3381c1274 Fix updatePrepaid.js user updates 2016-07-22 09:33:50 -07:00
Matt Lott
1e0aa1a375 Import lead using NCES school name if we have it 2016-07-21 16:57:08 -07:00
Scott Erickson
e19d31b9b2 updatePrepaid function can modify creator property 2016-07-21 16:42:32 -07:00
Scott Erickson
2b09a24436 Have createLicenses.js script include redeemers array 2016-07-21 16:41:39 -07:00
Scott Erickson
b1c69b686c Add admin button to update course content for classrooms 2016-07-21 15:16:17 -07:00
Matt Lott
e834b93a0a Use ZP custom school name field if available 2016-07-21 15:09:06 -07:00
Matt Lott
fd0fdfe83e Update inbound sales lead split 2016-07-21 15:09:06 -07:00
Scott Erickson
57f8aedaa5 Hide student tab on TeacherClassView until it's ready 2016-07-21 13:54:37 -07:00
Scott Erickson
b52cbd6b62 Tweak output 2016-07-21 11:33:24 -07:00
Scott Erickson
4bc9ea77c6 Add updatePrepaid.js stored mongodb script 2016-07-21 11:31:08 -07:00
Scott Erickson
6b78ab3fe8 Add createLicenses.js mongodb script 2016-07-21 11:23:14 -07:00
Matt Lott
01679982d5 Remove intro/overview from guide game menu
Unless picoCTF
Will show guide option if non-course and help videos.
2016-07-21 11:11:11 -07:00
phoenixeliot
6e0fde23ab Merge branch 'master' into production 2016-07-21 10:21:20 -07:00
phoenixeliot
b1277dc95f Merge branch 'game-dev-levels' 2016-07-21 10:14:22 -07:00
Scott Erickson
908354d6cb Merge pull request #3805 from UltCombo/campaign-view-level-titles-tooltip
Campaign view: fix level titles getting cut off
2016-07-21 09:18:43 -07:00
Nick Winter
436896de4a Update /about jobs 2016-07-21 09:06:57 -07:00
Matt Lott
4226cd098d Shrink campaign map flags, hovers, click areas 2016-07-20 21:03:48 -07:00
UltCombo
11ba5333d4 Campaign view: fix level titles getting cut off
E.g.:

![Forest - level titles cut off](http://i.imgur.com/cfIbyXv.png)
2016-07-21 00:02:39 -03:00
phoenixeliot
2ebf94c3db Combine extracted script/style tags 2016-07-20 17:20:21 -07:00
Matt Lott
15bcae8a17 Show API popup entirely over surface
Covering user code causes problems for players.
2016-07-20 17:06:51 -07:00
phoenixeliot
ce137f00cb Fix level preview CSS 2016-07-20 17:04:01 -07:00
phoenixeliot
f28c17c9bf Fix spacing to be consistent 2016-07-20 15:47:20 -07:00
phoenixeliot
62813e41a3 Extract styles and scripts 2016-07-20 15:44:01 -07:00
Matt Lott
f797154796 Merge branch 'master' into production 2016-07-20 14:45:51 -07:00
Matt Lott
72905c7ff2 Reduce Mixpanel event tracking
Turning off homepage events and play pageviews.
2016-07-20 14:45:13 -07:00
phoenixeliot
5259a86d3a Merge branch 'master' into production 2016-07-19 14:20:45 -07:00
phoenixeliot
6fdda491bd Fix for when database courses/campaigns don't match 2016-07-19 14:13:24 -07:00
Rob Blanckaert
5bb7f243f5 Update web-dev-listener.js 2016-07-19 13:44:25 -07:00
phoenixeliot
58284dff33 Turn on Ace HTML worker for syntax errors 2016-07-19 11:30:02 -07:00
Matt Lott
01a8312617 🐛Classroom last played string null level check 2016-07-19 10:10:48 -07:00
Matt Lott
f43012c7a6 Merge branch 'master' into production 2016-07-19 09:29:11 -07:00
Matt Lott
7bf3fc6a78 🐛Don't route level load error mails to sales 2016-07-19 06:36:11 -07:00
Nick Winter
cb1021e013 Fix typo in game-dev-2 ordering 2016-07-18 22:27:20 -07:00
Matt Lott
1f1132ecf8 Prioritize displaying first/last names over username 2016-07-18 12:38:29 -07:00
phoenixeliot
2bc020ab4d Merge branch 'master' into production 2016-07-18 11:43:11 -07:00
phoenixeliot
4e449fea3b Fix gplus/fb signin and tests 2016-07-18 11:41:18 -07:00
phoenixeliot
d7209d784e Add option to print current spec name to jasmine 2016-07-18 10:56:25 -07:00
phoenixeliot
316e0d7144 Merge branch 'master' into production 2016-07-18 10:47:10 -07:00
phoenixeliot
1d616cd92a Fix indentation 2016-07-18 10:46:51 -07:00
phoenixeliot
96fa50afe4 Merge branch 'master' into production 2016-07-18 10:42:54 -07:00
phoenixeliot
bb6262483f Allow username-only signup for classroom users
Address some code review feedback

Correct error code in test

Don't try to send emails to empty addresses

Add tests for subscriptions

Add tests for Next Steps email

Fix specs

Add reason for disabled test
2016-07-18 10:41:17 -07:00
Bryukhanov Valentin
ff523c2431 Merge pull request #3802 from codecombat/Bryukh-ru-hints
Update ru.coffee - hints ui
2016-07-18 20:23:51 +03:00
Matt Lott
68ebfa0e39 Update license inquiry call task name 2016-07-18 10:08:23 -07:00
Bryukhanov Valentin
2852f5014c Update ru.coffee - hints ui
Add "hints" translations in the editor UI
2016-07-18 19:54:20 +03:00
Matt Lott
607c129c7f School active licenses admin page 2016-07-18 09:41:42 -07:00
Nick Winter
f94cc2ec1f Fix CS1, CS2, GD1, WD2, CS3, etc. labeling in TeacherClassesView, too 2016-07-17 01:12:58 -07:00
Nick Winter
6e65171a83 i18n, comments, misc cleanup 2016-07-17 00:53:17 -07:00