Nick Winter d743bd3a4e Merge branch 'master' of https://github.com/codecombat/codecombat		2015-04-08 10:56:02 -07:00
..
assets	Don't need confusing nested comment about Backbone (see #2633).	2015-04-07 13:44:40 -07:00
collections
core	Clans v1 UI with mock data	2015-03-31 13:28:57 -07:00
lib	Raising hard execution limit from one million to three million statements.	2015-04-04 09:34:31 -07:00
locale	Update pt-PT.coffee	2015-04-08 18:46:02 +01:00
models	Workaround for #2630: Programmable is weird.	2015-04-08 10:31:38 -07:00
schemas	Added achievement, campaign, and poll patch properties to User schema.	2015-04-08 10:55:44 -07:00
styles	Fixed #2596. Stopped bless-brunch from using its cacheBuster feature. Set no-cache header for /db/model.type/slug so that we can use Cloudflare on /db/model.type/object-id. Fixed a coffeelint warning.	2015-04-07 19:03:35 -07:00
templates	eye-open instead of eye-close for non-English leaderboard view buttons.	2015-04-08 09:46:55 -07:00
views	Fixed i18n editor not allowing translation of level guides.	2015-04-08 09:51:54 -07:00