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

3844 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
3f7f4438b2 Don't track .zedstate. 2014-06-24 19:08:27 -07:00
Nick Winter
2fc3d591b2 Merge pull request #1218 from domenukk/feature/upscript 
Feature/upscript
 2014-06-24 19:01:55 -07: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
b5ec38f811 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-06-24 16:43:32 -07:00
George Saines
68d7b3997a modifying the employer page to be more explanatory 2014-06-24 16:43:27 -07:00
Nick Winter
c2ca99ff47 Merge branch 'master' into production 2014-06-24 16:32:54 -07:00
Nick Winter
dd9b8a0018 Migrating from tileGroupNumber to tileGroupLetter. 2014-06-24 16:32:44 -07:00
Nick Winter
580d002a98 Messing with marks. 2014-06-24 15:45:33 -07:00
Michael Schmatz
cf70db2b48 Merge pull request #1224 from codecombat/master 
Master into production
 2014-06-24 14:37:28 -07:00
Michael Schmatz
e3a87156a2 Send BCC email to employer when contacting candidates 2014-06-24 14:35:30 -07:00
Scott Erickson
9b873cfab4 Patch modal handles invalid patches. 2014-06-24 17:25:01 -04:00
Scott Erickson
2cdd7c4115 Updated the patches script to handle some invalid patches. 2014-06-24 17:24:37 -04:00
Scott Erickson
ee0b14eb61 Changed the versions history modal to show name and date. 2014-06-24 16:41:55 -04:00
Scott Erickson
c5ff37eb9a Turning off source maps for now because they're wrong. 2014-06-24 16:41:24 -04:00
Michael Schmatz
9772894884 Merge pull request #1222 from codecombat/master 
Fixed gplus login.
 2014-06-24 11:46:13 -07:00
Scott Erickson
327d273cbe Fixed gplus login. 2014-06-24 14:44:37 -04:00
Michael Schmatz
22b7e52f98 Merge pull request #1221 from codecombat/master 
Master into production
 2014-06-24 11:30:28 -07:00
Michael Schmatz
988ad6ffda Attempting to fix G+ 2014-06-24 11:29:43 -07:00
Scott Erickson
0363166736 Some tweaks to the guide for the benefit of the criss-cross docs, and hopefully others as well. 2014-06-24 13:23:31 -04:00
Nick Winter
6a31e0bcd3 Fixed bug showing spell palette for languages missing any code snippets. 2014-06-24 10:17:38 -07:00
Nick Winter
8719b80663 Showing expired profiles to admins. 2014-06-24 10:15:38 -07:00
Nick Winter
abcc75a6f2 A bit of error logging for #1220. 2014-06-24 09:43:20 -07:00
Nick Winter
3862bd2376 Clearing backups of old models when saving new versions of versioned models. 2014-06-24 09:43:20 -07:00
Scott Erickson
573b566580 Fixed the cloudflare config to be in the environmental variables. 2014-06-24 12:29:47 -04:00
Scott Erickson
9a571a6fe7 Fixed the file not 'changing' when overwritten. It was a caching issue. 2014-06-24 11:55:04 -04:00
Dominik Maier
d5fc578f73 + Added md5 library 
+ Removed unused file
 2014-06-23 22:59:33 +02:00
Scott Erickson
dde43d5df3 Fixed a case where the supermodel was overriding what a previous supermodel had set for saveBackups. 2014-06-23 16:57:54 -04:00
Dominik Maier
a25b2f153d + Fixed bugs in deferred and spawn usage 2014-06-23 20:29:37 +02:00
Nick Winter
815ef88e78 Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty. 2014-06-23 10:36:42 -07:00
Michael Schmatz
27774cdf0f Fix #1207 2014-06-23 09:46:39 -07:00
Nick Winter
7a142446d2 Merge branch 'master' into production 2014-06-22 17:45:05 -07:00
Nick Winter
874b149986 Merge pull request #1205 from Darredevil/patch-9 
Added new level "K-means++ Cluster Wars"
 2014-06-22 17:44:45 -07:00
Darredevil
4ca1d2bfeb Added new level "K-means++ Cluster Wars" 
Added new level "K-means++ Cluster Wars"
 2014-06-23 03:43:54 +03:00
Nick Winter
a267933f0b Merge pull request #1200 from Airunedz/patch-1 
Improve Spanish (Spain) translations
 2014-06-22 15:39:43 -07:00
Philippe Rigovanov
1fee6c7186 Update server.coffee 
Removed unnecessary return statement in server.coffee. Functions will always return their final value.
 2014-06-23 02:10:40 +04:00
Philippe Rigovanov
f7ec30a586 Update ru.coffee 2014-06-23 01:55:45 +04:00
Nick Winter
9455b552ab Merge branch 'master' into production 2014-06-22 11:41:30 -07:00
Nick Winter
105d22c802 Merge pull request #1202 from kumabotz/minor-cleanup 
Minor cleanup
 2014-06-22 07:56:15 -07:00
Nick Winter
8698589625 Applying Scott's fix for #1198. 2014-06-22 07:55:29 -07:00
Tery Lim
f03f8da50a Remove extra spaces 2014-06-22 16:42:06 +08:00
Tery Lim
32868b565d Fix typo 2014-06-22 16:39:51 +08:00
Tery Lim
88c84911b7 Remove trailing comma 2014-06-22 16:39:07 +08:00
Nick Winter
81f8334f37 Some fixes for CocoSprite alphas. 2014-06-21 22:31:10 -07: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
2552cb511a Merge branch 'master' into production 2014-06-21 12:51:20 -07:00
Nick Winter
1f29a923cf Fixed playing multiplayer levels without an opponent, against the AI. 2014-06-21 12:24:14 -07:00
Nick Winter
6813279871 Fixed an infinite loop timeout issue. 2014-06-21 10:56:55 -07:00
Nick Winter
337aae10db Merge branch 'master' into production 2014-06-21 09:48:05 -07:00
Nick Winter
a8f4baebbc Restricted some more analytics. 2014-06-21 09:47:48 -07:00
Nick Winter
05f54a26f0 Merge branch 'master' into production 2014-06-21 09:18:01 -07:00