Sarina Canelake
|
3adc2f0a2e
|
Fix opaque_keys imports from hotfixes
|
2014-06-11 21:32:41 -04:00 |
|
Sarina Canelake
|
7e36c35043
|
Merge branch 'release'
|
2014-06-11 21:30:05 -04:00 |
|
Calen Pennington
|
f6ea16223b
|
Allow users that have unregistered from a verified course to re-register.
Fixes LMS-2830
|
2014-06-11 12:37:53 -04:00 |
|
Sarina Canelake
|
2aea261d48
|
Merge branch 'release'
Conflicts:
common/djangoapps/course_modes/views.py
common/djangoapps/student/tests/test_roles.py
common/djangoapps/student/views.py
common/lib/opaque_keys/opaque_keys/__init__.py
common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
common/lib/xmodule/xmodule/contentstore/mongo.py
lms/djangoapps/certificates/management/commands/gen_cert_report.py
lms/djangoapps/notes/views.py
|
2014-06-10 16:59:23 -04:00 |
|
Calen Pennington
|
87557a1af8
|
Add tests of RoleCache
|
2014-06-09 15:15:03 -04:00 |
|
Calen Pennington
|
dc7b2f0762
|
Don't create model objects to check the roles cache
|
2014-06-09 15:13:31 -04:00 |
|
Don Mitchell
|
c808277007
|
Change document_class back to dict
|
2014-06-09 15:13:31 -04:00 |
|
Julia Hansbrough
|
e3459cd3cb
|
Opaque-Keys: Response to code review
|
2014-06-09 15:12:22 -04:00 |
|
Don Mitchell
|
2c6437a279
|
Fix performance regression
Remove course_from_id
don't fetch whole course when the root will do
don't fetch even the root if the id will do
check for definition.data == null
|
2014-06-09 15:10:47 -04:00 |
|
Waheed Ahmed
|
200394f608
|
Added logging for sender email address on BotoServerError.
LMS-2734
|
2014-06-09 12:22:41 +05:00 |
|
Jay Zoldak
|
ac17e809ee
|
Fix some translation tags
|
2014-06-03 15:50:11 -04:00 |
|
Greg Price
|
0d37b4b254
|
Merge branch 'release'
Conflicts:
cms/djangoapps/contentstore/tests/test_course_listing.py
common/djangoapps/student/management/commands/create_random_users.py
common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
lms/djangoapps/bulk_email/forms.py
lms/djangoapps/courseware/tests/test_video_handlers.py
lms/djangoapps/courseware/views.py
lms/djangoapps/instructor/management/commands/openended_post.py
lms/djangoapps/instructor/management/commands/openended_stats.py
lms/djangoapps/instructor/tests/test_spoc_gradebook.py
|
2014-06-02 15:29:40 -04:00 |
|
Julia Hansbrough
|
6ccb11f03e
|
Change Location, CourseLocator, etc to reference opaque-keys library
|
2014-05-30 20:32:38 +00:00 |
|
Calen Pennington
|
cfcbdc0145
|
Move to OpaqueKey implementations from the external library
[LMS-2757]
|
2014-05-29 17:03:35 -04:00 |
|
Don Mitchell
|
85565a3de8
|
lms dashboard ignores errored courses
|
2014-05-29 14:38:42 -04:00 |
|
Usman Khalid
|
3aa4598956
|
Merge pull request #3879 from edx/usman/lms2747-anonymous-ids-collection
Do not persist anonymous ids when exporting for all students of a course.
|
2014-05-29 16:18:43 +05:00 |
|
Usman Khalid
|
3824e234fe
|
Do not persist anonymous ids when exporting for all students of a course.
For large courses this causes export to take a long time and to time out.
LMS-2747
|
2014-05-28 20:48:43 +05:00 |
|
Don Mitchell
|
4944cc763b
|
Get rid of skiptests
|
2014-05-28 08:20:17 -04:00 |
|
Sarina Canelake
|
46d7f99004
|
StaffFactories accept course_keys, not courses. Make that clear in the interface.
|
2014-05-24 19:36:18 -04:00 |
|
Sarina Canelake
|
d1672e31f7
|
Opaque-keys: fix pylint violations
|
2014-05-24 19:36:09 -04:00 |
|
Sarina Canelake
|
c535a6b933
|
Opaque-keys: fix pep8 violations
|
2014-05-24 19:35:58 -04:00 |
|
Sarina Canelake
|
110719deae
|
StaffFactories accept course_keys, not courses. Make that clear in the interface.
|
2014-05-24 18:49:06 -04:00 |
|
Sarina Canelake
|
265fa826ca
|
Opaque-keys: fix pylint violations
|
2014-05-23 14:23:12 -04:00 |
|
Sarina Canelake
|
bf32f5a7b9
|
Opaque-keys: fix pep8 violations
|
2014-05-23 14:22:54 -04:00 |
|
Calen Pennington
|
240fcc1d5a
|
Fix merge conflicts
|
2014-05-22 16:24:02 -04:00 |
|
Calen Pennington
|
cd862b3253
|
Merge remote-tracking branch 'edx/master' into opaque-keys
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views/component.py
cms/djangoapps/contentstore/views/item.py
cms/djangoapps/contentstore/views/preview.py
cms/djangoapps/contentstore/views/tests/test_container.py
cms/static/js/spec/views/unit_spec.js
cms/static/js/utils/module.js
cms/templates/container.html
cms/templates/studio_vertical_wrapper.html
cms/templates/studio_xblock_wrapper.html
common/djangoapps/student/views.py
lms/templates/notes.html
lms/templates/textannotation.html
lms/templates/videoannotation.html
|
2014-05-22 10:52:00 -04:00 |
|
Calen Pennington
|
4b69cf5472
|
Merge pull request #3810 from cpennington/ok-management-commands
Fix management commands
|
2014-05-21 21:53:43 -04:00 |
|
Don Mitchell
|
bef8134eea
|
Merge pull request #3806 from edx/dhm/opaque_migrate_0036
Migration for role_coursenum deprecated roles
|
2014-05-21 16:33:33 -04:00 |
|
Calen Pennington
|
1c60da02df
|
fixup! Fix management commands
|
2014-05-21 16:20:46 -04:00 |
|
Calen Pennington
|
06d680cded
|
Don't use Empty directly, let the manager handle it
|
2014-05-21 14:38:16 -04:00 |
|
Calen Pennington
|
1f849e441d
|
Fix management commands
|
2014-05-21 14:36:41 -04:00 |
|
Don Mitchell
|
9af40ae2cc
|
Migration for role_coursenum deprecated roles
|
2014-05-21 12:03:09 -04:00 |
|
Sarina Canelake
|
189f53bc71
|
Fix grades management commands
|
2014-05-19 16:11:45 -04:00 |
|
Don Mitchell
|
5a62c83d05
|
Handle some records not having lower_id
|
2014-05-19 13:31:03 -04:00 |
|
Calen Pennington
|
d4280e8529
|
Fix merge conflicts
|
2014-05-16 14:10:50 -04:00 |
|
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 |
|
David Baumgold
|
59e3cae4c9
|
Revert pull request #3466
|
2014-05-14 13:55:26 -04:00 |
|
John Jarvis
|
71c447768d
|
returning enrollment mode for both active and inactive users
|
2014-05-13 17:47:52 -04:00 |
|
Calen Pennington
|
484c529d99
|
Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master
|
2014-05-13 10:23:24 -04:00 |
|
Don Mitchell
|
75280e8577
|
fixup! Migration refactoring
|
2014-05-12 12:02:16 -04:00 |
|
Don Mitchell
|
2238ce2cda
|
Let sql tell us if the data is unique
|
2014-05-12 11:55:35 -04:00 |
|
Don Mitchell
|
7b70c4b8da
|
Migration refactoring
|
2014-05-12 11:55:35 -04:00 |
|
Calen Pennington
|
85ca7db7a6
|
Fix merge conflicts relative to master
|
2014-05-12 11:42:21 -04:00 |
|
Calen Pennington
|
19acdd31e8
|
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
cms/djangoapps/contentstore/views/public.py
common/djangoapps/external_auth/tests/test_ssl.py
common/djangoapps/student/views.py
lms/djangoapps/dashboard/sysadmin.py
lms/templates/notes.html
|
2014-05-12 11:35:03 -04:00 |
|
Calen Pennington
|
94c8d86a42
|
Fix failing tests from merge with master
|
2014-05-12 11:34:39 -04:00 |
|
David Ormsbee
|
77c7ebd704
|
Merge pull request #2768 from carsongee/cg/ssl-next-url
Modified ssl certificate authentication to handle next redirection
|
2014-05-11 20:12:12 -04:00 |
|
David Baumgold
|
c0a5171c75
|
Merge pull request #3466 from lduarte1991/lduarte-harvardx
Reconnecting Token Generator for Annotation Tool
|
2014-05-09 16:14:42 -04:00 |
|
Calen Pennington
|
155ffe37ca
|
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
cms/djangoapps/contentstore/views/item.py
cms/djangoapps/contentstore/views/tests/test_container.py
cms/djangoapps/contentstore/views/tests/test_tabs.py
common/lib/xmodule/xmodule/modulestore/mongo/draft.py
lms/djangoapps/certificates/management/commands/gen_cert_report.py
lms/djangoapps/certificates/queue.py
lms/djangoapps/certificates/views.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/tests/test_module_render.py
lms/djangoapps/instructor/views/api.py
lms/djangoapps/instructor/views/instructor_dashboard.py
lms/djangoapps/instructor/views/legacy.py
lms/djangoapps/shoppingcart/tests/test_models.py
lms/djangoapps/verify_student/views.py
|
2014-05-09 15:29:32 -04:00 |
|
Carson Gee
|
cbf525f6cf
|
Fix infinite redirect loop on logout caused by django caching
|
2014-05-09 14:22:11 -04:00 |
|
Carson Gee
|
5452de20d8
|
Modified ssl certificate authentication to handle next redirection
Makes small changes in lms and cms both so that user's go to the
original page they intended to if they weren't already logged in
|
2014-05-09 14:22:10 -04:00 |
|