Commit graph

11971 commits

Author SHA1 Message Date
Scott Erickson
0499cddbe6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-04 08:56:29 -08:00
Scott Erickson
c4bfcd5c2d Refactored portraits to be built in sprite sheets separately. 2014-01-04 08:55:12 -08:00
Nick Winter
77213f67a9 Merge pull request #63 from mlewisno/master
Added a bunch of names
2014-01-03 21:30:44 -08:00
Mischa Lewis-Norelle
c35cd3437f Added a bunch of names
Added a bunch of names, will come up with more tomorrow and add them in
the evening.
2014-01-03 23:28:09 -06:00
Michael Schmatz
c50bba824d Updated instructions 2014-01-03 21:31:36 -05:00
Michael Schmatz
0893056b66 Merge branch 'bin-script-editing' 2014-01-03 20:28:32 -05:00
Michael Schmatz
089411b723 Made python scripts executables instead of bash scripts 2014-01-03 20:07:54 -05:00
Michael Schmatz
674ba86479 Fixed installation scripts and put bin scripts into bin 2014-01-03 19:31:37 -05:00
Scott Erickson
56fa98e76b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-03 14:31:27 -08:00
Scott Erickson
9f5c7634ee Turned off mailchimp API calls during development. 2014-01-03 14:30:39 -08:00
Scott Erickson
ff3e2ba37f Turned off sending mail on the dev environment. 2014-01-03 14:28:26 -08:00
Scott Erickson
594b54a40e Can now set admin permissions on the dev environment. 2014-01-03 14:28:00 -08:00
Nick Winter
180d825c5d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-03 13:49:42 -08:00
Nick Winter
ffebe45267 Updated uglify-brunch options to not break on for(;;). 2014-01-03 13:49:36 -08:00
Michael Schmatz
7ff15630fc Fixed permission level
(fully open causes problems with ruby)
2014-01-03 15:08:14 -05:00
Michael Schmatz
52dfcc7093 Updated python script to fix bug 2014-01-03 14:19:31 -05:00
Nick Winter
4cee916c40 Added license/CLA and updated readme. 2014-01-03 11:13:06 -08:00
Nick Winter
0c7ad266a4 startBrunch.py appears to require sudo yet. 2014-01-03 11:04:06 -08:00
Nick Winter
9407347003 Updating bootstrap script to point to public repo. 2014-01-03 10:42:37 -08:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00
Nick Winter
f9e0bf948e Initial commit 2013-12-14 13:47:37 -08:00