Adam Palay 76fc180cd9 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	common/lib/xmodule/xmodule/css/capa/display.scss

2015-09-01 16:01:04 -04:00

..

__init__.py

TNL-329 Client-side work for displaying cohort description.

2014-10-01 09:22:30 -04:00

test_account_settings.py

user menu cleanup

2015-07-10 14:13:45 -04:00

test_certificate_web_view.py

Merge pull request #8659 from edx/ziafazal/SOL-1006

2015-07-06 16:45:24 -04:00

test_learner_profile.py

Fixed test_about_me_field failing on chrome bok choy

2015-08-28 16:18:06 +05:00

test_library.py

Filtering using search index + tests

2015-04-14 12:32:50 +03:00

test_lms_acid_xblock.py

unskip acid xblock tests

2015-06-08 11:57:18 -04:00

test_lms_cohorted_courseware_search.py

Update edx-search, fix lms filter generator and courseware index tests

2015-07-22 16:44:01 +02:00

test_lms_course_discovery.py

Eliminate instances of unused-import Pylint violation

2015-07-13 17:33:25 -04:00

test_lms_courseware_search.py

Eliminate instances of unused-import Pylint violation

2015-07-13 17:33:25 -04:00

test_lms_courseware.py

Integration of edx_proctoring into the LMS

2015-08-13 19:08:50 -04:00

test_lms_dashboard_search.py

Fixing bokchoy test failure

2015-08-12 14:44:11 +00:00

test_lms_dashboard.py

Make a11y test inherit from a base class

2015-06-18 14:35:11 -04:00

test_lms_edxnotes.py

Eliminate instances of unused-import Pylint violation

2015-07-13 17:33:25 -04:00

test_lms_instructor_dashboard.py

Integration of edx_proctoring into the LMS

2015-08-13 19:08:50 -04:00

test_lms_matlab_problem.py

Support for inline explanatory popups in problem XML

2015-02-05 16:56:02 -08:00

test_lms_problems.py

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

2015-09-01 16:01:04 -04:00

test_lms_split_test_courseware_search.py

Update edx-search, fix lms filter generator and courseware index tests

2015-07-22 16:44:01 +02:00

test_lms_user_preview.py

Merge pull request #8995 from open-craft/masquerade-cohorts

2015-07-26 11:18:23 -07:00

test_lms.py

Removing flaky decorator from test

2015-08-31 07:43:17 +00:00

test_teams.py

Allow sorting of teams in a topic.

2015-08-28 15:46:07 -04:00