Nick Winter
ed5b017c0e
Merge branch 'master' into production
2015-01-31 14:40:15 -08:00
Nick Winter
69ea874d83
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-01-31 14:40:00 -08:00
Nick Winter
1e410e0b14
Worked around bug with item portraits disappearing after item purchase. Fixed #1980 .
2015-01-31 14:38:54 -08:00
Imperadeiro98
2a1d74ab59
Update downloads.coco
2015-01-31 22:36:23 +00:00
Imperadeiro98
a68698f0c1
Update install-mongodb.ps1
2015-01-31 22:32:03 +00:00
purenickery
b7624c0c58
Update names.coffee
...
-added new names for #53
2015-01-31 15:26:41 -07:00
Imperadeiro98
212c6e21a2
Update coco-mongodb
2015-01-31 22:19:57 +00:00
Imperadeiro98
4794c581b6
Removed blank line
2015-01-31 22:18:02 +00:00
Imperadeiro98
1b42dceb4f
Last merge fix
2015-01-31 22:02:26 +00:00
Imperadeiro98
2a3db56507
Merge pull request #2188 from Coderaulic/patch-1
...
Update ja.coffee
2015-01-31 22:00:58 +00:00
Coderaulic
bf54331f21
Update ja.coffee
...
Updated translation in:
nav:
play:
login:
signup:
recover:
items:
units: Note that in Japanese, measurements of time don't have individual or singular form: As in "a year" and "years" is still the same.
play_level:
2015-01-31 13:47:40 -08:00
Imperadeiro98
95b6801dab
Update about.jade
2015-01-31 21:43:43 +00:00
Nick Winter
e185a668be
Merge branch 'master' into production
2015-01-31 13:23:32 -08:00
Imperadeiro98
128dc55c1d
Merge pull request #2187 from SuperPranx/patch-2
...
Added a few translations
2015-01-31 21:23:08 +00:00
Nick Winter
19e7283d90
Merge branch 'master' into production
2015-01-31 13:19:42 -08:00
Nick Winter
936ebf67a7
Fixed #2140 .
2015-01-31 13:18:32 -08:00
Nick Winter
26ac0c8947
Making sure tooltips are destroyed when their parent views are destroyed.
2015-01-31 12:48:44 -08:00
Nick Winter
4b388f2775
Fixed some memory leaks. Fixed a couple minor bugs.
2015-01-31 12:23:44 -08:00
Ivan Milanov
15939cbc17
Added a few translations
2015-01-31 21:19:23 +01:00
Imperadeiro98
b8214e8b3c
Last merge fixes
2015-01-31 19:02:24 +00:00
Imperadeiro98
a0e4a410f7
Merge pull request #2185 from jacobakkerboom/patch-2
...
Update nl-NL.coffee
2015-01-31 18:53:59 +00:00
Nick Winter
7c561e5b24
Merge branch 'master' into production
2015-01-31 10:38:01 -08:00
Nick Winter
b538a83fd1
Oops, that was just for testing...
2015-01-31 10:37:43 -08:00
Popey Gilbert
ec5d54cc97
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-01-31 10:10:24 -08:00
Popey Gilbert
8098c76ba5
Changed Particles
2015-01-31 10:08:54 -08:00
Nick Winter
8f40d1f5e2
Merge branch 'master' into production
2015-01-31 10:04:14 -08:00
Nick Winter
c977ecc16f
Adding easy observing of leaderboard matches (except top 5).
2015-01-31 10:04:11 -08:00
Jacob
cf76143e60
Update nl-NL.coffee
...
Worked upwards from the bottom until the section "about". Edited some longer sentences reasonably carefully. Made use of the word email more consistent, by changing most to email. Wiki says the official spelling is e-mail, so perhaps we should revert this, but I think consistency is most important. I suppose we should work together with our Belgian partners, but I have only looked at the NL version. Again, feel free to contact me. I will browse some more in the Dutch version to see if everything looks ok.
2015-01-31 17:28:27 +01:00
Nick Winter
c5e47fda50
Merge pull request #2184 from Imperadeiro98/master
...
i18n of teachers page, and some fixes to legal and about
2015-01-31 07:36:22 -08:00
Imperadeiro98
55d9731720
Removed Scott's website
...
It was not working.
2015-01-31 15:04:50 +00:00
Imperadeiro98
850cd99069
i18n of teachers (part 2)
2015-01-31 14:17:24 +00:00
Imperadeiro98
06860f4338
Added teachers strings
2015-01-31 14:06:32 +00:00
Imperadeiro98
bae3053585
i18n of teachers (part 1)
2015-01-31 12:57:32 +00:00
Imperadeiro98
d497a3ac24
Update legal.jade
2015-01-31 12:42:57 +00:00
Imperadeiro98
7cb2a9403b
Using .spr and .spl
...
Also removed an image that was not working
2015-01-31 12:35:02 +00:00
Imperadeiro98
24529d0d7c
Update legal.sass
2015-01-31 12:11:09 +00:00
Rishi
106d5f640e
Update hero-victory-modal.sass
2015-01-31 17:40:34 +05:30
Imperadeiro98
d99e790df1
Fixed last merge issue
2015-01-31 11:04:11 +00:00
Imperadeiro98
3db3b0790c
Merge pull request #2177 from negesti/patch-2
...
Update de-DE.coffee
2015-01-31 11:03:48 +00:00
Nick Winter
031a32ce44
Merge pull request #2182 from sotonin/patch-1
...
Adding support for hudName property
2015-01-30 22:08:17 -08:00
sotonin
751ae0fac8
Adding support for hudName property
2015-01-31 00:07:23 -06:00
Nick Winter
61b8636ce5
Merge branch 'master' into production
2015-01-30 22:06:38 -08:00
Nick Winter
e59f2bcc62
Recording scores even for non-real-time-submit levels.
2015-01-30 22:06:22 -08:00
Nick Winter
2c262ea6e8
Merge branch 'master' into production
2015-01-30 21:38:37 -08:00
Nick Winter
022d31c19a
Basic leaderboards are working.
2015-01-30 21:36:48 -08:00
Nick Winter
4efbe0a12f
Leaderboard skeletons.
2015-01-30 21:36:47 -08:00
Matt Lott
a092444455
Add browser info to level session
2015-01-30 14:45:36 -08:00
Nick Winter
29470ffa62
Merge branch 'master' into production
2015-01-30 11:24:56 -08:00
Nick Winter
848341dbd1
I guess I'll be finding these for a while.
2015-01-30 11:24:48 -08:00
Matt Lott
58f8eb6688
Add support for premium video tutorials
2015-01-30 10:48:49 -08:00