Scott Erickson 3dc3f62473 Merge branch 'master' into feature/loading-views ... Conflicts: app/views/editor/components/main.coffee		2014-04-25 14:31:58 -07:00
..
articles	Moved the model schemas into a models folder.	2014-04-12 10:51:02 -07:00
commons	Merge branch 'master' into feature/loading-views	2014-04-25 14:31:58 -07:00
levels	Made spectate mode use top 20 players only	2014-04-14 14:28:29 -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	Merge branch 'feature/jsondiffpatch'	2014-04-11 22:52:58 -07:00
queues	Fixed isRanking and reduced logging	2014-04-14 11:01:55 -07:00
routes	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-24 10:46:10 -07:00
users	Improved admin view of pending candidates.	2014-04-23 10:21:58 -07:00
sendwithus.coffee	Added script to send out initial recruitment intro email.	2014-04-18 17:17:41 -07:00