Commit Graph

683 Commits

Author SHA1 Message Date
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
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
Feanil Patel
f14146a5fa Field name is 'username' not 'user' 2014-05-06 15:39:00 -04:00
Ned Batchelder
db8c4de202 Remove press-page machinery and assets 2014-05-06 13:29:17 -04:00
Adam
0b8cc25be3 Merge pull request #3582 from edx/adam/some-cleaning
Adam/some cleaning
2014-05-05 15:14:59 -04:00
Waqas
a07da78a0f Add the "VERIFIED_CERTIFICATES" toggle on dashboard 2014-05-05 20:10:26 +05:00
Joe Blaylock
ae8847cd6e Certificates: URL endpoint for cert gen
* API endpoint for certificate generation, an authenticated  post with course
  id requests that grading be carried out and a cert generated for
  request.user in that course, using the usual grading and certificate
  machinery (ie, it does not imply whitelisting, though whitelists and
  blacklists will be respected)
  - Logs each request as it comes in
  - Calls xq.add_cert() and consequently, does grading synchronously on
    this app host and then queues request for certificate agent.
  - example usage:
    ```
    curl --data "student_id=9999&course_id=Stanford/2013/Some_Class" http://127.0.0.1:8000/request_certificate
    ```

* Studio advanced setting added, "certificates_show_before_end", which
  determines whether a course should permit certificates to be downloadable
  by students before the coures's end date has passed.
  - Modifications to dashboard view and templates to allow display of
    certificate download links before course has ended.
    (XXX: may declare failing students as failing before the course has ended.)
  - To test, turn the setting on in a course which hasn't ended yet, and
    force certificate generation for a student, then check their
    dashboard.
2014-05-02 14:34:21 -07:00
Adam Palay
ced3f67ab1 fix authentication check in auth 2014-05-02 15:28:59 -04:00
Gabe Mulley
36269bd5a8 Integrate event-tracking in to the LMS
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
2014-05-01 14:04:35 -04:00
John Cox
ce0b640712 Add third-party auth implementation and tests 2014-04-25 12:11:20 -07:00
lduarte1991
5ae1ca9685 Reconnecting Token Generator for Annotation Tool 2014-04-24 16:14:05 -04:00
John Jarvis
27256bbbb4 Merge pull request #3396 from edx/jarv/change_enrollment_cmd
adding django admin command to change enrollment
2014-04-23 09:44:46 -04:00
Sef Kloninger
f3842dcc01 Merge pull request #2834 from edx/sef/theme-embargo-master
make embargo template theme-able
2014-04-22 10:04:08 -07:00
John Jarvis
67128c5ff8 grammar 2014-04-18 10:13:23 -04:00
John Jarvis
b67987cd43 fixing example 2014-04-18 10:12:47 -04:00
John Jarvis
27104c93ea adding django admin command to change enrollment 2014-04-18 10:07:18 -04:00
Waqas Khalid
43377af85a fix change name view by replacing the request.user simple lazy object with request.user.id
LMS-2479
2014-04-11 18:36:49 +05:00
Waheed Ahmed
c0b50c7f62 Change user.is_authenticated to user.is_authenticated() in roles.py.
LMS-2442
2014-04-07 12:20:20 +05:00
chrisndodge
c407e89889 Merge pull request #2781 from edx/cdodge/password-history-enforcements
Add some optional policies around password resets, such as password reus...
2014-04-04 16:14:43 -04:00
Abdallah
bb9f720fa6 unicode fixes 2014-04-02 16:18:56 +03:00
Calen Pennington
9bcbba6750 Emit datadog events for all course enrollments, not just those outside of verified courses 2014-04-01 13:02:29 -04:00
Chris Dodge
ff8a0c6891 password history: just limit the result set range to simplify iteration logic 2014-03-31 10:30:58 -04:00