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

9724 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Erickson
ecd9ed8fef Fixed the save version modal. 2014-01-10 17:11:13 -08:00
Nick Winter
033e3a6c0b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 17:04:21 -08:00
Nick Winter
2383d5dd3a An improvement for containingString in #133. 2014-01-10 17:04:12 -08:00
Scott Erickson
1f9c531938 Got rid of a bunch of logs. 2014-01-10 16:57:38 -08:00
Scott Erickson
95900f230f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 16:48:45 -08:00
Scott Erickson
1a3c6498e8 Built the thang editor colors tab. 2014-01-10 16:48:28 -08:00
Nick Winter
a6f1ce53ba Merged #152, and slightly improved update interval handling. 2014-01-10 16:36:36 -08:00
dristic
21915f358c Add clear timers to not have timer running in the background on home page. 2014-01-10 16:18:39 -08:00
Nick Winter
cf41f6e3d0 I guess we just renamed brunch.coffee to config.coffee. 2014-01-10 15:51:26 -08:00
Scott Erickson
c768d5cb7c Merge pull request #150 from GlenDC/master 
Fixes issue #26
 2014-01-10 14:15:41 -08:00
GlenDC
6323ba4965 Renamed brunch.coffee => config.coffee 2014-01-10 22:37:31 +01:00
GlenDC
a8e3d2d751 ignored ./db folder 2014-01-10 22:37:12 +01:00
GlenDC
100a296951 Fixed Issue #26 2014-01-10 22:31:26 +01:00
Nick Winter
2b6a7cf753 Merge pull request #145 from fess89/master 
Update uk.coffee
 2014-01-10 09:42:16 -08:00
mlewisno
c6e81f909c Added a file and translations for Bahasa Malaysia 2014-01-10 10:09:45 -05:00
mlewisno
9318675447 Merge remote-tracking branch 'upstream/master' 
Updated my local copy to match the public copy
 2014-01-10 10:08:02 -05:00
Oleksii Chyrkov
8902ba91e2 Update uk.coffee 
Copied Ukrainian strings from Google doc to uk.coffee.
 2014-01-10 14:55:56 +02:00
Nick Winter
a72eb4d3e7 Merge pull request #142 from Adam23/master 
updating zh-HANS.coffee
 2014-01-09 22:56:25 -08:00
Adam23
29a302aaa9 update zh-HANS.coffee 
make the string blank, and comment out the line
 2014-01-10 14:54:22 +08:00
Adam23
cf6b6c11ce update zh-HANS.coffee 
two places
 2014-01-10 14:19:25 +08:00
Adam23
e01db58608 updating zh-HANS.coffee 
I have finished the  first draft.
 2014-01-10 13:43:59 +08:00
Nick Winter
69df0079af Fixed bug returning to normal selection from talking portrait in HUD. 2014-01-09 18:30:18 -08:00
Nick Winter
25d2f95db9 Not using subreddit any more. 2014-01-09 18:29:57 -08:00
Nick Winter
027cddd151 Increased matching bracket highlighting visibility. 2014-01-09 18:02:16 -08:00
Nick Winter
05d7562c78 Copied Norwegian also Norwegian (Bokmal). 2014-01-09 17:43:13 -08:00
Nick Winter
7cbd1605e4 Merge pull request #139 from rhc2104/dutch 
Add Dutch translations
 2014-01-09 17:28:13 -08:00
Nick Winter
4502492d8a Merge pull request #138 from rhc2104/italian 
Add support for Italian
 2014-01-09 17:27:47 -08:00
Nick Winter
269285e2ad Merge pull request #136 from rhc2104/swedish 
Add Swedish translations, plus a couple of Polish translations
 2014-01-09 17:27:15 -08:00
Ronald Cheng
014fd0d608 Add Dutch translations 2014-01-09 17:15:44 -08:00
Ronald Cheng
309e2c7467 Add support for Italian 2014-01-09 16:50:59 -08:00
Ronald Cheng
36c8e96450 Add Swedish translations, plus a couple of Polish translations 2014-01-09 16:08:57 -08:00
Nick Winter
644581dd74 Merge pull request #132 from fess89/master 
Update ru.coffee
 2014-01-09 14:54:25 -08:00
Oleksii Chyrkov
8931a01ae3 Update ru.coffee 
Added a missing quote at the last line.
 2014-01-10 00:47:14 +02:00
Nick Winter
0c6b1257ff Fixed a couple syntax issues in Russian locale.. 2014-01-09 14:46:00 -08:00
Nick Winter
7cda5dcbc5 Merge pull request #130 from fess89/master 
Update ru.coffee
 2014-01-09 14:43:22 -08:00
Oleksii Chyrkov
96b995ed60 Update ru.coffee 
Updated ru.coffee with the actual Russian translation of all the strings.
 2014-01-10 00:24:35 +02:00
Michael Schmatz
faac70bee9 Merge pull request #125 from p-buse/master 
Fix "Contact" link in footer not properly changing cursor to pointer
 2014-01-09 14:18:15 -08:00
Scott Erickson
2d5ca50e89 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-09 14:04:53 -08:00
Scott Erickson
3c3e38b585 Set up thang avatar views with the new db portraits. 2014-01-09 14:04:46 -08:00
Michael Schmatz
162b8a3a7d Merge pull request #129 from smoratinos/master 
All server tests now run without fatal errors.
 2014-01-09 13:55:25 -08:00
Sébastien Moratinos
e20408c248 We can now run all test on the server. 
99 tests, 220 assertions, 13 failures

2 tests are disabled in file.spec.coffee
because they cause a fatal error.
 2014-01-09 22:36:06 +01:00
mlewisno
414bb4d07a Added a file for Bahasa Malaysia, will update soon 2014-01-09 16:30:03 -05:00
Michael Schmatz
e888c4c305 Merge pull request #126 from Dman19993/patch-1 
Update names.coffee
 2014-01-09 13:00:31 -08:00
Dman19993
6f094f0f38 Update names.coffee 2014-01-09 14:47:24 -06:00
Paul Buser
7af5804e29 Fix "Contact" link in footer not properly changing cursor to pointer 2014-01-09 15:31:56 -05:00
Michael Schmatz
9c2a1a20d4 Merge pull request #124 from Tavio/patch-3 
Update names.coffee
 2014-01-09 12:06:53 -08:00
Tavio
850313ca70 Update names.coffee 2014-01-09 18:00:39 -02:00
Nick Winter
98245d0fb9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-09 11:28:14 -08:00
Nick Winter
3a954ff91c A bit more CoffeeScript-y. 2014-01-09 11:28:08 -08:00
Scott Erickson
4e34b38c83 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/views/play/level/hud_view.coffee
 2014-01-09 11:05:51 -08:00