64 commits

Author	SHA1	Message	Date
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
GlenDC	100a296951	Fixed Issue #26	2014-01-10 22:31:26 +01:00
Nick Winter	70cd16cee4	Fixing bug with application require for now. Shoutout for Firebase.	2014-01-06 23:45:33 -08:00
Scott Erickson	250b7322a9	Fixed #56	2014-01-06 21:25:18 -08:00
Scott Erickson	a9c70f9a7d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-06 17:15:24 -08:00
Scott Erickson	94cb6ea4e1	Fixed up the search optimization and installed thang portraits into the level editor.	2014-01-06 17:11:57 -08:00
Nick Winter	1297126abd	Added back lang val instead of attr setting.	2014-01-06 16:58:50 -08:00
Nick Winter	8b4ec9b263	Merged and cleaned up #79.	2014-01-06 15:18:40 -08:00
Tom Steinbrecher	60c4b360d5	Added ContribueClassView, which all contribute pages are now based off of. ... Moved nav in to contribute_nav.jad, allowing for easier addition of nav to contribute pages. Fixed other small bugs.	2014-01-06 17:30:35 -05:00
Scott Erickson	f656a4f4cf	Set up portrait uploading for thangs.	2014-01-06 12:37:35 -08:00
Nick Winter	1185731fd0	Fixed two bugs with the CLA.	2014-01-05 15:07:30 -08:00
Nick Winter	01cfcbedc7	Updated some $attr, $val, and $prop calls.	2014-01-04 15:49:13 -08:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00