Commit graph

10929 commits

Author SHA1 Message Date
Nick Winter
729ebfec8f Add script to export all trial requests 2016-01-26 13:20:35 -08:00
Nick Winter
4ae8eacd90 Treat Elemental Wars like Ace of Coders for mirror match and hero equipment 2016-01-26 13:20:23 -08:00
Nick Winter
aa18e71388 Remove a log 2016-01-26 13:20:04 -08:00
Matías Olivera
6e7b34c4fd Translate new strings 2016-01-26 18:14:24 -03:00
Matt Lott
b3e5d8f650 Add explicit track event for viewing teacher trial
We want to explicitly track views before submit.
2016-01-26 10:32:39 -08:00
Nick Winter
80466f5e9d Ran ImageOptim to losslessly compress our images by 28.7% overall 2016-01-26 07:48:51 -08:00
Scott Erickson
277c526dc3 Add CourseVictoryModal 2016-01-25 13:03:29 -08:00
Scott Erickson
57cf264880 Add img-prize, label-banner and well-parchment to design elements 2016-01-25 13:03:29 -08:00
Scott Erickson
6a9342dcd7 Upgrade to jasmine 2.4.1 2016-01-25 13:03:29 -08:00
Nick Winter
7600ebadeb Merge branch 'master' into production 2016-01-25 12:35:53 -08:00
Nick Winter
a7e6c14688 Also recognize classroom and VR floors 2016-01-25 12:35:45 -08:00
Nick Winter
a1d6341aa3 Merge branch 'master' into production 2016-01-25 12:29:33 -08:00
Nick Winter
87ceb36a6f Recognize classroom walls as wall obstacles visually 2016-01-25 12:29:22 -08:00
Matt Lott
8b4e59da5c Update analytics traits
Adding school name and course prepaid info.
2016-01-22 14:55:18 -08:00
Robin Yang
28f378f92f Update Course 2 Guide to Correct Shield Rush
Javascript solution was missing a parenthesis.
2016-01-22 14:18:41 -08:00
Robin Yang
750e22ae05 Merge remote-tracking branch 'codecombat/master' 2016-01-22 14:12:43 -08:00
Josh Callebaut
6dfc02980a Fixes non-existant task array, bad focus, adds a button to add default tasks. 2016-01-22 13:54:20 -08:00
Rob Blanckaert
28d085f6d3 Merge pull request #3349 from ryang217/master
Add additional formatting tags to Tome popup
2016-01-22 13:22:56 -08:00
Robin Yang
dc248f8d29 Add additional formatting tags to Tome popup
Helps fix this #2945
2016-01-22 13:21:17 -08:00
Cat Sync
96003dd240 filter deleted users out of ClassroomView 2016-01-22 14:32:39 -05:00
Josh Callebaut
aea23072e3 Fix #3348 - don't display score button for levels without a score type 2016-01-22 11:27:38 -08:00
Cat Sync
feb4c16b85 broadName should insert a space when using firstName lastName, and return Anoner if nothing else is available 2016-01-22 13:58:02 -05:00
Cat Sync
e4296eaf97 filter out empty solutions when clicking Fill Defaults 2016-01-22 13:41:12 -05:00
Matt Lott
f4db44ed3c Merge branch 'master' into production 2016-01-21 16:23:06 -08:00
Matt Lott
1825d0e2dd Enable Mixpanel
Closes #3347
2016-01-21 16:19:06 -08:00
Josh Callebaut
ab93dc8564 Bug fixes and style fixes. 2016-01-21 12:14:37 -08:00
Matt Lott
2546694b06 Updating latest teacher trials script
Restricting to approved trials, and pulling some extra user data.
2016-01-21 12:08:55 -08:00
Imperadeiro98
668c6e79c4 Merge pull request #3346 from darulis1/patch-1
Update lt.coffee
2016-01-21 15:04:58 +00:00
Imperadeiro98
27269758fa Merge pull request #3344 from ChaosCat/patch-2
Update he.coffee
2016-01-21 14:56:29 +00:00
darulis1
5b48e1a379 Update lt.coffee
Added and fixed more translations
2016-01-21 15:58:15 +02:00
Elian Kamal
45070c80ae Update he.coffee
Update he.coffee
2016-01-21 13:21:03 +02:00
Nick Winter
827fb90c27 Merge branch 'master' into production 2016-01-20 15:45:33 -08:00
Nick Winter
834fb8c004 Go back to old Modernizr 2016-01-20 15:45:26 -08:00
Josh Callebaut
c28720c640 Implements fixes based on code review. 2016-01-20 15:32:21 -08:00
Nick Winter
d782a4a715 Merge branch 'master' into production 2016-01-20 15:01:44 -08:00
Nick Winter
35a380b59f Insignificant change to get new production slug 2016-01-20 15:01:30 -08:00
Nick Winter
d3ff3433ca Merge branch 'master' into production 2016-01-20 13:38:22 -08:00
Nick Winter
195e2d0e1b Never mind, bayesian-battle doesn't work when imported straight from GitHub 2016-01-20 13:38:16 -08:00
Nick Winter
5043048d44 Merge branch 'master' into production 2016-01-20 13:08:24 -08:00
Nick Winter
b8afaae454 Use bayesian-battle version from GitHub for now 2016-01-20 13:07:59 -08:00
Nick Winter
3249be3102 Merge branch 'master' into production 2016-01-20 13:06:03 -08:00
Imperadeiro98
ad07b3fafa Merge pull request #3342 from a1ip/patch-1
Update ru.coffee
2016-01-20 19:53:46 +00:00
Scott Erickson
355b5925c8 Fix client tests when you go to /test/views 2016-01-20 10:58:25 -08:00
Josh Callebaut
80c2a9e539 New models with default tasks are preintialized with these tasks. 2016-01-20 10:48:53 -08:00
Nick Winter
ffc2e42038 Update Modernizr to fix some errors 2016-01-20 09:49:25 -08:00
Philippe Rigovanov
abab78d816 Update ru.coffee 2016-01-20 20:47:15 +03:00
Nick Winter
1a20d3fab6 Merge branch 'master' into production 2016-01-20 09:34:59 -08:00
Nick Winter
622c3d46de More investigation for baffling _.pluck bug 2016-01-20 09:34:32 -08:00
Cat Sync
319a0ef381 Merge branch 'master' of https://github.com/codecombat/codecombat 2016-01-20 11:48:25 -05:00
Cat Sync
efbd66a9b1 use thang.labelStyle to configure Labels
This allows level creators to configure the type of dialogue box used
when a thang says a message.
2016-01-20 11:48:09 -05:00