Commit graph

359 commits

Author SHA1 Message Date
Glen De Cauwsemaecker
5825b2676b Added myself to the signature. 2014-03-26 04:46:49 +01:00
Dominik Kundel
fe8a4901de Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/locale/de.coffee
	bower.json
2014-03-25 17:07:36 +01:00
Nick Winter
ba66dbf5a1 Adding CLAs view. 2014-03-21 16:22:47 -07:00
Nick Winter
b30bf35945 Fixed #638, I hope. 2014-03-21 08:09:08 -07:00
Nick Winter
ca1e3742c0 Added simulation counts. 2014-03-20 15:40:02 -07:00
Nick Winter
097c6bc2cd Changed line endings on en.coffee and nl.coffee away from DOS. Trying out fix for Firefox embed. 2014-03-19 17:25:56 -07:00
Glen De Cauwsemaecker
225fd6d355 Fixed a spelling mistake I made yesterday. 2014-03-20 02:02:40 +01:00
Glen De Cauwsemaecker
e2a7c15776 Merge conflicts resolved from Ruben's branch 2014-03-20 00:05:41 +01:00
Glen De Cauwsemaecker
a523d74b2d Added the glen_description i18n tag to all languages. 2014-03-19 02:47:25 +01:00
Ruben Vereecken
04465eb72c Wrapped up locale files 2014-03-18 10:24:58 +01:00
Ruben Vereecken
e4fee7296c Merged in old locale 2014-03-18 10:19:33 +01:00
Ruben Vereecken
b476e6b333 Ladder i18n refactoring 2014-03-18 10:18:38 +01:00
Dominik Kundel
c55b608886 Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/templates/play/level/modal/editor_config.jade
2014-03-17 19:39:38 +01:00
Nick Winter
6c2a78c060 Show videos in HD if possible. Use ready state on level loader. 2014-03-17 05:52:19 -07:00
Nick Winter
f3a76da47c Added i18n for multiplayer launch modal. 2014-03-16 20:50:49 -07:00
Nick Winter
9a64fb5dac Work on /multiplayer modal. 2014-03-16 20:32:24 -07:00
Dominik Kundel
46133ab85d added select statement for programming language 2014-03-15 22:00:29 +01:00
Nick Winter
5c76ca71e3 Added configuring of behaviors to the editor config. 2014-03-14 10:14:48 -07:00
Nick Winter
c28d2bb576 Merge pull request #545 from dkundel/master
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
2014-03-14 07:35:11 -07:00
Dominik Kundel
0392f630cc including i18n support for new editor config and minor styling changes 2014-03-14 03:26:53 +01:00
Nick Winter
795bd8f63b Moved Glen from Archmages to About. 2014-03-13 18:27:08 -07:00
Alexei Nikitin
3b04cd1e19 Update en.coffee 2014-03-13 03:24:26 -07:00
Nick Winter
8be2f8c455 Used i18n script to add new i18n tags to other languages. 2014-03-12 21:21:23 -07:00
Ruben Vereecken
6d3525afe6 Finished NL translations for ladder 2014-03-12 21:47:10 +01:00
Ruben Vereecken
b845961218 Clean up 2014-03-12 21:25:14 +01:00
Ruben Vereecken
f4637251be Added i18n to play modal 2014-03-12 21:23:25 +01:00
Ruben Vereecken
ca271fedd6 Added i18n to my matches tab 2014-03-12 21:13:01 +01:00
Ruben Vereecken
9f5c0f03be Added i18n to ladder_tab 2014-03-12 20:51:38 +01:00
Ruben Vereecken
c2e81db200 Added i18n to ladder.jade 2014-03-12 20:46:25 +01:00
Nick Winter
0125c46dc2 Resolved merge conflict. 2014-03-12 08:29:42 -07:00
Ruben Vereecken
8acf35b290 Added i18n for components 2014-03-12 15:42:57 +01:00
Ruben Vereecken
8709cdc472 Finished Article History 2014-03-11 19:33:27 +01:00
Nick Winter
77f7276759 Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal 2014-03-10 11:29:47 -07:00
Ruben Vereecken
29901787f7 Added i18n for Version History 2014-03-10 19:11:37 +01:00
Nick Winter
234b3f105d Reworked ladder game victory modal main call to action to actually submit game for ranking. 2014-03-10 10:36:28 -07:00
Alexei Nikitin
bcaa801f88 Sync en i18n 2014-03-09 05:04:11 +04:00
Shrihari
f6324807b3 Moved "Skip (esc)" next to Continue button 2014-03-05 23:36:18 +05:30
Shrihari
0ec431f90a Moved 'skip tutorial' text to locales. 2014-03-05 13:46:21 +05:30
Ruben Vereecken
b8b22bb739 Localized 'Create New ..' and 'Search .. Here' 2014-03-03 12:45:04 +01:00
Ruben Vereecken
c3c699df49 Fixed wrong i18n name 'account_settings.autosave'. Added missing i18n name 'account_settings.email_notifications' 2014-03-02 23:28:16 +01:00
Tay Yang Shun
e3a81137e0 Modified locale messages for "level_load_error" 2014-02-26 05:52:49 +08:00
Nick Winter
91a641d3ab Updated Diplomat instructions and related locale files. 2014-02-20 14:52:42 -08:00
Nick Winter
f85a55c8b7 Cast -> Cast Spell 2014-02-19 18:20:21 -08:00
Nick Winter
9cdc07d07c Fixed spell palette doc duplication. 2014-02-18 11:23:01 -08:00
George Saines
c8679c37de Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-18 10:28:04 -08:00
George Saines
a44f8756ae hour of code trivial fix 2014-02-18 10:28:00 -08:00
Nick Winter
3c08f8a5eb Added wizard settings i18n tags. 2014-02-17 13:08:37 -08:00
Nick Winter
a4f4016c73 Updating i18n tags for new contribute summaries. 2014-02-17 12:23:06 -08:00
GlenDC
831ab1cb7a Applied big i18n tag update to ar, bg, cs, da, de, en, nl. 2014-01-19 20:49:37 +01:00
GlenDC
07c80f6354 Added missing i18n tags for issue #198 (now resolved) in all locale files. 2014-01-19 15:10:14 +01:00
GlenDC
05d43fb63f Added/shuffled (missing) words in locale files. 2014-01-19 14:36:49 +01:00
Nick Winter
af7344175a Merged and tweaked phansch's save indicator from #205. 2014-01-16 10:10:27 -08:00
Philipp Hansch
ff5807adb8 New i18n tag 2014-01-16 13:37:52 +01:00
Nick Winter
60850d5c48 Updated some tags. Added a script to copy tags from en.coffee. 2014-01-14 10:29:23 -08:00
Nick Winter
4a702176a6 Updated i18n, added /employers. 2014-01-13 22:29:58 -08:00
Scott Erickson
810eabef46 Tweaked some copy in prep for the new translations to be sent out. 2014-01-13 20:32:21 -08:00
Nick Winter
40bd91f415 Working on adding i18n tags from #23. 2014-01-13 17:17:41 -08:00
Nick Winter
fa1d24ba8f Updated README. 2014-01-05 12:32:44 -08:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00