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

6888 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
43b59c1b44 Merge branch 'master' into production 2014-12-28 17:25:06 -08:00
Nick Winter
1390cbacdc Temporarily reverting 0bdec68 change to PUT for versioned documents. 2014-12-28 17:24:37 -08:00
Imperadeiro98
6249427103 Added 'mk-MK' to diplomat page 2014-12-29 00:03:09 +00:00
Nick Winter
1d6d5fb2d1 Merge branch 'master' into production 2014-12-28 15:28:56 -08:00
Nick Winter
664003ec4a Propagated i18n. 2014-12-28 15:28:19 -08:00
Nick Winter
913de5dc8c Additional tweak for #2005. 2014-12-28 15:26:04 -08:00
Nick Winter
aba154fad9 Merge pull request #2004 from SuperPranx/master 
Initial translation for Macedonian(mk_MK)
 2014-12-28 15:25:58 -08:00
Nick Winter
f5678bd536 Merge pull request #2005 from Imperadeiro98/master 
Fixed a issue
 2014-12-28 15:20:53 -08:00
Nick Winter
448acbb6b5 Fixed a problem choosing heroes from within levels with new level options loading. 2014-12-28 15:18:34 -08:00
Imperadeiro98
9018e41c2c Fixed a issue 2014-12-28 22:43:08 +00:00
Ivan Milanov
b371de9503 Commented out non-translated parts 2014-12-28 23:23:20 +01:00
Nick Winter
283b9e13b5 Merge branch 'master' into production 2014-12-28 13:55:25 -08:00
Nick Winter
588e0266af Fixed ordering problem I introduced with /play/ladder routes. 2014-12-28 13:55:20 -08:00
Nick Winter
15e7f0074d Merge branch 'master' into production 2014-12-28 13:53:59 -08:00
Nick Winter
fa9f3e2a61 Fixed typo in HeroVictoryModal. 2014-12-28 13:53:50 -08:00
Nick Winter
8f6114b709 Merge branch 'master' into production 2014-12-28 13:31:36 -08:00
Nick Winter
d1c07745d9 Merge branch 'flauta-patch-3' 2014-12-28 13:29:07 -08:00
Nick Winter
fb948b19cd Merged it.coffee and uncommented section headers. 2014-12-28 13:28:50 -08:00
Nick Winter
afa9b6c544 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-28 13:25:27 -08:00
Nick Winter
744d30737e Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents. 2014-12-28 13:25:20 -08:00
Imperadeiro98
12b5969fde Merge pull request #1997 from MinecraftWidget/patch-1 
Edits and Additions
 2014-12-28 20:58:21 +00:00
Imperadeiro98
cef4a09abe Merge pull request #2002 from osanseviero/patch-6 
Translated up to 470
 2014-12-28 20:54:21 +00:00
Imperadeiro98
ee874dc29c Merge pull request #2001 from nixel2007/master 
Update ru.coffee
 2014-12-28 20:51:22 +00:00
Ivan Milanov
03e199c127 Translated lines 19-50 
Only exception is the translation for 'nav.code' because I require further clarification on the context in which it is used here
 2014-12-28 21:06:54 +01:00
Nick Winter
a9c1846e41 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-28 11:15:17 -08:00
Ivan Milanov
4b59f8e0c8 Initial translate of 'home' section (4-16) 2014-12-28 20:08:47 +01:00
Ivan Milanov
af2795b4e7 Created mk-MK.coffee 
The contents were copied from 'en.coffee'.
This is the initial file with no translations, just the description is set to it's proper value.
Once the translation is done the comment "Translation not finished (work in progress)", should be removed.
 2014-12-28 19:13:44 +01:00
Ivan Milanov
dbf2790ae9 Added 'mk-MK' description to locale.coffee 2014-12-28 19:05:30 +01:00
Omar S.
d676bc1ea3 Translated up to 470 2014-12-28 12:24:48 -05:00
nixel2007
45fe2ca9a2 Update ru.coffee 
More translations after propagination
 2014-12-28 01:32:18 +03:00
Nick Winter
b4341ad46c Merge branch 'feature/campaign-editor' 2014-12-27 11:03:51 -08:00
Imperadeiro98
2f1f4d8594 Update pt-PT.coffee 2014-12-27 18:50:58 +00:00
Nick Winter
d9265c6624 Propagated i18n. 2014-12-27 10:39:44 -08:00
Imperadeiro98
b91f8eb927 Fixed last merge issues 2014-12-27 18:27:43 +00:00
Imperadeiro98
e4eb4026e3 Merge pull request #1999 from osanseviero/patch-5 
Checked up to line 340
 2014-12-27 18:25:35 +00:00
MinecraftWidget
eb60d1b186 Minor Additions 2014-12-27 11:12:24 -07:00
Omar S.
1b0ab789ca Checked up to line 340 
Checked the translations of the next lines and added one tip translation
 2014-12-27 10:35:46 -05:00
Imperadeiro98
598ca7d2ad Merge pull request #1995 from mileshayter/patch-1 
Update de-AT.coffee
 2014-12-27 11:48:01 +00:00
Nick Winter
094512833b Merge pull request #1996 from osanseviero/patch-4 
Checked and improved all up to timeunits (line 210)
 2014-12-26 23:00:55 -08:00
MinecraftWidget
b4f48764ff More Additions 2014-12-26 23:47:39 -07:00
MinecraftWidget
af7dbfb9ca Edits and Additions 2014-12-26 22:59:28 -07:00
Omar S.
b91f9e8e65 Checked and improved all up to timeunits (line 210) 
I will continue tomorrow. I have changed some lines and added somemore
 2014-12-26 23:29:24 -05:00
mileshayter
4719818dad Update de-AT.coffee 
Some translation done, will try to continue ASAP :)
 2014-12-26 22:38:55 +01:00
Imperadeiro98
da09940cb2 Merge pull request #1994 from Imperadeiro98/master 
Fixed a link
 2014-12-26 18:03:10 +00:00
Imperadeiro98
9fbd1076f9 Fixed a link 2014-12-26 18:02:40 +00:00
Imperadeiro98
4dbdf60f10 Fixed link 2014-12-26 18:01:57 +00:00
flauta
4e93b3628d Update it.coffee 2014-12-26 17:49:04 +01:00
flauta
8edb13b18d Update it.coffee 
una piccola parte delle stringhe delle schermate iniziali, come esperimento
 2014-12-26 15:29:18 +01:00
Imperadeiro98
0c62f9c70f Merge pull request #1991 from Martin005/patch-7 
Update cs.coffee
 2014-12-26 13:54:47 +00:00
Martin005
ca810dd142 Update cs.coffee 
Fixed missing space.
 2014-12-26 12:17:25 +01:00