Glen De Cauwsemaecker 7a866981f7 Merge https://github.com/codecombat/codecombat		2014-04-12 01:30:40 +02:00
..
assets	Merged the jobs in. Look out for Treema bugs from the last four months.	2014-04-11 10:20:12 -07:00
collections	Fixed #405 with a sledgehammer--just loading all Components before loading level editor.	2014-03-15 12:31:39 -07:00
lib	Added getThangByID method to Thang. Handled a few error corner cases with the time popup.	2014-04-11 14:03:13 -07:00
locale	Fixed merge conflicts for Jasper's commits.	2014-04-12 01:28:25 +02:00
models	Added specific job profile photo support. Improved right column design a bit.	2014-04-10 17:54:28 -07:00
schemas	Finished minor refactorings	2014-04-11 20:09:50 +02:00
styles	Merge branch 'signupSocialButtons' of git://github.com/adi2412/codecombat into adi2412-signupSocialButtons	2014-04-11 13:28:11 -07:00
templates	Added i18n for #809.	2014-04-11 13:37:39 -07:00
views	Added getThangByID method to Thang. Handled a few error corner cases with the time popup.	2014-04-11 14:03:13 -07:00
application.coffee	Fixed #418, no more print/save dialogues evaaarr.	2014-04-02 14:42:34 -07:00
initialize.coffee	Removed an import that no longer exists.	2014-04-11 13:18:05 -07:00
treema-ext.coffee	Fixed a couple bugs in custom TreemaNodes.	2014-04-08 17:13:05 -07:00