Scott Erickson 8431fd1e57 Merge branch 'master' of https://github.com/codecombat/codecombat		2014-03-13 15:45:41 -07:00
..
assets	Hooked up new HUD icons.	2014-03-04 11:15:31 -08:00
collections	Working on the ladder and team views.	2014-02-17 17:42:41 -08:00
lib	Probably too mean to tell users that their password is wrong three times, so just once will do.	2014-03-13 10:27:32 -07:00
locale	Added Opponent i18n placeholder to other locales, and restored some new placeholders to pl.coffee.	2014-03-13 10:33:20 -07:00
models	Fixed the new build queue system for levels where there are multiple builders for a single thang type.	2014-03-13 15:45:24 -07:00
styles	Merge branch 'master' of github.com:codecombat/codecombat	2014-03-13 15:24:04 -07:00
templates	Resolved some merge conflicts.	2014-03-13 10:32:18 -07:00
views	Merge branch 'master' of github.com:codecombat/codecombat	2014-03-13 15:24:04 -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