George Saines 5f9cc2561a Merge branch 'master' of https://github.com/codecombat/codecombat		2014-09-01 16:28:03 -07:00
..
assets	fixed transparency issue with thang image	2014-09-01 14:09:39 -07:00
collections	Refactored the item equips view to limit items by slot and also moved the item name loading to the node class itself.	2014-08-28 11:24:45 -07:00
lib	Fixed a few bugs.	2014-09-01 16:14:50 -07:00
locale	Update pl.coffee	2014-08-31 22:31:28 +02:00
models	Fixed a few bugs and added a bunch of defensive handling for permissions not existing without new defaults. Fixed longstanding mistake with signup ignoring email newsletter setting.	2014-09-01 09:11:10 -07:00
schemas	Fixed a few bugs.	2014-09-01 16:14:50 -07:00
styles	Made ItemView more general. Upgraded Bootstrap from 3.1 to 3.2. Fixed a few bugs.	2014-08-31 12:21:25 -07:00
templates	Fixed a few bugs and added a bunch of defensive handling for permissions not existing without new defaults. Fixed longstanding mistake with signup ignoring email newsletter setting.	2014-09-01 09:11:10 -07:00
views	Fixed a bounds offset issue in the Thang Editor colors tab.	2014-09-01 16:22:04 -07:00
application.coffee	Merge conflicts.	2014-08-26 09:53:04 -07:00
initialize.coffee	Merged conflicts.	2014-08-28 09:59:03 -07:00
Router.coffee	Fixed #1458.	2014-08-30 20:27:58 -07:00
treema-ext.coffee	Made ItemView more general. Upgraded Bootstrap from 3.1 to 3.2. Fixed a few bugs.	2014-08-31 12:21:25 -07:00