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
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
Imperadeiro98
668c6e79c4
Merge pull request #3346 from darulis1/patch-1
...
Update lt.coffee
2016-01-21 15:04:58 +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
Josh Callebaut
c28720c640
Implements fixes based on code review.
2016-01-20 15:32:21 -08:00
Josh Callebaut
80c2a9e539
New models with default tasks are preintialized with these tasks.
2016-01-20 10:48:53 -08:00
Philippe Rigovanov
abab78d816
Update ru.coffee
2016-01-20 20:47:15 +03: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
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
Josh Callebaut
ad28be1c64
Adds casing check for unloaded/non-tasked levels.
2016-01-15 13:54:08 -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
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
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
Scott Erickson
fde11d8f0d
Add fill defaults button to solutions treema node in level editor
2016-01-06 13:50:06 -08:00
Rob
86d9b081c1
Merge branch 'cashew'
2016-01-06 12:03:49 -08:00
Scott Erickson
d1e7055b1a
Add code highlighting to solution treema nodes in level editor
2016-01-06 09:58:04 -08:00
Xavier Coureau
f309f5dad3
Merge remote-tracking branch 'upstream/master'
2016-01-06 00:45:44 +01:00
Nick Winter
7864d3708b
Change traditional Chinese label to be in traditional Chinese
2016-01-05 15:20:22 -08:00
Nick Winter
568f04ac39
Merge pull request #3296 from taptapdan/fix-issue-3264
...
Fix isSilhouettedItem
2016-01-05 14:20:23 -08:00
Nick Winter
c15b67f654
Merge pull request #3297 from taptapdan/fix-issue-3294
...
Fix Earned Achievements Check
2016-01-05 14:16:42 -08:00
ryang217
c29db142a1
Add locale keys for Robin About Page entry
...
Adding onto 57ed2fa
.
2016-01-05 14:02:08 -08:00
ryang217
57ed2fae67
Added Robin to About page
2016-01-05 13:04:02 -08:00
Imperadeiro98
34cc8c07dd
Merge pull request #3298 from Goby-Wan/master
...
Updates FR locale file
2016-01-05 17:06:39 +00:00
GOBY Alexandre
061509dfb3
Update fr.coffee
2016-01-05 17:35:57 +01:00
Xavier Coureau
87741c6e93
Enhanced french translation
2016-01-05 16:19:54 +01:00
Daniel Fiore
a215c2e01c
Fix Earned Achievements Check
2016-01-04 19:23:14 -08:00
Rob
3b4433e312
Use hero instead of this. Also use published aether package.
2016-01-04 17:23:58 -08:00
Rob
3baea9683c
Additional java support.
2016-01-04 16:41:24 -08:00
Scott Erickson
220c124780
Remove enum from user gender string
...
Fixes a bug where when logging in with G+ with profile gender 'other', login doesn't fail silently.
2016-01-04 16:34:50 -08:00
CodeCombat
41a532cb50
WIP - cashew integration
2016-01-04 16:27:27 -08:00
Daniel Fiore
9ccb0dd3cb
Fix isSilhouettedItem
...
This fixes #3264 . Checks were failing in cases where no gold amount was
set and tier was 0. Checks are now using existential operator to ensure
null/undefined.
2016-01-02 16:10:03 -08:00
Yuki Ueda
9159ee3490
Update ja.coffee
2016-01-01 19:05:03 +09:00
Imperadeiro98
e19e997126
Merge pull request #3287 from JurianLock/patch-2
...
Update nl-NL.coffee
2015-12-29 15:03:54 +00:00
JurianLock
2ab3033e21
Update nl-NL.coffee
2015-12-29 02:34:39 +01:00
JurianLock
b9239503f9
Update nl-NL.coffee
2015-12-29 00:33:05 +01:00
Nick Winter
187a6f87a9
Include course info in contact message session links
2015-12-28 08:15:48 -08:00
Imperadeiro98
f369c73b2a
Remove unnecessary sound
2015-12-28 16:11:09 +00:00
Imperadeiro98
bf6601c3cc
Fix for GenerateTerrainModal
2015-12-26 21:56:05 +00:00
Imperadeiro98
b7ba677b00
Use view in template
2015-12-26 14:21:06 +00:00
Nainufar
718d546354
Update ca.coffee
...
more translations :)
2015-12-26 12:37:24 +01:00
Nick Winter
208073ffdb
Fix saving levels from #3276 refactoring
2015-12-24 11:21:12 -08:00
Nick Winter
35a18eadb4
Merge zh-HAN*.coffee
2015-12-24 06:37:40 -08:00
Nick Winter
c0d58c3786
Tweak style and add i18n for #3280
2015-12-24 06:34:54 -08:00
Pulkit Agarwal
357e8c0bcd
Add level to user profile page
2015-12-24 15:52:30 +05:30
Imperadeiro98
325c774b90
Update pt-PT.coffee
2015-12-23 23:22:54 +00:00
Nick Winter
71fc8d5230
Don't risk destruction of level unlock links
2015-12-23 12:08:09 -08:00