Adam Palay b5c4b6388c Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master ...

Conflicts:
	common/djangoapps/cors_csrf/helpers.py
	common/djangoapps/enrollment/views.py
	lms/djangoapps/commerce/constants.py
	lms/djangoapps/commerce/tests.py
	lms/djangoapps/commerce/views.py

2015-03-19 16:30:46 -04:00

..

features

Remove old comment from file

2015-03-13 12:47:20 -04:00

management

Added library import and export via .tar.gz'd XML files.

2015-03-10 21:29:29 +00:00

migrations

s/pylint: disable=W0621/pylint: disable=redefined-outer-name/

2014-12-01 11:22:08 -05:00

tests

Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master

2015-03-19 16:30:46 -04:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

access.py

Fix Pylint: W0613(unused-argument)

2015-02-19 19:56:51 -08:00

admin.py

Remove unused imports.

2014-02-10 14:07:50 -05:00

courses.py

Entrance Exam authoring and messaging updates

2015-03-10 09:24:43 -04:00

grades.py

Unicode fixes for log messages and other things

2015-02-04 09:55:44 +02:00

masquerade.py

Extend preview to support cohorted courseware

2015-01-15 10:33:44 -05:00

middleware.py

Fix Pylint: W0613(unused-argument)

2015-02-19 19:56:51 -08:00

model_data.py

Merge pull request #7262 from edx/cale/xblock-filtered-children-tests

2015-03-17 16:04:54 -04:00

models.py

Silence unrelated warnings

2015-03-14 13:35:18 -07:00

module_render.py

Clear cached children when binding an XModuleDescriptor/XBlock to a particular user

2015-03-17 10:55:06 -04:00

tabs.py

Cleaned up milestones API references

2015-03-12 15:58:21 -04:00

views.py

Merge pull request #7219 from edx/mjames/SOL-289

2015-03-19 09:51:36 -04:00