codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-12 00:31:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
2638 commits 27 branches 0 tags 134 MiB
Commit graph

2638 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
81a459dc02 Merged and fixed indentation to two spaces instead of three. 2014-03-20 08:25:12 -07:00
OlenaGapak
d43c05b558 Update uk.coffee 
ukrainian localization. spelling fixes, new translation
 2014-03-20 15:05:58 +02:00
Mikhail Koltsov
a6523719e4 Merge branch 'master' of https://github.com/codecombat/codecombat into editor_tweaks 
Conflicts:
	app/locale/ru.coffee
 2014-03-20 09:07:11 +04:00
Scott Erickson
034a18c960 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-19 19:43:55 -07:00
Scott Erickson
5f45c5cf27 Added a handler for looking up friends on a leaderboard. 2014-03-19 19:42:42 -07:00
Nick Winter
1ce67710c5 Merged. 2014-03-19 19:26:17 -07:00
kvasnyk
802f0069b7 Polish language translations bug fixes. 2014-03-20 03:03:03 +01:00
Nick Winter
b7e8f2ecb5 Merge pull request #605 from kvasnyk/master 
Fix for #272 bug.
 2014-03-19 18:31:20 -07:00
Nick Winter
ff1e64e1f6 Less useless ladder refresh requests. 2014-03-19 18:26:38 -07:00
Nick Winter
9713f7d142 Merge branch 'arrow' of git://github.com/ItsLastDay/codecombat into ItsLastDay-arrow 2014-03-19 18:01:49 -07:00
Nick Winter
6bcf263d90 Merge branch 'production' 2014-03-19 17:26:24 -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
Nick Winter
87f16f2550 Merge branch 'Shrihari-range-radii' 2014-03-19 17:17:05 -07:00
Nick Winter
fec8e34a78 Merged. 2014-03-19 17:16:48 -07:00
Scott Erickson
954a3ac4cb Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-19 17:11:53 -07:00
Glen De Cauwsemaecker
225fd6d355 Fixed a spelling mistake I made yesterday. 2014-03-20 02:02:40 +01:00
Glen De Cauwsemaecker
dfbba38dd3 Merge github.com:codecombat/codecombat 2014-03-20 01:55:12 +01:00
Scott Erickson
b6c9b6276c Tweaked logging of sprite building. 2014-03-19 17:11:45 -07:00
Glen De Cauwsemaecker
71a13a5670 Adding missing translations for the Dutch local file 2014-03-20 00:33:50 +01:00
Nick Winter
b580203a7d Merge pull request #618 from fusspawn/master 
Added Function.Prototype.bind shim to world worker
 2014-03-19 16:18:25 -07:00
Fusspawn
b10b9fcb4e Added Function.Prototype.bind shim to world worker to enable running on headless browsers 2014-03-19 23:12:35 +00:00
Glen De Cauwsemaecker
e2a7c15776 Merge conflicts resolved from Ruben's branch 2014-03-20 00:05:41 +01:00
OverProgram
f6e5ceb1ef More Updates fore he.coffee 
Here is some more translate to hebrow.
 2014-03-19 20:18:30 +02:00
Nick Winter
777420ebd8 Merge pull request #614 from M-r-A/patch-2 
Update ru.coffee
 2014-03-19 09:28:39 -07:00
Nick Winter
6a5c24cc69 Merge pull request #616 from OverProgram/patch-1 
Update he.coffee
 2014-03-19 09:28:12 -07:00
Nick Winter
9edd5e751d Merge pull request #615 from MartinDelille/translation 
first multiplayer translations
 2014-03-19 09:26:29 -07:00
OverProgram
00d17c6d2f Update he.coffee 2014-03-19 16:13:41 +02:00
Alexei Nikitin
5b2a219ca5 Update ru.coffee 2014-03-19 03:42:38 -07:00
Alexei Nikitin
4a119cd6b0 Update ru.coffee 2014-03-19 02:53:13 -07:00
Glen De Cauwsemaecker
c98ee7314a Applied Vietnamese translations made by Nguyen Thi Thien An via email. 2014-03-19 03:24:16 +01:00
Glen De Cauwsemaecker
91ff1bd4c6 Translated glen_description in dutch (Nederlands). 2014-03-19 02:49:55 +01:00
Glen De Cauwsemaecker
a523d74b2d Added the glen_description i18n tag to all languages. 2014-03-19 02:47:25 +01:00
Glen De Cauwsemaecker
a9fc1cb35a Added a newline 2014-03-19 02:34:23 +01:00
Glen De Cauwsemaecker
9f391408e7 Merge branch 'translations' of github.com:iulianR/codecombat into iulianR-translations 2014-03-19 02:27:55 +01:00
Glen De Cauwsemaecker
eab52f45e5 Applied proofread of Julian. 2014-03-19 02:21:45 +01:00
Glen De Cauwsemaecker
f7777ef501 Merge branch 'patch-2' of github.com:feugy/codecombat 2014-03-19 02:16:54 +01:00
Glen De Cauwsemaecker
5dc89529ca Described myself. 2014-03-19 02:10:58 +01:00
Glen De Cauwsemaecker
00170d88fd Merge github.com:codecombat/codecombat 2014-03-19 02:06:10 +01:00
iulianR
8735ed20d4 Updated ro.coffee 2014-03-19 02:06:02 +02:00
iulianR
bfac03a73c Rearranged play_view.cofee for consistency 2014-03-19 01:57:21 +02:00
Mikhail Koltsov
dfe5cd8f41 Polished ru.coffee a bit 2014-03-19 03:29:53 +04:00
Nick Winter
96bc752747 Merge pull request #603 from feugy/patch-1 
Add some french translations
 2014-03-18 15:55:11 -07:00
Mikhail Koltsov
c9a08a0b25 thang editor: added i18n binding to 'Save' button 2014-03-19 01:43:27 +04:00
Martin Delille
93ec4f94fc first translation shot 2014-03-18 22:37:10 +01:00
Mikhail Koltsov
62a1701063 even better positioning 2014-03-19 01:26:41 +04:00
Michael Schmatz
f479e71cb9 Added score skipping for under 30 2014-03-18 14:25:22 -07:00
Mikhail Koltsov
1cc3e79db9 fixed thang editor appearance: components view was overlapping with tabs. 
Now looks neat, but still unclickable.
 2014-03-19 01:21:11 +04:00
Scott Erickson
514d6024e0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-18 13:48:11 -07:00
Scott Erickson
74e068af0b Fixed some bugs from the migration from _.cloneDeep to $.extend 2014-03-18 13:47:51 -07:00
Michael Schmatz
24770a7486 Raised ratio requirements 2014-03-18 13:24:48 -07:00