Calen Pennington
708d758d65
Merge pull request #3808 from cpennington/ok-course-mode-errors
...
Call other CourseModeView methods using serialized course_id
2014-05-21 16:21:27 -04:00
Calen Pennington
1f9c7b2ed4
Merge pull request #3809 from cpennington/ok-dead-code
...
Remove dead code
2014-05-21 16:21:17 -04:00
Calen Pennington
1c60da02df
fixup! Fix management commands
2014-05-21 16:20:46 -04:00
Julia Hansbrough
5752312bbb
Merge pull request #2776 from aboudreault/embargo-restrict-additions
...
Extended Embargo feature to support site access restriction and ip network
2014-05-21 15:24:07 -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
Calen Pennington
4af2249a9d
Remove dead code
2014-05-21 14:28:04 -04:00
Calen Pennington
3d90c83199
Call other CourseModeView methods using serialized course_id
2014-05-21 14:27:01 -04:00
Don Mitchell
9af40ae2cc
Migration for role_coursenum deprecated roles
2014-05-21 12:03:09 -04:00
John Jarvis
d25136893c
Merge pull request #3712 from edx/jarv/cert-mode
...
returning enrollment mode for both active and inactive users
2014-05-21 10:07:17 -04:00
David Baumgold
6e0e13003f
Merge pull request #3744 from lduarte1991/lduarte-harvardx
...
Reconnecting Token Generator for Annotation Tool [Fix]
2014-05-20 15:34:34 -04:00
David Baumgold
75ff35e208
proxy raw further along
2014-05-20 14:01:55 -04:00
David Baumgold
8080261aa7
generate raw URLs that are not rewritten by static_replace
2014-05-20 13:27:47 -04:00
Sarina Canelake
9dc48c00b4
Merge pull request #3779 from edx/sarina/fix-grades-management-commands
...
Sarina/fix grades management commands
2014-05-20 11:35:54 -04:00
Don Mitchell
e2332d1922
Fix old dashboard list cohorts
2014-05-20 10:37:03 -04:00
Alan Boudreault
877ec3f963
some minor improvements to embargo
2014-05-20 10:03:06 -04:00
Jason Bau
411dc09af7
Autoactivate inactive users on external_auth login
...
Conditional on existing flag BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH
2014-05-19 13:35:35 -07:00
Sarina Canelake
189f53bc71
Fix grades management commands
2014-05-19 16:11:45 -04:00
Alan Boudreault
db161543d8
Modified EMBARGO_SITE to SITE_EMBARGOED, improved logs
2014-05-19 15:53:45 -04:00
Alan Boudreault
25948e3694
Fix minor typo in a test
2014-05-19 15:12:02 -04:00
Alan Boudreault
ba6e61b907
Extended Embargo feature to support site access restriction and ip network
2014-05-19 15:12:02 -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
lduarte1991
e911d57911
Revert "Revert pull request #3466 "
...
This reverts commit 59e3cae4c9
2014-05-15 15:23:28 -04:00
David Baumgold
59e3cae4c9
Revert pull request #3466
2014-05-14 13:55:26 -04:00
Calen Pennington
6ca0a7a1d6
Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master
2014-05-14 10:00:25 -04:00
John Jarvis
71c447768d
returning enrollment mode for both active and inactive users
2014-05-13 17:47:52 -04:00
Julia Hansbrough
6c46fb98ca
Compare stringified course_ids to regexes for courses allowed to execute unsafe code
2014-05-13 21:34:15 +00:00
Calen Pennington
16faafded9
Fix ssl redirection test
2014-05-13 14:13:45 -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
Calen Pennington
37b1a2f738
Remove calls to loc_mapper
2014-05-12 16:34:53 -04:00
Calen Pennington
a4df0e1515
Fix failing tests
2014-05-12 14:45:38 -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
Nimisha Asthagiri
e9052dc2fb
Fix delete cache so it also deletes location with run = None.
2014-05-09 14:17:32 -04:00
Calen Pennington
7bb6d6f281
Fix cohort.course_id naming
2014-05-09 09:23:51 -04:00
Calen Pennington
d466132a1f
Merge remote-tracking branches 'edx/opaque-keys-base-keys', 'edx/opaque-keys-cms', 'edx/opaque-keys-common-djangoapps', 'edx/opaque-keys-common-lib-xmodule', 'edx/opaque-keys-common-misc', 'edx/opaque-keys-django-fields', 'edx/opaque-keys-embargo-tests', 'edx/opaque-keys-library', 'edx/opaque-keys-lms-courseware', 'edx/opaque-keys-lms-djangoapps', 'edx/opaque-keys-lms-templates', 'edx/opaque-keys-mongoengine-fields', 'edx/opaque-keys-requirements' and 'edx/opaque-keys-roles-table' into opaque-keys
2014-05-08 20:32:28 -04:00
Feanil Patel
1a9b505572
Merge pull request #3622 from edx/feanil/fix_enrollment_bug
...
Field name is 'username' not 'user'
2014-05-08 09:44:12 -04:00
Calen Pennington
79cf4c7239
Make course ids and usage ids opaque to LMS and Studio [partial commit]
...
This commit migrates roles from named groups to a relational table.
These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).
For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.
Co-Author: Andy Armstrong <andya@edx.org >
Co-Author: Christina Roberts <christina@edx.org >
Co-Author: David Baumgold <db@edx.org >
Co-Author: Diana Huang <dkh@edx.org >
Co-Author: Don Mitchell <dmitchell@edx.org >
Co-Author: Julia Hansbrough <julia@edx.org >
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org >
Co-Author: Sarina Canelake <sarina@edx.org >
[LMS-2370]
2014-05-08 07:14:27 -04:00
Calen Pennington
e2bfcf2a36
Make course ids and usage ids opaque to LMS and Studio [partial commit]
...
This commit updates common/djangoapps.
These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).
For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.
Co-Author: Andy Armstrong <andya@edx.org >
Co-Author: Christina Roberts <christina@edx.org >
Co-Author: David Baumgold <db@edx.org >
Co-Author: Diana Huang <dkh@edx.org >
Co-Author: Don Mitchell <dmitchell@edx.org >
Co-Author: Julia Hansbrough <julia@edx.org >
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org >
Co-Author: Sarina Canelake <sarina@edx.org >
[LMS-2370]
2014-05-07 12:54:49 -04:00
