codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-12 00:31:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
11479 commits 27 branches 0 tags 134 MiB
Commit graph

11479 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Imperadeiro98
b4b444023e Add sounds to SubscribeModal 2016-01-16 11:38:31 +00:00
Matt Lott
719c775f0c Merge remote-tracking branch 'codecombat/master' 2016-01-15 15:23:19 -08:00
Josh Callebaut
ad28be1c64 Adds casing check for unloaded/non-tasked levels. 2016-01-15 13:54:08 -08:00
Scott Erickson
ffdd19d99b Merge pull request #3326 from ryang217/getting-started 
Update Getting Started Area
 2016-01-15 13:20:56 -08:00
Robin Yang
af65b85217 Update Getting Started Area 
- Upload new Course 2 guide Pdf
- Update Getting Started Pdf
- Add links to Course 2 and Educator Wiki
 2016-01-15 13:15:08 -08:00
Scott Erickson
a8f4f9d2ec Update updateCourses script and add course 5 to it with new screenshot 2016-01-15 09:46:24 -08:00
Matt Lott
ee08dfedbb Merge branch 'master' of https://github.com/codecombat/codecombat 2016-01-14 15:31:02 -08:00
Matt Lott
c220ba9de4 School analytics scripts 2016-01-14 15:30:53 -08:00
Nick Winter
cba6a5a7b5 Update FacebookHandler test 2016-01-14 11:35:55 -08:00
Nick Winter
5ae6875260 Adjust Facebook login according to #3310 2016-01-14 10:23:16 -08:00
minwook shin
4c7567926a my first ko translation 
I'll translate other things .
 2016-01-14 11:09:43 +09:00
Josh Callebaut
89fc6cc078 Removes stay logging, implements functionality improvements for artisan modals. 2016-01-13 17:45:27 -08:00
Josh Callebaut
14c2942134 Moves Tasks to their own tab and adds a guide-book icon next to the save icon which displays help and doubles as a level review submission modal. 2016-01-13 15:54:57 -08:00
Scott Erickson
3a9eaa4c83 Extend wait time for travis client testing 2016-01-13 14:02:51 -08:00
Nick Winter
be1091caf8 Merge pull request #3315 from ryang217/master 
Cleaned up teacher testimonial area
 2016-01-12 13:13:52 -08:00
Nick Winter
7aff24b3a6 Cleaned up a couple SubscribeModal things 2016-01-12 12:34:10 -08:00
Nick Winter
63d643ac13 Merge branch 'brazil_coupon' 2016-01-12 12:26:36 -08:00
Nick Winter
67f7ce1e0d Add Brazil coupon test. Generalize prices in subscription test a bit more. Handle brazil_basic_subscription product in one more place. 2016-01-12 12:25:13 -08:00
Robin Yang
95a996af07 Cleaned up teacher testimonial area 
Fixed quote per teacher (Tim M.)’s request, added Twitter link

Adjusted font sizing and positioning on quotes.

Added smart (curly) quotes instead of straight quotes.
 2016-01-12 12:19:48 -08:00
Nick Winter
59c6d15248 Fix serialization of levels in level editor 2016-01-12 09:42:41 -08:00
Nick Winter
02484fd172 Merge pull request #3314 from ryang217/master 
Add Mongo 3.2 to list of allowed versions for running database
 2016-01-12 08:42:24 -08:00
Nick Winter
01a3ae6020 Make sure #3303 works for multiplayer and future 'course' level hero selection 2016-01-12 08:41:18 -08:00