17 commits

Author	SHA1	Message	Date
Scott Erickson	3dc3f62473	Merge branch 'master' into feature/loading-views ... Conflicts: app/views/editor/components/main.coffee	2014-04-25 14:31:58 -07:00
Scott Erickson	278d6752c3	Refactored SuperModel, CocoModel and LevelLoader. ... Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader. Simplified SuperModel.	2014-04-25 14:30:06 -07:00
Scott Erickson	b7cb4696f0	Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection	2014-04-24 13:31:29 -07:00
Scott Erickson	8ab50205aa	Fixed more buttons in treema.	2014-04-24 11:50:49 -07:00
Scott Erickson	84d21490ab	Fixed some treema styling.	2014-04-24 11:38:30 -07:00
Scott Erickson	c85971e5e6	Added i18n population action to the level editor.	2014-04-22 17:56:41 -07:00
edtrist	3962d37681	#889 - moved CocoCollection.coffee to app/collections and updated references	2014-04-22 20:42:26 +01:00
Nick Winter	c226835ff2	Fixed a couple bugs in custom TreemaNodes.	2014-04-08 17:13:05 -07:00
Shrihari	093cc66fa0	Reverted few wrong migrations	2014-03-24 22:56:32 +05:30
Shrihari	0160538b44	More migrations	2014-03-24 22:28:34 +05:30
Nick Winter	d9b8375744	Merge pull request #513 from rubenvereecken/treema_fix ... Treema fix	2014-03-12 09:21:52 -07:00
Ruben Vereecken	bd129f5824	No dropdown for sound in readOnly Treemas.	2014-03-12 17:19:47 +01:00
Scott Erickson	aa3167f303	Temporary hack fix while mongodb text search is broken.	2014-03-05 15:06:20 -08:00
Scott Erickson	246bbefc91	Made the file uploading just overwrite files with the same name.	2014-03-03 17:14:13 -08:00
Scott Erickson	ec7028af60	Fixed uploading images for articles.	2014-02-26 19:30:37 -08:00
Scott Erickson	97d823cc48	Made the LatestVersionReferenceNode use projection results.	2014-02-10 12:12:22 -08:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00