codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-30 19:06:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
10820 commits 27 branches 0 tags 134 MiB
Commit graph

7903 commits

Author SHA1 Message Date
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
minwook shin
3d85c01c59 My second ko translation. 
This has translated this means.
265 : Holy smokes -> Surprise [놀라다]
 2016-01-19 19:02:58 +09: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
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
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
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
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
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
01a3ae6020 Make sure #3303 works for multiplayer and future 'course' level hero selection 2016-01-12 08:41:18 -08:00
Nick Winter
345036f68f Merge pull request #3303 from taptapdan/fix-issue-3299 
Fix thangTypes filtering in serialize
 2016-01-12 08:39:58 -08:00
Imperadeiro98
49c57bbf6b Update pt-PT.coffee 2016-01-11 21:17:53 +00:00
Nick Winter
a91f33df4b Propagate i18n 2016-01-11 12:59:28 -08:00
Imperadeiro98
cfa4617e16 Add indicator to changed string 2016-01-11 20:57:42 +00:00
Imperadeiro98
f60f17ce47 Merge pull request #3313 from durianboy/patch-3 
Patch 3
 2016-01-11 20:27:07 +00:00
Maka
e786073f5b Updated teacher page to remove 'unlimited enrollment' reference. 2016-01-11 12:59:49 -05:00
Nick Winter
e872ead632 Implement Brazil coupon 2016-01-11 09:52:46 -08:00
durianboy
ae368894e1 Update zh-HANT.coffee 2016-01-11 17:45:41 +08:00
durianboy
62e1a0b876 Update zh-HANT.coffee 2016-01-11 17:24:39 +08:00
Imperadeiro98
150e517c73 Merge pull request #3309 from xavismeh/master 
Enhanced french translation
 2016-01-10 19:43:56 +00:00
Imperadeiro98
5d439834ba Merge pull request #3305 from darulis1/patch-1 
Update lt.coffee
 2016-01-10 19:36:19 +00:00
Xavier Coureau
3f9a0c2973 Enhanced french translation 
Typo

Typo
 2016-01-09 23:45:49 +01:00
Matt Lott
213f3edd0d Update /about team section 2016-01-08 10:25:21 -08:00
darulis1
838c0f20cb Update lt.coffee 2016-01-08 16:59:58 +02:00
Imperadeiro98
39697ebc86 Merge pull request #3304 from durianboy/patch-2 
Update zh-HANT.coffee
 2016-01-08 12:56:05 +00:00
Matt Lott
017dea696f Remove HoC extra 2 months trial enrollments 2016-01-07 15:45:46 -08:00
durianboy
2f4079084b Update zh-HANT.coffee 
我需要有人告訴我我這樣算是上傳pull請求嗎?
I need someone to tell me have I PULL by propose file change?
 2016-01-08 05:04:30 +08:00
Daniel Fiore
ed17d967d2 Fix thangTypes filtering in serialize 2016-01-07 12:26:40 -08:00
Scott Erickson
a10aec256f Set upper limit to max seats you can purchase at once 2016-01-07 09:54:02 -08:00
Scott Erickson
13b9d81e4c Fix some demo views 2016-01-07 09:40:35 -08:00
Scott Erickson
5941c4b27f Add autocomplete and slider to design elements view, limit showing javascript widgets automagically 2016-01-06 16:33:50 -08:00
Scott Erickson
93b9aa3c2c Add DesignElementsView (mostly complete) 2016-01-06 16:11:28 -08:00