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
..
achievement	Merge branch 'master' into achievements	2014-08-13 10:43:42 +02:00
common	Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code.	2014-07-18 16:12:28 -07:00
editor	Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal.	2014-08-11 15:41:08 -07:00
modals	GET /auth/name/<name> now serves possible free names	2014-07-14 20:07:58 +02:00
user	Merged in name changes from master	2014-07-29 17:28:13 +02:00