import was putting the xml data into definition.data.data rather than de...

Make requested updates to the jobs page

studio - corrected a typo and adjusted copy on the help sock

extend the list of container module names to our comuputation of inherit...

mark stumble on case where he had a None course

add a simple Studio walkthough to check page loads

xblock changed attribute names from 'student' to 'user'. Need to update ...

make "edit" links work - fixes giturl (was broken by xblocks migration)

fix typo in instructor dashboard dump grading config

Display UTC on the end of dates (that are in UTC).

Fix/cdodge/draft metadata inheritance

revert changes to editable_metadata_fields(), so that we can't leave behavior 'as-is' for Christina's work

get metadata inheritance to work with draft stores. Fix bug on .publish() method whereby inherited metadata got written to the DB as 'own-metadata'. Change filter in mako_module.py to return list of own-metadata and inherited-metadata as 'editable-metadata'. Also, add unit test for draft metadata-inheritance and publish

Conflicts:

	lms/templates/staff_problem_info.html
	lms/xmodule_namespace.py

Remove duplicate entries from the press page.

Studio Help Sock