Nick Winter 8a42521cd0 Merge branch 'master' of https://github.com/codecombat/codecombat		2014-04-24 14:31:54 -07:00
..
assets	Renamed test_worker to aether_worker	2014-04-22 11:58:27 -07:00
collections	#889 - moved CocoCollection.coffee to app/collections and updated references	2014-04-22 20:42:26 +01:00
lib	Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com.	2014-04-24 14:23:15 -07:00
locale	Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText	2014-04-24 13:29:24 -07:00
models	Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection	2014-04-24 13:31:29 -07:00
schemas	Fixed #911	2014-04-24 11:51:00 -07:00
styles	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-24 14:31:54 -07:00
templates	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-24 14:31:54 -07:00
views	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-24 14:31:54 -07:00
application.coffee	Fixed #913, I think. (This was just built into marked.)	2014-04-24 12:24:22 -07:00
initialize.coffee	Removed an import that no longer exists.	2014-04-11 13:18:05 -07:00
treema-ext.coffee	Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection	2014-04-24 13:31:29 -07:00