Scott Erickson 1efb96f24a Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/templates/play/ladder/ladder_tab.jade		2014-03-03 12:08:11 -08:00
..
assets	Added team icons to the ladder play view.	2014-03-03 12:04:31 -08:00
collections	Working on the ladder and team views.	2014-02-17 17:42:41 -08:00
lib	Removed the old team view cruft.	2014-03-03 11:15:46 -08:00
locale	Merge pull request #461 from rubenvereecken/master	2014-03-03 07:37:46 -08:00
models	Level now uses the universal wizard thang type.	2014-03-03 11:04:03 -08:00
styles	Added team icons to the ladder play view.	2014-03-03 12:04:31 -08:00
templates	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-03 12:08:11 -08:00
views	Added team icons to the ladder play view.	2014-03-03 12:04:31 -08:00
application.coffee	Fixed a ton of memory leaks, but not all of them.	2014-02-06 14:00:27 -08: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	Fixed uploading images for articles.	2014-02-26 19:30:37 -08:00