1257 commits

Author	SHA1	Message	Date
GlenDC	92416dc4f2	Created view versions for components, systems and thangs (fix #30)	2014-01-15 01:33:24 +01:00
GlenDC	4633ced78d	Created superclass & common templates for article & level (fix for #30)	2014-01-15 01:12:21 +01:00
Scott Erickson	bf4011044f	Initially working on using team colors, but it's not working yet.	2014-01-14 13:16:30 -08:00
Scott Erickson	f4a2209d6f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-14 12:53:18 -08:00
Scott Erickson	83e7a98869	Fixed the versions pages.	2014-01-14 12:53:06 -08:00
Nick Winter	4a702176a6	Updated i18n, added /employers.	2014-01-13 22:29:58 -08:00
Nick Winter	d6f2f41cf8	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-12 12:24:24 -08:00
Scott Erickson	c4028a8036	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-12 12:06:48 -08:00
Nick Winter	1572228aa5	Merge branch 'master' of git://github.com/GlenDC/codecombat into GlenDC-master	2014-01-12 12:01:56 -08:00
Nick Winter	8ab997680e	Turned off A/B test for Break the Prison.	2014-01-12 12:00:38 -08:00
Scott Erickson	6d60221668	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-12 11:58:24 -08:00
Scott Erickson	be80858648	Added wizard color setting.	2014-01-12 11:54:50 -08:00
GlenDC	683b72f67a	First big fix for issue #23. The issue is as good as fixed besides some details I think.	2014-01-11 17:25:04 +01:00
Nick Winter	00f4699ce5	Further fixes for save modals.	2014-01-10 17:32:29 -08:00
Scott Erickson	1f9c531938	Got rid of a bunch of logs.	2014-01-10 16:57:38 -08:00
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
Nick Winter	a6f1ce53ba	Merged #152, and slightly improved update interval handling.	2014-01-10 16:36:36 -08:00
dristic	21915f358c	Add clear timers to not have timer running in the background on home page.	2014-01-10 16:18:39 -08:00
GlenDC	100a296951	Fixed Issue #26	2014-01-10 22:31:26 +01:00
Nick Winter	69df0079af	Fixed bug returning to normal selection from talking portrait in HUD.	2014-01-09 18:30:18 -08:00
Scott Erickson	2d5ca50e89	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-09 14:04:53 -08:00
Scott Erickson	3c3e38b585	Set up thang avatar views with the new db portraits.	2014-01-09 14:04:46 -08:00
Nick Winter	98245d0fb9	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-09 11:28:14 -08:00
Nick Winter	3a954ff91c	A bit more CoffeeScript-y.	2014-01-09 11:28:08 -08:00
Scott Erickson	4e34b38c83	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/views/play/level/hud_view.coffee	2014-01-09 11:05:51 -08:00
Scott Erickson	8077c62ceb	Set up talking portraits in the hud.	2014-01-09 11:04:22 -08:00
Nick Winter	e2414f7c5a	Hopefully fixed #106 by being super conservative about whether G+, FB, and Twitter can be loaded.	2014-01-09 10:49:34 -08:00
Ronald Cheng	278b4d8754	If you have pressed esc, do not get prompted about it	2014-01-08 23:09:58 -08:00
Scott Erickson	391207d00f	Fixes for unit portraits.	2014-01-08 22:30:00 -08:00
Nick Winter	03a5614a18	Fixed #96.	2014-01-08 19:18:23 -08:00
Ronald Cheng	81eed31714	Create notification that esc can skip dialogs ... If you use the shift-space combination at least 5 times per page load, a message will pop up next to the continue button stating that you can press esc to skip dialog.	2014-01-08 14:23:36 -08: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	f0147e8f7c	More tweaks to the thang editor.	2014-01-06 19:33:36 -08:00
Scott Erickson	ddbf45b50c	Made the thang editor a little more organized.	2014-01-06 19:09:43 -08:00
Scott Erickson	59ec63c041	Fixed #60.	2014-01-06 18:12:57 -08:00
Scott Erickson	aeaeb84fe5	Fixed general articles showing up in the guides.	2014-01-06 18:03:17 -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
Scott Erickson	fe984d7c73	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-06 15:36:50 -08:00
Scott Erickson	27e7b6c240	Tweaks for thang portraits.	2014-01-06 15:36:35 -08:00
Nick Winter	8b4ec9b263	Merged and cleaned up #79.	2014-01-06 15:18:40 -08:00
Nick Winter	f53f20a6ad	Fixed #86.	2014-01-06 14:53:21 -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	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
Nick Winter	1185731fd0	Fixed two bugs with the CLA.	2014-01-05 15:07:30 -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	1d223f790b	Trying to force soft tabs and Unix newlines.	2014-01-04 16:41:25 -08:00
Nick Winter	01cfcbedc7	Updated some $attr, $val, and $prop calls.	2014-01-04 15:49:13 -08:00
Scott Erickson	c4bfcd5c2d	Refactored portraits to be built in sprite sheets separately.	2014-01-04 08:55:12 -08:00
Scott Erickson	594b54a40e	Can now set admin permissions on the dev environment.	2014-01-03 14:28:00 -08:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00