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

1715 commits

Author SHA1 Message Date
Nick Winter
8f1ef4e3bb Merge pull request #793 from kinez/patch-4 
Update hu.coffee
 2014-04-06 14:26:06 -07:00
Nick Winter
31a170bf67 Merge pull request #771 from kinez/patch-2 
Update hu.coffee
 2014-04-06 14:24:38 -07:00
Nick Winter
69ba442261 Merge pull request #770 from kinez/patch-1 
Update hu.coffee
 2014-04-06 14:24:32 -07:00
Inez KEMENES
7d3b7de8b4 Update hu.coffee 2014-04-06 16:49:00 +02: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
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
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
Alexei Nikitin
63f72cb454 Update ru.coffee 2014-04-04 10:01:03 -07:00
Vindurrin
79d19d61db Update pt-BR.coffee 2014-04-04 00:14:28 -04: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
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
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
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
Nick Winter
52de546727 Merged. 2014-04-02 15:09:40 -07:00
Nick Winter
6a51bd6837 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-02 14:43:09 -07:00
Nick Winter
670f94cc22 Fixed #418, no more print/save dialogues evaaarr. 2014-04-02 14:42:34 -07:00
Scott Erickson
0a78368217 Refactored user authentication again. Now the user object is inserted into main.html, which was renamed from index.html so the express static middleware wouldn't serve it. 2014-04-02 13:12:24 -07:00
Inez KEMENES
70d42b6eae Update hu.coffee 2014-04-02 16:00:15 +02:00
Inez KEMENES
9acde85c8c Update hu.coffee 2014-04-02 15:24:26 +02:00
Nick Winter
ae9769e3ce Added read only notification in editors. Fixed #374. 2014-04-01 13:15:30 -07:00
Nick Winter
ba3c4af536 Fixed last piece of #673. 2014-04-01 10:51:03 -07:00
Nick Winter
7807fdbbc6 Merged pt-PT locale conflicts. 2014-04-01 10:41:40 -07:00
Nick Winter
99c4704e1f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-01 10:31:42 -07:00
Nick Winter
bfa71d01ff Merged. 2014-04-01 10:31:22 -07:00
Nick Winter
477545d50d Merge pull request #763 from OlenaGapak/patch-1 
Update uk.coffee
 2014-04-01 10:26:55 -07:00
Nick Winter
b316a3e078 Merge branch 'dev/Warn_when_a_depended-on_System_is_missing' of git://github.com/gintau/codecombat into gintau-dev/Warn_when_a_depended-on_System_is_missing 2014-04-01 09:44:06 -07:00
Nick Winter
785cb342a2 Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master 2014-04-01 09:12:48 -07:00
Dominik Kundel
45f1d8d408 added two programming quotes 2014-04-01 17:16:35 +02:00