Commit graph

12502 commits

Author SHA1 Message Date
Rob
6c9f351f01 Group concept map by campaign. 2016-07-27 14:17:37 -07:00
Rob
75e3c54d54 Add concept map view to artisans. 2016-07-27 13:44:55 -07:00
Rob
fd17793819 Add user completion time analysis script for students. 2016-07-27 13:43:22 -07:00
Scott Erickson
ac4df997c1 Display treema errors 2016-07-26 16:48:04 -07:00
Robin Yang
2cfe7d0b43 Add Elliot Blurb on About Page 2016-07-26 15:32:37 -07:00
phoenixeliot
0f974381cd Merge branch 'master' into production 2016-07-26 13:13:13 -07:00
phoenixeliot
642847c9c5 Improve progress dot layout for extra courses 2016-07-26 13:11:51 -07:00
phoenixeliot
433f4108b8 Merge branch 'master' into production 2016-07-26 11:54:16 -07:00
phoenixeliot
bd8a284ce6 Improve layout of help blocks in signup form 2016-07-26 11:54:02 -07:00
Scott Erickson
b837de2394 Merge branch 'master' into production 2016-07-26 10:52:11 -07:00
Scott Erickson
8117a000c1 Fix PlayLevelView race condition typo 2016-07-26 10:38:15 -07:00
Rob
ccb1d3cd94 Plural 2016-07-25 16:36:49 -07:00
Scott Erickson
053ce34faf Prevent users from signing up with or changing to an email-like username 2016-07-25 16:33:48 -07:00
Rob
782aacf35e Patch Earned Achievements more generally. 2016-07-25 16:33:11 -07:00
Rob
d292e180d2 Fix earned acheivements 2016-07-25 16:12:14 -07:00
Scott Erickson
34310642c7 Add destudent and deteacher buttons to AdministerUserModal 2016-07-25 16:09:24 -07:00
Scott Erickson
1064d64172 Update FB API to v2.7
We were on v2.0, which is being deprecated on August 8th
2016-07-25 13:56:05 -07:00
phoenixeliot
2447e790e1 Merge branch 'master' into production 2016-07-25 12:08:45 -07:00
phoenixeliot
f1f020a50d Use course.releasePhase instead of .adminOnly
Remove old comment
2016-07-25 11:29:30 -07:00
phoenixeliot
d1206ba692 Merge branch 'master' into production 2016-07-25 11:12:41 -07:00
phoenixeliot
5fa2e9b865 Stop spec from using your godmode setting 2016-07-25 10:51:52 -07:00
Nick Winter
9ae5109e40 Show projects in TeacherClassView, proper font in first web-dev project level for now for demo 2016-07-24 14:42:07 -07:00
Matt Lott
9ad7376edf Add shareable to admin classroom levels page 2016-07-24 08:09:12 -07:00
Matt Lott
9962ff83d4 Level editor play classroom options 2016-07-23 21:03:19 -07:00
rudmanmrrod
7b76180902 Added more translations (#3803) 2016-07-23 22:44:01 +01:00
Matt Lott
e4867e3700 Fix close.io opportunities script
License inquiries initially assigned to wrong owner, and this fixes
them up.
2016-07-23 10:30:05 -07:00
Nick Winter
ea61499a10 Add Done button hotkey 2016-07-22 17:59:32 -07:00
Matt Lott
12f46a6f31 Add followup call tasks for CA/UK/AU/NZ 2016-07-22 17:23:38 -07:00
Matt Lott
2722d501be Add followup emails for CA/UK/AU/NZ 2016-07-22 16:59:55 -07:00
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