codecombat/app/views/editor
Ting-Kuan 692693c181 Merge branch 'master' into feature/loading-views
Conflicts:
	app/locale/en.coffee
	app/views/editor/level/edit.coffee
	app/views/kinds/CocoView.coffee
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
	app/views/play/level/level_loading_view.coffee
2014-04-19 01:15:04 -04:00
..
article Moved the model schemas into a models folder. 2014-04-12 10:51:02 -07:00
component Added a versions modal for every type 2014-03-10 23:29:34 +01:00
components hideLoading on ThangEditView and ComponentConfigView. 2014-04-17 22:41:07 -04:00
level Merge branch 'master' into feature/loading-views 2014-04-19 01:15:04 -04:00
system Set up the rest of the component/system buttons and nav bars. 2014-04-17 13:24:17 -07:00
thang Merge branch 'master' into feature/loading-views 2014-04-19 01:15:04 -04:00
delta.coffee Fixed a bug, colored a badge. 2014-04-17 14:39:52 -07:00
patch_modal.coffee Fixed patches denormalization. 2014-04-17 15:44:19 -07:00
patches_view.coffee Merge branch 'master' into feature/loading-views 2014-04-19 01:15:04 -04:00