Commit graph

2308 commits

Author SHA1 Message Date
Ting-Kuan
ac51404d4c remove debug msg. 2014-04-06 16:40:06 -04:00
Ting-Kuan
20c624e0b8 Refactor CocoView. 2014-04-06 16:37:00 -04:00
Glen De Cauwsemaecker
3feb694756 Merge pull request #788 from 1c7/master
Chinese translate for windows automatic tool
2014-04-06 12:17:01 +02:00
Glen De Cauwsemaecker
9ea8282b89 Merge pull request #790 from zloysmiertniy/patch-1
Update es-419.coffee
2014-04-06 12:12:44 +02:00
Glen De Cauwsemaecker
9cc15bb233 Merge pull request #791 from Vindurrin/patch-1
Update es-ES.coffee
2014-04-06 12:04:22 +02:00
1c7
13cfba91a8 add myself into diplomat.jade 2014-04-06 11:56:25 +08:00
Vindurrin
7a8f3849a6 Update es-ES.coffee
Line #231, “Atajos de teclado” means “Keyboard Shortcuts” — let me know if this isn’t close enough to what is meant by “Key Bindings”: the reason that I chose this phrase is because I don’t know of an exact or approximate translation of “key bindings” into Spanish, but several other software platforms have used the phrase “atajos de teclado” to express this meaning.
2014-04-05 21:09:10 -04:00
Evelyn Solorzano
af887fd4b8 Update es-419.coffee
Translated some commented lines up to play: category
2014-04-05 18:21:05 -05:00
Scott Erickson
8fe568d3a4 Fixed schema loading. 2014-04-05 11:48:21 -07:00
1c7
51142627d4 translate app/locale/zh-HANS.coffee 2014-04-05 14:34:21 +08:00
1c7
0911556c39 Chinese translate for windows automatic tool 2014-04-05 14:10:47 +08:00
Scott Erickson
abaf32fc7a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-04 14:57:55 -07:00
Michael Schmatz
2411269f2b Added rank/number of sessions text 2014-04-04 14:55:55 -07:00
Michael Schmatz
0684bcff9c Improved styling on graphs 2014-04-04 14:22:30 -07:00
Scott Erickson
2093049f5c Fixed a bug with the profile view caused by the new page loading system. 2014-04-04 13:59:40 -07:00
Michael Schmatz
06f164525f Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
	app/views/play/ladder/ladder_tab.coffee
2014-04-04 13:48:39 -07:00
Michael Schmatz
7019bb6dea Added score histogram to ladder tab 2014-04-04 13:38:36 -07:00
Scott Erickson
1971ddcefb Moved somethingLoaded calls until after calls that would register more to load. A probably suboptimal way of making sure the progress numerator never reaches the progress denominator until it's actually time. 2014-04-04 10:12:22 -07:00
Nick Winter
10700436e6 Merge pull request #783 from M-r-A/patch-3
Update ru.coffee
2014-04-04 10:09:42 -07:00
Alexei Nikitin
63f72cb454 Update ru.coffee 2014-04-04 10:01:03 -07:00
Glen De Cauwsemaecker
4599725040 Added french and chinese as extra lanaguages for the installer. 2014-04-04 15:13:00 +02:00
Glen De Cauwsemaecker
904171a6f3 Merge https://github.com/codecombat/codecombat 2014-04-04 10:15:23 +02:00
Glen De Cauwsemaecker
58c57af561 Latest update, ready to release version 1.2 of the windows installer. 2014-04-04 10:14:48 +02:00
Glen De Cauwsemaecker
15325de2a1 Merge pull request #782 from Vindurrin/patch-1
Update pt-BR.coffee
2014-04-04 09:47:02 +02:00
Vindurrin
79d19d61db Update pt-BR.coffee 2014-04-04 00:14:28 -04:00
Glen De Cauwsemaecker
733c120a80 Merge https://github.com/codecombat/codecombat 2014-04-04 05:41:57 +02:00
Glen De Cauwsemaecker
329cb0d1a7 Merge https://github.com/glendc/codecombat 2014-04-04 05:41:34 +02:00
Glen De Cauwsemaecker
9e22b5f47b Version 1.1 of the windows installer is online and active 2014-04-04 05:41:16 +02:00
Scott Erickson
978c84bc89 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-03 18:43:36 -07:00
Scott Erickson
3b3b825be0 Set up a new loading/progress system for views. 2014-04-03 18:43:29 -07:00
Glen De Cauwsemaecker
cfb8ef0638 GetExtension, getDownload, getVar and getText works now 2014-04-04 03:19:31 +02:00
Nick Winter
ef8388dac2 Merge pull request #781 from Darredevil/patch-6
Update ro.coffee
2014-04-03 16:38:04 -07:00
Nick Winter
9a70abb104 Don't need to explicitly skip Mobile Artillery's next level now. 2014-04-03 16:37:24 -07:00
Glen De Cauwsemaecker
ed12b644ca More refactoring. localisation works almost again, and fixed some caused by previous refactoring. 2014-04-04 01:27:15 +02:00
Nick Winter
255cef83fb Fixed #738. 2014-04-03 16:16:53 -07:00
Darredevil
df3b51e5bd Update ro.coffee 2014-04-04 02:15:50 +03:00
Nick Winter
62f91d14b0 Merged. 2014-04-03 16:06:32 -07:00
Nick Winter
0ad4cc7c04 Merge branch 'patch-1' of git://github.com/Vindurrin/codecombat into Vindurrin-patch-1 2014-04-03 16:05:27 -07:00
Glen De Cauwsemaecker
6f2cfbf1e8 config system has been refactored and now works with powershell 2014-04-04 00:37:59 +02:00
Michael Schmatz
9bb109dd7d First iteration of mobile styling! 2014-04-03 15:10:24 -07:00
Vindurrin
d58c70b456 Update es-ES.coffee 2014-04-03 16:11:09 -04:00
Michael Schmatz
c434325ec0 Fixed line endings and locale error 2014-04-03 10:53:29 -07:00
Michael Schmatz
75b278b333 Fixed table overflow, added wrapper for histogram 2014-04-03 09:57:35 -07:00
Glen De Cauwsemaecker
12cf298467 Merge conflicts master 2014-04-03 17:42:08 +02:00
Glen De Cauwsemaecker
a2ac89094a Merge conflicts: ms.coffee 2014-04-03 17:38:46 +02:00
Michael Schmatz
3aa31c7246 Graphs with D3! 2014-04-02 18:41:11 -07:00
Glen De Cauwsemaecker
7690210eff progress 2014-04-03 02:17:28 +02:00
Nick Winter
943bcf3162 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-02 15:09:45 -07:00
Nick Winter
52de546727 Merged. 2014-04-02 15:09:40 -07:00
Michael Schmatz
f59cb9a743 Removed giant commented code section 2014-04-02 15:02:06 -07:00