codecombat/app
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
..
assets Adds preset images 2014-08-12 20:42:42 +05:30
collections User page now uses the supermodel for user loading 2014-08-08 19:26:24 +02:00
lib Merge branch 'master' into achievements 2014-08-13 10:43:42 +02:00
locale Merge branch 'master' into achievements 2014-08-13 10:43:42 +02:00
models Merge branch 'master' into achievements 2014-08-13 10:43:42 +02:00
schemas Merge branch 'master' into achievements 2014-08-13 10:43:42 +02:00
styles Merge branch 'master' into achievements 2014-08-13 10:43:42 +02:00
templates Merge branch 'master' into achievements 2014-08-13 10:43:42 +02:00
views Merge branch 'master' into achievements 2014-08-13 10:43:42 +02:00
application.coffee Worked away our NotifyJS dependency - horrible lib 2014-08-11 14:11:26 +02:00
initialize.coffee Added Moment i18n support 2014-07-30 23:19:21 +02:00
Router.coffee Added a bunch of achievements to the script. Restyled big parts. 2014-08-03 23:58:51 +02:00
treema-ext.coffee Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do. 2014-08-10 13:03:53 -07:00