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

9007 commits

This branch
This branch
All branches
Author SHA1 Message Date
George Saines
387eab5592 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 11:02:03 -08:00
George Saines
123affeec6 Fixing a typo in the CLA 2014-01-06 11:02:00 -08:00
Nick Winter
316b382d81 Fix for announcement duplicates. 2014-01-06 10:33:52 -08:00
Tom Steinbrecher
75894d1160 Issues 13 and 14. Contributor pages, and fixed the scrolling bug better than before 2014-01-06 00:56:32 -05:00
Tom Steinbrecher
34dd42a7ca Refactored contribute pages, each class has it's own page. Better fix to issue 13 and solution to 14 2014-01-06 00:41:31 -05:00
Michael Schmatz
b8d65bab44 Fixed function call 2014-01-05 22:42:44 -05:00
Scott Erickson
598106e39a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-05 17:01:33 -08:00
Scott Erickson
d1c33430d8 Tweaked the Archmage contribute copy. 2014-01-05 17:01:23 -08:00
Michael Schmatz
5238b85a96 Edited script to enable pulling of forked repositories 2014-01-05 19:51:54 -05:00
Scott Erickson
9019368d1d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-05 16:03:06 -08:00
Scott Erickson
1ad9f5e283 Fixed the CLA date property setting. 2014-01-05 16:02:50 -08:00
Nick Winter
3a448d589a Merge pull request #77 from chloester/master 
Fixed #13
 2014-01-05 15:59:30 -08:00
Chloe Fan
5a9b55342e Aligning intro to rest of the page 2014-01-05 15:55:36 -08:00
Chloe Fan
b7ecab102e Issue 13. Pushed header and image down to compensate for fixed top bar 2014-01-05 15:51:46 -08:00
Nick Winter
1185731fd0 Fixed two bugs with the CLA. 2014-01-05 15:07:30 -08:00
Nick Winter
b4b8d95424 Merge pull request #75 from smoratinos/master 
a readlink alternative in bash test script
 2014-01-05 14:46:29 -08:00
Nick Winter
f1186f6092 Contributor emails now indicate saved. 2014-01-05 14:45:55 -08:00
Nick Winter
ec20cac6f7 Allowed access to character class emails by prompting for signup on check. 2014-01-05 14:20:48 -08:00
Nick Winter
f0989b67c9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-05 12:32:54 -08:00
Nick Winter
fa1d24ba8f Updated README. 2014-01-05 12:32:44 -08:00
Sébastien Moratinos
e8e8b4bb66 a readlink alternative in bash test script 2014-01-05 20:09:58 +01:00
Nick Winter
d5ee2307f8 Merge pull request #74 from smoratinos/master 
fix directory path in shell script
 2014-01-05 11:03:19 -08:00
Michael Schmatz
a2138e5d3d Fixed bin deletion bug 2014-01-05 14:01:22 -05:00
Sébastien Moratinos
be40fc337e fix directory path in shell script 2014-01-05 18:32:42 +01:00
Nick Winter
164dd49933 Fixed a GitHub link. 2014-01-04 22:20:17 -08:00
Nick Winter
b9531c7c02 Merge pull request #73 from TomSteinbrecher/master 
Completed #48: Adds bobbing to thangs with 'bobs' property.
 2014-01-04 22:09:09 -08:00
Tom Steinbrecher
d50c362286 Refactored ticker, fixed from all instances were using same ticker. 2014-01-05 01:05:03 -05:00
Tom Steinbrecher
b5bb1b13a1 Completed issue 48: Adds bobbing to thangs with 'bobs' property. 
Thangs with 'bobs' must also set 'bobSpeed' and 'bobHeight'
 2014-01-04 22:51:53 -05:00
Nick Winter
1d223f790b Trying to force soft tabs and Unix newlines. 2014-01-04 16:41:25 -08:00
Nick Winter
7d3a0bd0d4 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-04 15:55:29 -08:00
Nick Winter
01cfcbedc7 Updated some $attr, $val, and $prop calls. 2014-01-04 15:49:13 -08:00
Michael Schmatz
46ee134e35 Merge branch 'dev-env-script-improvement' 2014-01-04 17:58:24 -05:00
Michael Schmatz
5687fae1cc More intermittent improvements and cleanup 2014-01-04 17:53:41 -05:00
Nick Winter
4995742d77 Noted license and CLA from README. 2014-01-04 14:19:39 -08:00
Michael Schmatz
c366945d89 Improved behavior when tmp directory exists 2014-01-04 17:14:18 -05:00
Michael Schmatz
c0a9ebe548 Deleted redundant scripts and fixed 32 bit bug 2014-01-04 16:22:56 -05:00
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