Michael Schmatz aba0120e88 Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: server/queues/scoring.coffee		2014-05-19 19:04:47 -07:00
..
articles	Moved the model schemas into a models folder.	2014-04-12 10:51:02 -07:00
commons	Simulator now pleads for you to help simulate when your match is being ranked.	2014-05-19 14:59:47 -07:00
levels	Level session playtime logging	2014-05-16 15:27:46 -07:00
patches	Migrated to the new email system, along with a setting for recruit notifications.	2014-04-21 16:15:23 -07:00
plugins	Added reserved word checking for names.	2014-04-28 14:09:29 -07:00
queues	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-19 19:04:47 -07:00
routes	Simulator fetch random Greed games when queue empty	2014-05-19 18:58:45 -07:00
users	Fixed saving user properties. Mentioned in #958 (was the source of the conflict error) but I don't think is related.	2014-05-07 12:25:05 -07:00
sendwithus.coffee	Added script to send out initial recruitment intro email.	2014-04-18 17:17:41 -07:00