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

10842 commits

This branch
This branch
All branches
Author SHA1 Message Date
guricchi
9bf08b9d20 Updated tr.coffee 2014-01-17 11:08:35 -08:00
guricchi
1c018b0cac Updated zh-HANT.coffee 2014-01-17 11:01:17 -08:00
guricchi
70a3503097 Updated zh-HANS.coffee 2014-01-17 10:51:18 -08:00
Scott Erickson
8b0a0c4e51 Added unsubscribe view. 2014-01-17 10:47:42 -08:00
Scott Erickson
104ea27dc0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-17 10:37:39 -08:00
guricchi
4cbfd846f4 Updated ja.coffee 2014-01-17 10:37:04 -08:00
Scott Erickson
9ba8fe451c Fixed errors to run 'res.end()' 2014-01-17 10:30:47 -08:00
Michael Schmatz
91c1b62375 Merge pull request #229 from guricchi/patch-3 
Updated es-ES.coffee
 2014-01-17 10:28:12 -08:00
Michael Schmatz
db96bbaf9a Merge pull request #228 from guricchi/patch-2 
Updated es-419.coffee
 2014-01-17 10:27:57 -08:00
Michael Schmatz
5b42b4b7f5 Merge pull request #227 from guricchi/patch-1 
Updated pt-PT.coffee
 2014-01-17 10:27:17 -08:00
guricchi
3e040d9d30 Updated es-ES.coffee 2014-01-17 10:21:33 -08:00
guricchi
d4fec100de Updated es-419.coffee 2014-01-17 10:17:23 -08:00
guricchi
f898c8d57c Updated pt-PT.coffee 2014-01-17 10:07:38 -08:00
Scott Erickson
6e47a6b8fd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-17 09:53:40 -08:00
Scott Erickson
3caf16ae0c Set up sendwithus. 
Created a 'notification' email subscription.
 2014-01-17 09:53:17 -08:00
Michael Schmatz
20642de3e2 Merge pull request #226 from wakeup/patch-1 
Updated Turkish translation
 2014-01-17 08:29:59 -08:00
Volkan Gezer
f072030198 Updated Turkish translation 
Updated Turkish translation
 2014-01-17 17:23:27 +01:00
ser-storchak
bace74d6ad Update ru.coffee 2014-01-17 00:45:17 -08:00
Nick Winter
d7e2b81909 Merge pull request #224 from zachster01/master 
corrected sass-brunch release requirement
 2014-01-16 19:53:22 -08:00
Zach Martin
ec3e835a78 changed sass-brunch version requirement in package.json to allow for easier environment installation 2014-01-16 21:33:24 -06:00
Nick Winter
053927eaec Fixed home page wizard scale. 2014-01-16 16:27:34 -08:00
Nick Winter
5267febd8f Couple fixes for small errors when running with no Programmables. 2014-01-16 14:29:57 -08:00
Michael Schmatz
389fa9a30b Merge pull request #220 from Elfisen/patch-2 
spelling and grammar mistakes - fr.coffee
 2014-01-16 14:26:10 -08:00
Nick Winter
43831c27ce Merge pull request #221 from GlenDC/master 
Fixed issue #160 and updated my repository
 2014-01-16 13:58:14 -08:00
GlenDC
553ad833ed Merge https://github.com/codecombat/codecombat 2014-01-16 22:27:09 +01:00
GlenDC
5cc24ea1b2 Logs now a warning in the console to give user the feedback that there are no programmable thangs which makws the level unplayable. 2014-01-16 22:26:34 +01:00
GlenDC
b557c43f60 Hotfix for previous commit, forgot to uncommit some stuff 2014-01-16 22:22:42 +01:00
GlenDC
926b31f62f Resolved issue #160 2014-01-16 22:18:38 +01:00
Nick Winter
9fc0af566e Merge branch 'master' into production 2014-01-16 12:46:23 -08:00
Allisson
580a439fab spelling and grammar mistakes - fr.coffee 
Just a correction of what really hurt the eye
 2014-01-16 21:15:39 +01:00
Nick Winter
1fb68ae717 Fixed bug with team assignments and spell permissions. 2014-01-16 11:37:04 -08:00
Michael Schmatz
d0f1510623 Merge branch 'pr/197' 
Conflicts:
	app/locale/fr.coffee
 2014-01-16 10:46:56 -08:00
Michael Schmatz
6e43daa98a Revert "Merge branch 'pr/190'" 
This reverts commit 457accf729, reversing
changes made to 9df9f75f64.
 2014-01-16 10:40:05 -08:00
Michael Schmatz
457accf729 Merge branch 'pr/190' 
Conflicts:
	app/locale/fr.coffee
 2014-01-16 10:33:00 -08:00
Michael Schmatz
9df9f75f64 Merge branch 'pr/200' 
Conflicts:
	app/locale/fr.coffee
 2014-01-16 10:24:55 -08:00
Scott Erickson
c5b9b103c5 Merge branch 'feature/team-colors' 
Conflicts:
	app/lib/world/world.coffee
	app/models/ThangType.coffee
 2014-01-16 10:14:21 -08:00
Nick Winter
af7344175a Merged and tweaked phansch's save indicator from #205. 2014-01-16 10:10:27 -08:00
Scott Erickson
ba01101ae0 Cleanup from the system tracked properties refactoring. 2014-01-16 10:04:52 -08:00
Nick Winter
5fd1a937bb Merge branch 'master' into production 2014-01-16 09:21:52 -08:00
Nick Winter
6f5b37e86d Possible fix for Grab the Mushroom problems. 2014-01-16 09:20:02 -08:00
Philipp Hansch
3a63428c0c Add jquery fading 
Also using the level:session-will-save callback
 2014-01-16 17:13:14 +01:00
Philipp Hansch
ff5807adb8 New i18n tag 2014-01-16 13:37:52 +01:00
Nick Winter
14f2db20eb Merge branch 'master' into production 2014-01-15 19:13:34 -08:00
Nick Winter
84e268a88c Removed some logs. 2014-01-15 19:03:10 -08:00
Scott Erickson
f230e8983c Fixed the level preview view. 2014-01-15 18:37:47 -08:00
Michael Schmatz
6bc3924af0 Merge pull request #208 from kengos/update_ja_coffee 
Update ja.coffee
 2014-01-15 15:58:53 -08:00
Michael Schmatz
74d5b1a845 Merge pull request #199 from GlenDC/master 
Issue #30 is resolved + Added Dutch Translations + Hotfixes
 2014-01-15 15:54:04 -08:00
GlenDC
a7368fb51e Converted line endings to unix endings for 3 files 2014-01-16 00:35:17 +01:00
Scott Erickson
47effcd50e Got the rest of team colors set up. 2014-01-15 15:16:31 -08:00
GlenDC
556149f756 Resolved issue #162 2014-01-16 00:08:35 +01:00