9649 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Scott Erickson	e89dc9103f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-28 12:27:21 -08:00
Scott Erickson	55ea4d86e4	Made the level editor layout more stretchy.	2014-01-28 12:27:11 -08:00
Scott Erickson	00872f80f9	Fixed the bug where opening a modal or switching a tab while having a thang to add selected would create a thang.	2014-01-28 11:54:16 -08:00
Michael Schmatz	91b1ab14e4	Merge pull request #289 from codecombat/refactor/server.coffee ... Refactored server.coffee	2014-01-28 11:07:34 -08:00
Scott Erickson	e2db421d1c	Fixed cloning.	2014-01-28 09:22:23 -08:00
Scott Erickson	9336a637ce	Merge branch 'master' into feature/bootstrap3	2014-01-27 21:25:26 -08:00
Scott Erickson	a82a6a4188	Systems part of #266.	2014-01-27 21:25:01 -08:00
Scott Erickson	ca026610b1	Component part of #266.	2014-01-27 21:06:27 -08:00
Scott Erickson	ec37e4b7af	Merge branch 'master' into feature/bootstrap3	2014-01-27 19:36:18 -08:00
Scott Erickson	baf8003dc6	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-27 19:35:40 -08:00
Scott Erickson	0b7224e2f4	Tweaked the home page button. #279	2014-01-27 19:11:39 -08:00
Scott Erickson	b4cd7bdec4	Fixed #281	2014-01-27 19:03:22 -08:00
Scott Erickson	43193aab4a	Removed a buggy transition.	2014-01-27 18:58:27 -08:00
Scott Erickson	fa8928c187	Fixed the wizard sprite on the home page again.	2014-01-27 18:55:25 -08:00
Scott Erickson	a239ba3465	Removed some more .controls from forms.	2014-01-27 18:50:03 -08:00
Scott Erickson	13af9febbf	More fixes for #283	2014-01-27 18:44:05 -08:00
Michael Schmatz	57cfb2bac6	Removed server side tests due to lack of mongodb text search	2014-01-27 18:32:56 -08:00
Michael Schmatz	1e83c7bef2	Added mongodb to be started on VM boot	2014-01-27 18:28:21 -08:00
Michael Schmatz	2f33ea41f8	Added server tests to TravisCI	2014-01-27 18:22:28 -08:00
Michael Schmatz	a2028268b9	Disabled failing tests	2014-01-27 18:11:33 -08:00
Scott Erickson	096d318e96	Fixed #283	2014-01-27 18:05:39 -08:00
Scott Erickson	d6e21192f5	Fixed #278	2014-01-27 16:59:34 -08:00
Michael Schmatz	7a7ebcd63a	Disabled failing camera tests until the axes are changed	2014-01-27 16:53:32 -08:00
Scott Erickson	9c7ac3dfdc	Fixed the top nav height.	2014-01-27 16:20:13 -08:00
Scott Erickson	22e6942165	Fixed account settings page.	2014-01-27 16:07:17 -08:00
Michael Schmatz	7534f47be4	Refactored server.coffee	2014-01-27 15:36:35 -08:00
Scott Erickson	056b81115d	Fixed profile page.	2014-01-27 11:45:24 -08:00
Scott Erickson	26d6c2dc5b	Fixed the new model modal in search.	2014-01-27 11:30:22 -08:00
Michael Schmatz	4d1c772719	Refactored files and server	2014-01-27 11:14:44 -08:00
Scott Erickson	b48fb6823e	Fixed the progress bar for loading pages.	2014-01-27 11:12:58 -08:00
Scott Erickson	88c8c3896b	Merge branch 'master' into feature/bootstrap3	2014-01-27 11:03:04 -08:00
Scott Erickson	fa3ab69dab	Level preview now loads from backups so that brunch reloads don't cause the preview to break.	2014-01-27 11:00:36 -08:00
Scott Erickson	36a46a07f2	Updated the names file.	2014-01-27 10:50:58 -08:00
Scott Erickson	9206dda3ba	Systems now autosave too in the level editor.	2014-01-27 10:39:16 -08:00
Scott Erickson	8768d710ba	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-27 10:06:45 -08:00
Scott Erickson	f1518a28e2	Fixed the camera when locked to never go to a new target.	2014-01-27 10:06:34 -08:00
Michael Schmatz	bf6e91883e	Fixed es-ES.coffee compilation errror	2014-01-27 09:00:03 -08:00
Michael Schmatz	668ba81e78	Merge pull request #285 from DanielRodriguezRivero/patch-2 ... Update es-ES.coffee	2014-01-27 08:59:28 -08:00
Michael Schmatz	298057ae58	Merge pull request #288 from atlantisguru/patch-1 ... Updated hu.coffee	2014-01-27 08:30:22 -08:00
Scott Erickson	692b24dde0	#267	2014-01-26 15:59:33 -08:00
Scott Erickson	26e9dc3b09	Fixed system order in the level view.	2014-01-26 15:37:32 -08:00
Scott Erickson	9da955d1a2	Set up a backup system for the editor using localStorage.	2014-01-26 14:46:25 -08:00
Scott Erickson	ae2bb625c8	Refactored storage module.	2014-01-26 14:44:08 -08:00
Nick Winter	47c78d1758	Revamped SpellToolbarView.	2014-01-25 15:11:29 -08:00
Bubori Attila	e8c42b8d2b	Updated hu.coffe ... Editor section translated to hungarian.	2014-01-25 23:27:44 +01:00
Michael Schmatz	45634e9413	Fixed queue bug and wrote tests	2014-01-25 10:10:03 -08:00
Nick Winter	fd758f2d4b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-24 17:48:14 -08:00
Nick Winter	d262dfaca7	A few visual tweaks to the spell view flow.	2014-01-24 17:48:11 -08:00
Scott Erickson	46dd4044aa	I'm pretty sure it's working now.	2014-01-24 17:42:47 -08:00
Scott Erickson	eafa82357c	MailChimp webhook fix.	2014-01-24 17:35:34 -08:00