cahrens c95b44d851 Merge branch 'master' into feature/christina/metadata-ui ...

Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py

2013-05-23 11:41:12 -04:00

..

__init__.py

declare exports from course, component

2013-05-13 15:06:52 -04:00

access.py

relative imports

2013-05-13 11:31:56 -04:00

assets.py

prefix unused vars with _

2013-05-13 15:21:29 -04:00

checklist.py

relative imports

2013-05-13 11:31:56 -04:00

component.py

Merge branch 'master' into feature/christina/metadata-ui

2013-05-23 11:41:12 -04:00

course.py

added TODO for open ended and notes tab advanced policy settings.

2013-05-16 13:22:40 -04:00

error.py

relative imports

2013-05-13 11:31:56 -04:00

item.py

Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore).

2013-05-16 17:15:53 -04:00

preview.py

prefix unused vars with _

2013-05-13 15:21:29 -04:00

public.py

Remove proof-of-concept page

2013-05-22 15:55:51 -04:00

requests.py

/event was returning invalid JSON: fix it

2013-05-22 15:55:56 -04:00

session_kv_store.py

fix pep8: imports and blank lines

2013-05-13 09:58:30 -04:00

tabs.py

relative imports

2013-05-13 11:31:56 -04:00

user.py

whitespace for pep8

2013-05-13 13:47:51 -04:00