Ruben Vereecken 3fd396974d Merge branch 'master' into achievements ... Conflicts: app/views/DemoView.coffee app/views/docs/ComponentDocumentationView.coffee app/views/editor/level/LevelEditView.coffee server/users/User.coffee		2014-08-13 10:43:42 +02:00
..
CocoView.coffee	Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do.	2014-08-10 13:03:53 -07:00
ModalView.coffee	Table styling/ copy edit	2014-07-07 23:23:36 -07:00
RootView.coffee	Worked away our NotifyJS dependency - horrible lib	2014-08-11 14:11:26 +02:00
SearchView.coffee	Added related achievements tab to level editor	2014-08-05 15:15:53 +02:00
UserView.coffee	Worked in a lot of changes Scott proposed	2014-08-08 11:54:53 +02:00