Scott Erickson dbbf9ce8b3 Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master ... Conflicts: app/styles/editor/level/thangs_tab.sass app/templates/editor/level/thangs_tab.jade app/views/editor/level/thangs_tab_view.coffee		2014-03-20 11:22:23 -07:00
..
assets	Added Function.Prototype.bind shim to world worker to enable running on headless browsers	2014-03-19 23:12:35 +00:00
collections	Fixed #405 with a sledgehammer--just loading all Components before loading level editor.	2014-03-15 12:31:39 -07:00
lib	Need updated Aether.	2014-03-20 10:43:24 -07:00
locale	Merged and fixed indentation to two spaces instead of three.	2014-03-20 08:25:12 -07:00
models	Tweaked logging of sprite building.	2014-03-19 17:11:45 -07:00
styles	Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master	2014-03-20 11:22:23 -07:00
templates	Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master	2014-03-20 11:22:23 -07:00
views	Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master	2014-03-20 11:22:23 -07:00
application.coffee	Better handling of refreshing ladder and matches views depending on idle state.	2014-03-12 11:39:09 -07:00
initialize.coffee	Refactored user creation to /auth/whoami, and made the app call that first, so only one user is created. Fixed #318. Think this also fixes #406.	2014-02-24 11:12:52 -08:00
treema-ext.coffee	Merge pull request #513 from rubenvereecken/treema_fix	2014-03-12 09:21:52 -07:00