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

972 commits

Author SHA1 Message Date
Imperadeiro98
178e147565 Update pt-PT.coffee 2014-07-12 08:54:16 +01:00
Nick Winter
f13f0ddfef Merge pull request #1296 from dreamist/patch-1 
Update th.coffee
 2014-07-11 18:11:57 -07:00
dreamist
ca78638a21 Update th.coffee 
One fix and a few more translations
 2014-07-12 03:07:58 +07:00
Imperadeiro98
bad11f0eea Update pt-PT.coffee 2014-07-11 19:08:14 +01:00
Imperadeiro98
d4c21e0349 Update pt-PT.coffee 2014-07-11 18:34:22 +01:00
Imperadeiro98
ef9ea0c489 Fixed a issue with headers 
There was a issue with the headers that is now corrected.
 2014-07-11 18:12:12 +01:00
Imperadeiro98
6f94b0ce6f Update pt-PT.coffee 2014-07-11 15:18:26 +01:00
Imperadeiro98
a979c32567 Update pt-PT.coffee 2014-07-11 15:17:16 +01:00
Nick Winter
65e39ad4e3 Propagated i18n updates. 2014-07-10 19:24:44 -07:00
Nick Winter
45545796a0 Fixes, tweaks, and i18n for the employers page. 2014-07-10 19:17:51 -07:00
Alphir
0ee0b2d5e3 Update fr.coffee 2014-07-09 22:13:05 +02:00
Nick Winter
9381a4dec6 Merged in some Russian translations from a1ip and fixd a merge conflict in server.coffee style cleanups. 2014-07-07 20:16:00 -07:00
Nick Winter
d414ed64ec Merge pull request #1264 from kinez/patch-12 
Update hu.coffee
 2014-07-07 20:13:36 -07:00
Michael Schmatz
05560662dd Various fixes to employer page/profile view 2014-07-07 19:34:36 -07:00
Scott Erickson
fd564fa2d4 Merge pull request #1261 from Imperadeiro98/master 
Translated some more strings
 2014-07-07 18:50:20 -07:00
Imperadeiro98
d9d1d25c3c Update pt-PT.coffee 2014-07-07 13:31:03 +01:00
Inez KEMENES
cc0e818824 Update hu.coffee 2014-07-06 16:26:51 +02:00
Imperadeiro98
21c180e206 Update pt-PT.coffee 2014-07-06 11:11:44 +01:00
Imperadeiro98
e3bb93c4f5 Update pt-PT.coffee 2014-07-06 10:01:55 +01:00
Imperadeiro98
183b744d07 Update pt-PT.coffee 2014-07-05 22:10:21 +01:00
Imperadeiro98
cc8fec9283 Update pt-PT.coffee 2014-07-05 19:11:58 +01:00
Imperadeiro98
b5ef1742f4 Update pt-PT.coffee 2014-07-05 19:11:06 +01:00
Imperadeiro98
dbdd8c672c Update pt-PT.coffee 2014-07-03 14:11:30 +01:00
Imperadeiro98
3b04343034 Update pt-PT.coffee 2014-07-03 14:06:40 +01:00
Imperadeiro98
08a9b4f05b Update pt-PT.coffee 2014-07-03 13:55:50 +01:00
greyhusky
467b9adf74 new translations 
i translated some parts, will translate more later
 2014-07-02 11:33:19 +02:00
Philippe Rigovanov
dd6209cd99 Update ru.coffee 
With @M-r-A fixes
 2014-06-27 04:33:05 +04:00
Philippe Rigovanov
e138d2eed6 Update ru.coffee 
With fixes from [M-r-A](https://github.com/M-r-A)
 2014-06-27 04:11:46 +04:00
Nick Winter
d360ecac94 Merged in the language-war branch. 2014-06-25 23:00:03 -07:00
Darredevil
c6f19f7d3a Added new tip tag 2014-06-26 06:23:36 +03:00
Inez KEMENES
96f74183a5 Update hu.coffee 2014-06-25 17:28:13 +02:00
Nick Winter
512e287b6a Merge pull request #1184 from greyhusky/patch-1 
Update de-CH.coffee
 2014-06-24 17:41:32 -07:00
George Saines
68d7b3997a modifying the employer page to be more explanatory 2014-06-24 16:43:27 -07:00
Scott Erickson
ee0b14eb61 Changed the versions history modal to show name and date. 2014-06-24 16:41:55 -04:00
Philippe Rigovanov
f7ec30a586 Update ru.coffee 2014-06-23 01:55:45 +04:00
Airunedz
dfff43d66a Improve Spanish (Spain) translations 
Changes: Add some translations to Spanish (I'm from Spanin)
 2014-06-22 01:07:05 +02:00
Nick Winter
52b2e756ef Merge pull request #1195 from thanosme/patch-1 
Update el.coffee
 2014-06-21 08:44:43 -07:00
Thanasis Manousos
5e2dececb5 Update el.coffee 2014-06-21 18:31:26 +03:00
Nick Winter
dde71485bf A bit of cleanup. 2014-06-20 20:52:50 -07:00
Nick Winter
17366af245 Merge pull request #1188 from a1ip/master 
Update ru.coffee
 2014-06-20 20:49:19 -07:00
Nick Winter
d8e1fa880c Merge pull request #1181 from djsmith85/patch-1 
Update de.coffee
 2014-06-20 20:45:27 -07:00
Nick Winter
d3d9908ef2 Merge pull request #1180 from djsmith85/patch-2 
Update de-DE.coffee
 2014-06-20 20:45:02 -07:00
Nick Winter
ac0f6e74aa Merged. 2014-06-20 20:41:34 -07:00
thanosme
625750614a Update el.coffee 
Added some tranlations with minor corrections
 2014-06-20 01:14:30 +03:00
Nick Winter
a58f3e0fb6 More styling work on code language selector. 2014-06-19 12:31:56 -07:00
Philippe Rigovanov
ebaeac7e80 Some translations 2014-06-19 05:42:15 +04:00
Dominik Kundel
d3e0299465 merge conflict solved 2014-06-18 17:59:26 +02:00
Dominik Kundel
f6355b034b integrated autocomplete 2014-06-18 17:57:42 +02:00
greyhusky
6fe9623244 Update de-CH.coffee 
Hoi zeme, i übersetze mega gern und wieni gseh ha isches no es reechts Stück wo z übersetze isch. Ha mol agfange, i hoff ihr findeds guet. :)
 2014-06-18 11:09:10 +02:00
djsmith85
2fff271200 Update de-DE.coffee 
Updated a few translations in the German locale file.
 2014-06-17 23:52:57 +02:00
djsmith85
5a90a7c880 Update de.coffee 
Updated a few translations in the German locale file and merged the translations from de-DE.coffee
 2014-06-17 23:52:54 +02:00
Nick Winter
0b8a0c8f6f Added UserRemarks. 2014-06-17 13:03:13 -07:00
Nick Winter
9a64ca5973 A few misc fixes. 2014-06-16 10:49:20 -07:00
Nick Winter
3d2bee3256 Merge pull request #1168 from kinez/patch-9 
Update hu.coffee
 2014-06-16 08:22:21 -07:00
Nick Winter
7198a8fc42 Merge pull request #1166 from ChrisLightman/patch-6 
Upsate /// Translate
 2014-06-16 08:21:56 -07:00
Nick Winter
0418d80c6d Merged. 2014-06-16 08:12:52 -07:00
Inez KEMENES
c611cafa25 Update hu.coffee 2014-06-16 16:39:02 +02:00
Clement
931f3ea330 Upsate /// Translate 
Enjoy
 2014-06-16 11:38:25 +02:00
barbuddha
ff5f46e5fb Update ru.coffee 2014-06-16 08:43:27 +04:00
Nick Winter
babfa04a9e Fixed a tiny typo. 2014-06-14 18:02:22 -07:00
djsmith85
a22a098fdc Update de-DE.coffee 2014-06-14 14:02:42 +02:00
Nick Winter
79cbc4bb25 Propagated i18n. 2014-06-13 08:50:52 -07:00
Nick Winter
2bda60796a Copy / i18n tweaks for tournament ending and employers blurb. 2014-06-13 08:08:13 -07:00
Nick Winter
28264d5ace Added tournament results and a way to email them out. 2014-06-12 17:52:08 -07:00
George Saines
fb7b3f8580 adding a top info arena on top of the employers page 2014-06-12 16:01:34 -07:00
Scott Erickson
c855327cef Merge pull request #1150 from rubenvereecken/achievements 
Achievements - Update with some tests and admin endpoint
 2014-06-12 11:28:25 -07:00
Ruben Vereecken
b0666ace0d Refactorings performed necessary to have searchable for more uses 2014-06-12 19:40:59 +02:00
Lucas Castro
ebf0cba45d Update pt-BR.coffee 2014-06-12 10:11:49 -03:00
oaugereau
f7ee40a3a2 Update fr.coffee 2014-06-12 14:39:41 +02:00
oaugereau
0d5e213daa Update fr.coffee 2014-06-12 14:17:36 +02:00
oaugereau
028feaafc6 Update fr.coffee 2014-06-12 09:42:57 +02:00
Nick Winter
77920b5416 Improvements to profile views. Added links to players' code. 2014-06-11 19:38:47 -07:00
Lucas Castro
60a0a6ee80 Update pt-BR.coffee 2014-06-11 14:04:19 -03:00
Lucas Castro
fe9e584767 Update pt-BR.coffee 2014-06-11 14:00:52 -03:00
barbuddha
d361ab5809 Update ru.coffee 2014-06-11 09:56:15 +04:00
Nick Winter
f3d18efa90 Added employer_list and activity tracking. 2014-06-10 16:30:13 -07:00
Lucas Castro
132a7b62f1 Update pt-BR.coffee 2014-06-10 11:04:02 -03:00
Nick Winter
22ca9507d0 Upgrades to employer's candidate indexing. 2014-06-09 22:17:53 -07:00
Nick Winter
67b10474e8 Suggested improvements to profile pages. 2014-06-07 00:33:18 -06:00
Nick Winter
d00c4c2af3 Propagate i18n. Merged in good stuff from 6b675f from kinez for hu.coffee. 2014-06-06 15:39:03 -06:00
Nichlas Torgersen
657182c8c0 Updates to norwegian translation 
I noticed there were some misspellings and grammar errors which I corrected. Especially the sign in-message, it went along the lines in norwegian as: "Draw yourself in", that doesn't make sense now does it.

Also removed some unneeded capitalizations, norwegian grammar is all about that and how you build a word. Most words can be combined into one, like in english: "Door handle" would be "Doorhandle" if english was using norwegian grammar rules.
 2014-06-06 01:44:05 +02:00
Nick Winter
47b99adddf Uncommented some fr.coffee section headers to go with the new translations. 2014-06-05 10:28:40 -06:00
Clement
9895432dd2 Syntax Update and Traduction Update 2014-06-05 18:03:33 +02:00
Clement
a7d0b540cd Big Update /// Syntax Correction and Traduction 2014-06-05 13:35:03 +02:00
Nick Winter
143597dc0f Merge pull request #1124 from ChrisLightman/patch-2 
Update Line 723-734 : Full Traduction
 2014-06-03 08:26:54 -07:00
Nick Winter
bebb200090 Merge pull request #1122 from ChrisLightman/patch-1 
Update fr.coffee
 2014-06-03 08:26:44 -07:00
ChrisLightman
12da959550 Update Line 723-734 : Full Traduction 2014-06-02 20:52:49 +02:00
Ruben Vereecken
c2d2f2a2b8 Refactorings performed necessary to have searchable for more uses 2014-06-02 20:31:09 +02:00
Nick Winter
51891887e5 Fixed merge conflict 2014-06-02 10:43:31 -07:00
Nick Winter
257fe4cec3 Fixed merge conflict 2014-06-02 10:42:34 -07:00
Gutierri Barboza
8a8b80bcf5 More translations pt-br 2014-06-02 14:34:30 -03:00
ChrisLightman
cfcaece743 Update fr.coffee 
Modification mineures de syntaxe ( Majuscules )
 2014-06-02 11:36:05 +02:00
Nick Winter
f3d5b724de Merge branch 'inline-profile' 2014-06-01 16:45:49 -07:00
Nick Winter
10754e6825 Added i18n, error handling, autocomplete, highlighting the next section, animation for completing sections, and complete example skeleton. 2014-06-01 16:45:19 -07:00
Nick Winter
400fddc294 Jade, you're supposed to be so minimalist. But today... Today, I did this. I am sorry. 2014-05-31 22:09:41 -07:00
Inez KEMENES
a97d243100 Update hu.coffee 2014-05-31 16:16:28 +02:00
Nick Winter
852053022a Started the horrifying migration to an inline jobs profile editor. 2014-05-30 22:12:44 -07:00
Nick Winter
ed36dba3f5 Merge pull request #1041 from Shpionus/patch-1 
Update ru.coffee
 2014-05-25 12:17:12 -07:00
Nick Winter
6b554e03ef Merge pull request #1084 from domenukk/feature/step-single-frame 
Added shortcut for frame single-stepping
 2014-05-25 09:37:13 -07:00
z3t1
d8b448ab60 Update zh.coffee 
Update some phrases.
 2014-05-25 16:05:35 +08:00
Dominik Maier
f62cd7f38b + added shortcut for frame single-stepping 
+ fixed single stepping for frames
 2014-05-24 17:31:59 +02:00
Nick Winter
bda8f10508 Fixed a couple typos in the hu merge. 2014-05-23 09:27:02 -07:00
Inez KEMENES
1d595e9a0d Update hu.coffee 
The line no. 123 disappeared. I may have accidentally deleted it while working on 122. Sorry. Please correct.
 2014-05-23 16:21:46 +02:00
Scott Erickson
bfa90f671d Fixes #940, merging the signup and login modal into a single modal. Created a couple A/B tests for amount of text in the signup modal. 2014-05-22 11:26:08 -07:00
Rafael Gomes
09db5cb9ee Updated some words and phrases 
Just a few words and phares until have more experience in the project.
 2014-05-21 14:38:08 -03:00
Burlutskiy Ivan
70403409f3 Update ru.coffee 
reverted team translation by @M-r-A request.
 2014-05-21 12:18:44 +04:00
Nick Winter
de9f1fab0d Merged. 2014-05-20 15:09:48 -07:00
Burlutskiy Ivan
a8a50df025 Update ru.coffee 
Fixed previous typos; uncommented translations.
 2014-05-21 01:32:15 +04:00
Burlutskiy Ivan
65a364d3f7 Update ru.coffee 2014-05-21 00:21:10 +04:00
Nick Winter
b6406b9b0e Put some tournament details in there. Muted some extra casting sounds during level load. 2014-05-19 21:56:20 -07:00
Nick Winter
341097c5ca A couple improvements for the LadderSubmissionView. 2014-05-19 19:51:24 -07:00
Nick Winter
116965fcdc Rules wording tweaks; highlighting new matches and end of ranking with sounds. 2014-05-19 19:13:36 -07:00
Nick Winter
af31bcf008 Fleshed out tournament prizes tab. 2014-05-19 17:40:06 -07:00
Scott Erickson
62ad8dd26a Added a status message to the goals view. 2014-05-19 16:36:45 -07:00
Nick Winter
8a5a45950f Simulator now pleads for you to help simulate when your match is being ranked. 2014-05-19 14:59:47 -07:00
Nick Winter
68a4483e91 Moved views/play/ladder_view to views/play/ladder/ladder_view and made a new views/play/ladder_home_view. 2014-05-19 11:58:53 -07:00
Nick Winter
5dffca7a9c Propagated i18n tags. 2014-05-19 10:11:18 -07:00
Nick Winter
b89615cea4 Added helpful keyboard shortcuts modal. 2014-05-19 10:08:34 -07:00
Nick Winter
3c9428ffd3 Refactored game ranking buttons into a LadderSubmissionView. 2014-05-17 11:55:51 -07:00
Gutierri Barboza
589de9b4b2 correction in "candidate_location" 2014-05-17 13:11:05 -03:00
Gutierri Barboza
ac3c5276b5 update PT-BR 2014-05-17 13:07:51 -03:00
Pablo Lobato
8794921018 Update es-ES.coffee 2014-05-17 11:09:55 +02:00
Nick Winter
dbcafbb29b Working on level-specific coding languages, with non-writable code in JavaScript. 2014-05-14 21:54:36 -07:00
George Saines
75ab5d6435 making our recruitment % consistent 2014-05-14 14:55:04 -07:00
Scott Erickson
4b404ae124 Finished tuning the supermodel loading and progress. 2014-05-13 14:39:45 -07:00
Nick Winter
589410ed8e Merged master into feature/thangload. 2014-05-09 12:56:58 -07:00
Scott Erickson
e9fc3df7c1 Set up the versions modal to display changes between versions when you select two of them. 2014-05-08 10:54:39 -07:00
Nick Winter
9e40dcd2e3 Added a couple i18n tags. 2014-05-06 06:58:20 -07:00
Nick Winter
af5b878166 Fixed wizard setting things. 2014-05-06 06:56:14 -07:00
Roy Xue
03e5d1ca50 Merge pull request #1 from codecombat/master 
Update CodeCombat
 2014-05-06 14:09:42 +08:00
Nick Winter
0e0ca785d9 Moved ready-to-rank logic to LevelSession where it can be shared across victory and multiplayer modals and My Matches tab. 2014-05-05 16:59:12 -07:00
Scott Erickson
8f9aea1b9b Fixed the patches view. 2014-05-05 15:19:35 -07:00
Roy Xue
2b2fea3092 Update zh.coffee 2014-05-05 21:33:01 +08:00
Vic___
e64ba30d33 Update zh-HANS.coffee 2014-05-05 20:05:57 +08:00
Nick Winter
3b891e6628 Merge pull request #954 from marc-portier/master 
first translation contribution
 2014-05-04 21:25:05 -07:00
Roy Xue
fd3c008ca7 Update zh-HANS.coffee 2014-05-04 11:03:43 +08:00
Nick Winter
fbf5f52228 Merge pull request #955 from benojan/patch-3 
Update zh-WUU-HANT.coffee
 2014-05-03 07:22:57 -07:00
Nick Winter
8fbe2dedfc Propagated Wu name update. 2014-05-03 07:21:18 -07:00
Marc Portier
5212eca404 fixing typox - thx to @JasperDhaene 2014-05-03 16:04:08 +02:00
Marc Portier
f7b746c3ea making case consistent - thx to @JasperDhaene 2014-05-03 16:01:17 +02:00
Marc Portier
add2944a28 ogre ==> ork and a serious spelling error 2014-05-03 15:59:16 +02:00
Benojan
8a11990e89 Update locale.coffee 
巫师吴语->吴语
巫師吳語->吳語
 2014-05-03 17:55:36 +08:00
Benojan
50d4078ade Update zh-WUU-HANT.coffee 
translate others that was not translated.
 2014-05-03 17:14:11 +08:00
Marc Portier
d348c6f333 translate space 2014-05-03 11:06:39 +02:00
Marc Portier
e1482280c3 first translation contribution 2014-05-03 08:23:36 +02:00
Nick Winter
d54149d0f3 Reworked LevelView loading priorities to try to get world simulating earlier. 2014-05-02 12:32:41 -07:00
Nick Winter
e610ecb476 Propagated new i18n tags. 2014-05-02 11:02:48 -07:00
Nick Winter
9d45b22057 Added some i18n tags. 2014-05-02 11:00:30 -07:00
Scott Erickson
eacbf571c6 Merge branch 'master' into feature/thangload 2014-05-02 10:32:05 -07:00
Nick Winter
ef036b409b Merge pull request #930 from M-r-A/patch-1 
Update ru.coffee
 2014-05-02 09:58:55 -07:00
Nick Winter
3ac052a4a6 Merge branch 'benojan-patch-2' 2014-05-02 09:49:35 -07:00
Nick Winter
082a9d141a Keeping Wu English stub. 2014-05-02 09:49:02 -07:00
Nick Winter
302cb78095 Added zh-WUU-HANS stubs. 2014-05-02 09:48:40 -07:00
Nick Winter
f92fd122c6 Integrating Wu as zh-WUU-HANS and zh-WUU-HANT; hacking on a fork of i18next to do so. 2014-05-02 09:46:00 -07:00
Scott Erickson
92687b17de Merge branch 'master' into feature/thangload 
Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee
 2014-05-02 08:19:47 -07:00
Benojan
28a56c1c83 Create new language--the wuu-chinese 
Just for Wuu Chinese, including Shanghainese and such language in Zhejiang Province, China.
 2014-05-02 19:19:21 +08:00
Benojan
770345f84d Update zh.coffee 2014-05-02 16:09:13 +08:00
Scott Erickson
b9f4093b08 Set up the LevelLoader to load names instead of whole ThangTypes. 2014-04-28 14:58:58 -07:00
Scott Erickson
6f2e309d6d Added one last resource name. 2014-04-28 11:53:57 -07:00
Scott Erickson
02a74ae40c Migrated and fixed the rest of the views using the new loading system. 2014-04-28 11:52:04 -07:00
Scott Erickson
8164c6881c Fixed a patches resource name. 2014-04-28 11:10:27 -07:00
Scott Erickson
17a0bf54c6 Merge branch 'master' into feature/loading-views 2014-04-28 10:10:57 -07:00
Alexei Nikitin
d82c62f4e6 Update ru.coffee 
I am extremely dissatisfied the support of CodeCombat internationalization by programmers. Make changes to the requirements of the new code; it must be completely covered by the i18n tags reflected in en.coffee.
 2014-04-28 09:23:56 -07:00
Nick Winter
0de5e715c7 Double-checked i18n propagation. 2014-04-27 20:28:53 -07:00
Nick Winter
8cb8c63f21 Fixed merge conflicts in uk.coffee. 2014-04-27 20:23:13 -07:00
Nick Winter
c1637fe37a Fixed merge conflicts in es-419.coffee. 2014-04-27 20:19:05 -07:00
Nick Winter
938a2bca1d Merge pull request #900 from julycoolwind/patch4 
Translate items under multiplayer_launch
 2014-04-27 20:13:27 -07:00
Nick Winter
e65202434b Merge pull request #890 from treby/update_ja_resource 
Update ja resource.
 2014-04-27 20:12:14 -07:00
Nick Winter
d542898663 Fixed indentation / commenting on a few lines from #924. 2014-04-27 09:40:43 -07:00
belian
75f37864da Update fr.coffee 
New update for "fr.coffee"
 2014-04-27 11:52:55 +02:00
Scott Erickson
fed5d681f2 Merge branch 'master' into feature/loading-views 2014-04-26 12:54:37 -07:00
Scott Erickson
6cd7c723d8 Fixed up showing errors, made sure they work with the play view. 2014-04-25 15:31:38 -07:00
Nick Winter
0975a86345 Propagated i18n. 2014-04-24 14:32:56 -07:00
Scott Erickson
2d43b36022 Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText 2014-04-24 13:29:24 -07:00
Nick Winter
b9173a5ea5 Fixed #913, I think. (This was just built into marked.) 2014-04-24 12:24:22 -07:00
lordbam
8b9bc0c504 Update uk.coffee 
I have translated part of it. please check it for mistakes and add it to your page if all is alright. in few days i‘ll try to translate to the end
 2014-04-24 17:25:11 +03:00
Nick Winter
d1ceec16bb Propagated i18n tags, as reminded by #884. 2014-04-23 10:48:31 -07:00
marianoluzza
0db33213f3 Update es-419.coffee 
Various sections translated
 2014-04-23 13:44:13 -03:00
林鑫
de1eb3860a Translate items under multiplayer_launch 2014-04-23 17:26:39 +08:00
dpen2000
dd00e2abe6 Replace generic text Sign Up to Create a New Content 2014-04-23 00:37:10 +01:00
Glen De Cauwsemaecker
afc447e596 Removed double got_questions i18n tag in en.coffee from commit e439e3f 2014-04-22 23:47:11 +02:00
Glen De Cauwsemaecker
7da89e8b00 Merge branch 'master' of https://github.com/JasperDhaene/codecombat into jasper-master 2014-04-22 23:44:50 +02:00
treby
4898ff78a1 Updated ja.coffee 2014-04-22 08:54:10 +09:00
JasperDhaene
e439e3fec8 added missing i18n tag 2014-04-21 19:56:38 +02:00
JasperDhaene
c49dc9457d fixed some lines to fit proper context 2014-04-21 19:54:14 +02:00
JasperDhaene
4d7e6ba849 fixed some lines to fit proper context 2014-04-21 19:52:27 +02:00
JasperDhaene
6a1d43435a fixed some lines to fit proper context 2014-04-21 19:50:43 +02:00
Daniel
baff84f0ae Update es-ES.coffee 
Hi!
I have translated the remaining lines. I have not tested all the text yet in order to remove overflowing or cut off texts (I had to modify two lines to avoid a couple of linguistic bugs) but I hope to do it soon.
Cheers!
 2014-04-21 01:13:34 +02:00
Nick Winter
5e2f3ac7cb Merge pull request #878 from JasperDhaene/master 
Update Dutch locale
 2014-04-20 13:21:07 -07:00
JasperDhaene
ef9ee024e1 update nl-NL.coffee 2014-04-20 21:34:43 +02:00
JasperDhaene
ad212d428c update nl-BE.coffee 2014-04-20 21:33:19 +02:00
JasperDhaene
6a03ddad74 Update nl.coffee 2014-04-20 21:31:11 +02:00
Nick Winter
6fa3d81fa1 Merged, fixed conflicts, restored rest of file. 2014-04-20 11:44:44 -07:00
Nick Winter
a829f3a537 Merge branch 'patch-2' of git://github.com/kinez/codecombat 2014-04-20 11:42:05 -07:00
Nick Winter
baca3876ca Merge pull request #869 from treby/improve_ja_resources 
Updated  for Japanese(ja).
 2014-04-20 11:20:46 -07:00
Inez KEMENES
4a2bcc2030 Update hu.coffee 2014-04-20 19:04:07 +02:00
Nick Winter
f281aa8e2d Fixed quotes. 2014-04-19 17:43:01 -07:00
Nick Winter
b806436232 Merge branch 'patch-3' of git://github.com/julycoolwind/codecombat into julycoolwind-patch-3 2014-04-19 17:40:58 -07:00
林鑫
984f2c2cc4 Translate some items under common,account_settions,employers,play_level. 2014-04-19 23:22:03 +08:00
Alexei Nikitin
ac47a88c39 Update ru 2014-04-19 13:54:51 +04:00
treby
fb2bf865cd Added some translation for Japanese. 2014-04-19 16:42:34 +09:00
Nick Winter
7186b414cf Merge pull request #861 from onion7878/patch-1 
Update zh-HANS.coffee
 2014-04-18 17:49:55 -07:00
Nick Winter
848ebf2ffe Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-18 09:53:34 -07:00
Nick Winter
844c1391ca Reworked top nav. Many improvements to job profile form. 2014-04-18 09:53:28 -07:00
Scott Erickson
07afba01df Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/views/editor/level/thangs_tab_view.coffee
 2014-04-17 13:25:42 -07:00
Scott Erickson
8859405e18 Reworked the nav bars in the level editor. 2014-04-17 11:02:00 -07:00
ONion
498bb21280 Update zh-HANS.coffee 
more translation
 2014-04-17 13:27:43 +08:00
ONion
8724e23f1b Update zh-HANS.coffee 
add punctuation
 2014-04-17 12:57:44 +08:00
ONion
cf9cd1a228 Update zh-HANS.coffee 
Translate some
 2014-04-17 12:55:58 +08:00
Nick Winter
f95d814e90 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-16 12:57:31 -07:00
Nick Winter
f6242bbbac Fixed case on de-CH.coffee. 2014-04-16 12:28:39 -07:00
Nick Winter
1a4274a6db Broken German up into multiple country-specific Germans. 2014-04-16 12:28:15 -07:00
Glen De Cauwsemaecker
0bf4c81c91 Merge branch 'enGB' of https://github.com/edtrist/codecombat 2014-04-16 20:11:03 +02:00
Nick Winter
cc9e200db8 Merge branch 'patch-2' of git://github.com/npani13/codecombat into npani13-patch-2 2014-04-16 11:01:28 -07:00
Nick Winter
d65699736f Fixed accidental hu.coffee truncation from #833. 2014-04-16 10:58:27 -07:00
Scott Erickson
731726dcd3 Merge branch 'master' into feature/jsondiffpatch 2014-04-16 10:42:43 -07:00
edtrist
0047835021 Added some specific en-GB spellings 2014-04-16 18:42:37 +01:00
Scott Erickson
c395a3414e Merge branch 'master' into feature/jsondiffpatch 2014-04-15 15:18:57 -07:00
Scott Erickson
58b1019934 Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor. 2014-04-15 15:09:36 -07:00
Nick Winter
f762d95ab8 ModelModal and simple leaderboard pagination. 2014-04-15 15:01:54 -07:00
Inez KEMENES
844643454d Update hu.coffee 2014-04-15 17:03:17 +02:00
Glen De Cauwsemaecker
1354bc3d59 Merge https://github.com/codecombat/codecombat 2014-04-15 02:05:38 +02:00
Glen De Cauwsemaecker
891cf74a8a Resolved merge conflicts of Jasper's translations 2014-04-15 02:04:52 +02:00
Nick Winter
e908ae2fb4 Fixed #772. 2014-04-14 14:49:38 -07:00
npani13
5d16f8e5ba Create de-ch.coffee 
Speechdata for Swissgerman (CH)
 2014-04-14 20:21:58 +02:00
Michael Schmatz
b40e4dca37 Simulation leaderboard aggregation framework and local fixes 2014-04-14 08:46:46 -07:00
Glen De Cauwsemaecker
df17021344 Merged conflicts and fixed line endings windows => unix 2014-04-14 10:12:23 +02:00
OlenaGapak
aea7b3ada0 Update uk.coffee 
Ukrainian localization
 2014-04-14 10:36:55 +03:00
Nick Winter
fbc8b6ac35 Propagated new i18n tags. 2014-04-13 19:04:43 -07:00
林鑫
2bf654c8fa Translate some items under 'common','versions' and 'editor'. 2014-04-14 08:57:04 +08:00
Nick Winter
af0b8aa5e2 A few fixes and cleanup for #831. 2014-04-13 15:28:16 -07:00
Inez KEMENES
094704f0c5 Update hu.coffee 2014-04-13 17:29:29 +02:00
Glen De Cauwsemaecker
0ce04b147d Merge pull request #824 from julycoolwind/patch-1 
Update zh-HANS.coffee
 2014-04-13 13:49:55 +02:00
Jasper D'haene
9f1ef2bb8d updated Dutch locale + README 2014-04-13 12:05:45 +02:00
Alexei Nikitin
9879cffdbc Update RU.coffee 2014-04-13 01:06:42 +04:00
Scott Erickson
6eab5003f8 Merge branch 'feature/jsondiffpatch' 2014-04-12 08:52:35 -07:00
Scott Erickson
10b1660419 Fixed the level editor so you can save again. 2014-04-12 08:48:49 -07:00
julycoolwind
9078061af2 Update zh-HANS.coffee 
Translate items under editor.
 2014-04-12 17:56:56 +08:00
Scott Erickson
35fe47bbac Merge branch 'feature/jsondiffpatch' 2014-04-11 22:52:58 -07:00
Scott Erickson
53579b2632 Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/templates/editor/level/save.jade
	app/templates/editor/thang/edit.jade
 2014-04-11 22:52:05 -07:00
Nick Winter
bbf26ecc9c Fixed lcoale line endings again. 2014-04-11 15:02:01 -07:00
Glen De Cauwsemaecker
e9715f078f Fixed merge conflicts for Jasper's commits. 2014-04-12 01:28:25 +02:00
Nick Winter
82b47f6c0f Added i18n for #809. 2014-04-11 13:37:39 -07:00
Nick Winter
5ccdf680db Updated all i18n tags. 2014-04-11 13:19:38 -07:00
Nick Winter
ae65f07e7e Added some i18n and improved employer page. 2014-04-11 12:49:44 -07:00
Nick Winter
ca13324e99 Resolved merge conflicts. 2014-04-11 11:32:51 -07:00
Nick Winter
8d5e129c2c Merged the jobs in. Look out for Treema bugs from the last four months. 2014-04-11 10:20:12 -07:00
Jasper D'haene
f2332b0694 Completed + reviewed latest Dutch locale changes 2014-04-11 09:11:12 +02:00
Jasper D'haene
23cb736d71 resolved merge conflicts 2014-04-11 08:05:11 +02:00
Nick Winter
7a35a6248f Adding contact form for employers to contact candidates. 2014-04-10 14:59:32 -07:00