Calen Pennington 18c91d0f1d Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html

2014-05-16 14:01:20 -04:00

..

fixtures

Clean up partial import statemen

2014-05-09 09:23:52 -04:00

pages

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00

tests

Merge pull request #3758 from edx/clytwynec/disable-XBlockAcidNoChildTest

2014-05-16 12:01:05 -04:00

__init__.py

Refactored bok-choy directory structure

2014-01-15 09:37:32 -05:00

.coveragerc

Change name of bok-choy XML coverage report to avoid combining it with the unit test reports

2014-02-10 08:58:55 -05:00

setup.py

Updated bok choy page objects setup.py

2014-02-04 14:32:42 -05:00