Calen Pennington 6c546fbf1f Fix merge conflicts

2014-05-13 15:31:40 -04:00

..

__init__.py

Fix gradebook when using grade cutoffs other than A/B/C

2013-04-16 11:38:58 -04:00

test_access.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

test_api.py

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

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

test_email.py

Fix merge conflicts

2014-05-13 15:31:40 -04:00

test_enrollment.py

Revert StudentModule.module_state_key to field rather than computed property

2014-05-09 10:41:12 -04:00

test_hint_manager.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

test_legacy_anon_csv.py

Fix merge conflicts

2014-05-13 15:31:40 -04:00

test_legacy_download_csv.py

Fix merge conflicts

2014-05-13 15:31:40 -04:00

test_legacy_email.py

Fix merge conflicts

2014-05-13 15:31:40 -04:00

test_legacy_enrollment.py

Fix merge conflicts

2014-05-13 15:31:40 -04:00

test_legacy_forum_admin.py

Fix merge conflicts

2014-05-13 15:31:40 -04:00

test_legacy_gradebook.py

Fix merge conflicts

2014-05-13 15:31:40 -04:00

test_legacy_raw_download_csv.py

Fix merge conflicts

2014-05-13 15:31:40 -04:00

test_legacy_reset.py

Fix merge conflicts

2014-05-13 15:31:40 -04:00

test_legacy_xss.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

test_tools.py

Revert StudentModule.module_state_key to field rather than computed property

2014-05-09 10:41:12 -04:00