Commit graph

10848 commits

Author SHA1 Message Date
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
a7e6c14688 Also recognize classroom and VR floors 2016-01-25 12:35:45 -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
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
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
1825d0e2dd Enable Mixpanel
Closes #3347
2016-01-21 16:19:06 -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
834fb8c004 Go back to old Modernizr 2016-01-20 15:45:26 -08:00
Nick Winter
35a380b59f Insignificant change to get new production slug 2016-01-20 15:01:30 -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
b8afaae454 Use bayesian-battle version from GitHub for now 2016-01-20 13:07:59 -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
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
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
Nick Winter
af77dc39b8 Logging Facebook auth response for #3110 2016-01-20 08:10:01 -08:00
Scott Erickson
51408a94de Update jasmine for server tests to 2.4.1, fix server focus tests
Before if you focused tests, they would bypass the setup "tests" and break.
Now the server setup logic is in a beforeEach.
2016-01-19 16:34:48 -08:00
Imperadeiro98
6772d5bdf4 Merge pull request #3339 from minwook-shin/patch-2
My second ko translation.
2016-01-19 14:59:38 +00:00
minwook shin
3d85c01c59 My second ko translation.
This has translated this means.
265 : Holy smokes -> Surprise [놀라다]
2016-01-19 19:02:58 +09:00
Nick Winter
770379c521 Testing fix for weird _.pluck issue 2016-01-18 16:09:19 -08:00
Scott Erickson
491a679abb Merge pull request #3327 from Imperadeiro98/master
Cleaned couple files
2016-01-18 15:35:59 -08:00
Scott Erickson
c23fb50fa7 Merge pull request #3330 from differentmatt/teacher-news
Add approved teacher trials to CodoCombat list Teachers group
2016-01-18 15:18:55 -08:00
Scott Erickson
a28b53eb5c Merge pull request #3321 from taptapdan/fix-issue-2732
Looks good. Thanks!
2016-01-18 15:08:52 -08:00
Matt Lott
9d1213bdf9 Update recovery password email
Closes #3332
2016-01-18 12:46:18 -08:00
Imperadeiro98
a4792282f5 Merge pull request #3333 from Kumaguma/patch-1
Update ja.coffee
2016-01-18 20:02:16 +00:00
Kuma
5a6d074aeb Update ja.coffee
Deleted # from the lines I translated.
2016-01-18 12:19:18 -06:00
Kuma
539f0ae936 Update ja.coffee
I added translations under teachers_survey:, versions:, and account_settings:.
Thanks,
2016-01-17 20:56:34 -06:00
Matt Lott
d2921f66cb Add approved teacher trials to mail news group 2016-01-17 07:39:30 -08:00
Imperadeiro98
1359dcc5c6 Fixes to previous merge 2016-01-17 09:57:02 +00:00
Imperadeiro98
3e3f083f99 Merge pull request #3329 from FedericoTomas/patch-11
Update es-419.coffee
2016-01-17 09:55:01 +00:00
Imperadeiro98
40f67c0d6f Uncommented some headers 2016-01-17 09:53:52 +00:00
Imperadeiro98
8a93026b5f Merge pull request #3318 from minwook-shin/patch-1
my first ko translation
2016-01-17 09:53:02 +00:00
Federico Tomas
44e82881c5 Update es-419.coffee
I'm back guys, trying to help you a little more.
Bye!, happy new year to everyone.
2016-01-17 03:04:15 -03:00
Daniel Fiore
39b42fe363 Fix level list highlighted levels
The Level Editor level list now highlights the row in which you are the
person who last saved the level. The level list now also displays
glyphicons to indicate watched/unwatched levels.
2016-01-16 15:05:54 -08:00
Imperadeiro98
f47640e59a Cleaned couple files
Removed some unused styles, a template, a view and changed the class
name of some views
2016-01-16 12:07:15 +00:00