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
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
Robin Yang
f49a239367
Add Mongo 3.2 to list of allowed versions for running database
2016-01-11 11:18:14 -08:00
Nick Winter
7adfc23f2a
Look at subscriptionID instead of planID for checking active subscribers
2016-01-11 10:32:23 -08: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
Nick Winter
c0fd58401f
Fix analytics query finding limited number of recent sessions
2016-01-11 09:51:23 -08:00
Nick Winter
01b181ee43
Add script to find active subscribers by country
2016-01-11 09:50:44 -08:00
durianboy
ae368894e1
Update zh-HANT.coffee
2016-01-11 17:45:41 +08:00
