Commit Graph

14265 Commits

Author SHA1 Message Date
Jim Abramson
a7ebe17dfb Merge pull request #8414 from edx/jsa/fix-deactivate-enrollment
Jsa/fix deactivate enrollment
2015-06-08 13:09:54 -04:00
Sarina Canelake
c9796b83a9 Merge pull request #8403 from edx/sarina/remove-redefine-django14-cors
Use Django 1.4 @ensure_csrf_cookie method PLAT-664
2015-06-08 11:44:25 -04:00
jsa
f4b2c197db don’t trigger a refund request in otto, if otto requested unenrollment.
XCOM-396
2015-06-08 11:07:16 -04:00
Diana Huang
a224d06a89 Allow multiple external_link tabs for one course. 2015-06-08 10:10:45 -04:00
Chris Dodge
e47c97b465 make courses.html also honor the ENABLE_COURSE_DISCOVERY feature flag 2015-06-08 07:46:55 -04:00
Xavier Antoviaque
b32629d62f Default to filestorage when S3 isn't configured (aws.py)
Also moves the default icons to the badges subfolder to avoid storage conflicts.
2015-06-08 11:30:16 +02:00
Zia Fazal
20800ea561 refactored code to make certificate PDF generation optional
improved coverage

refactoring based on feedback

fixed quality violations

changes based on feedback
2015-06-08 12:42:07 +05:00
asadiqbal
6f0606a00b asadiqbal08/SOL-961: Student-generated certificate flow shows "download" certificate button 2015-06-07 20:44:42 -04:00
Matt Drayer
3e52b8fad1 mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns 2015-06-06 23:15:17 -04:00
Kelketek
c8b8717944 Merge pull request #8399 from open-craft/fix-badging-name
Fix self-paced badge naming.
2015-06-06 09:31:02 -05:00
Jonathan Piacenti
eba951fe69 Fix self-paced badge naming. 2015-06-06 13:44:35 +00:00
Sarina Canelake
e53b9c83d9 Use Django 1.4 @ensure_csrf_cookie method PLAT-664 2015-06-06 08:48:36 -04:00
Greg Price
37ebbc45e3 Add thread voting to discussion API 2015-06-05 16:12:54 -04:00
Greg Price
6c2df96c5f Merge pull request #8372 from edx/gprice/discussion-api-follow-thread
Add ability to follow a thread in discussion API
2015-06-05 14:12:29 -04:00
Greg Price
9ff8749716 Add ability to follow a thread in discussion API 2015-06-05 13:20:57 -04:00
Nimisha Asthagiri
d240785b17 MA-722 Render xBlock API Support 2015-06-05 11:18:48 -04:00
Matt Drayer
dc5f650338 Merge pull request #8371 from edx/mattdrayer/SOL-953
mattdrayer/SOL-953: Remove Mako UNDEFINED overrides
2015-06-04 21:10:52 -04:00
srpearce
d4b99561d1 Merge pull request #8326 from edx/sylvia/docs/SOL_ECOM
Sylvia/docs/sol ecom
2015-06-04 17:35:03 -04:00
Matt Drayer
803a73fdad mattdrayer/SOL-953: Remove Mako UNDEFINED overrides 2015-06-04 16:56:24 -04:00
Tim Krones
f711a32e3d TNL-1652: Allow instructors to obtain CSV file listing students who may
enroll in a course but have not signed up yet.
2015-06-04 20:50:04 +02:00
Greg Price
298ba727bd Merge pull request #8311 from edx/gprice/discussion-api-edit-thread
Add thread editing to discussion API
2015-06-04 13:51:08 -04:00
Peter Fogg
a9187e81c5 Merge pull request #8339 from edx/peter-fogg/teams-header
Implement teams header component
2015-06-04 12:45:09 -04:00
Xiaolu Xiong
4f45839211 Merge pull request #8325 from beardeer/master
Merge pull request #8325 from beardeer/edx-platform
2015-06-04 11:45:15 -04:00
Daniel Friedman
8dfb774565 Merge pull request #8336 from edx/dan-f/expose-edxnotes-interface-setting
Add support for public/internal edx-notes-api endpoints
2015-06-04 11:32:33 -04:00
Adam
5952906e72 Merge pull request #8349 from edx/adam/fix-capa-devstack
disable contracts that were breaking capa problems on devstack (TNL-2…
2015-06-04 11:22:17 -04:00
Peter Fogg
ebafdb1d03 TNL-1900 Implement teams header component 2015-06-04 11:01:18 -04:00
Greg Price
73d891313a Add thread editing to discussion API
This is done via PATCH on a thread instance endpoint.
2015-06-04 10:56:43 -04:00
Kevin Falcone
8f016414f9 Merge pull request #8348 from edx/release-2015-06-02-conflict
Release 2015 06 02 conflict
2015-06-04 09:20:12 -04:00
Xiaolu Xiong
aa1bca6b41 Change the misleading doc string (str doesn't has attr 'name' ) 2015-06-04 08:30:38 -04:00
Mushtaq Ali
c575c89853 Bug - Unicode character in tab number shouldn't return 500 #TNL-2055
Adding user to AUTHORS file
2015-06-04 12:33:06 +05:00
Chris Dodge
ceb0fc79d0 update tests to match text changes 2015-06-03 19:00:46 -04:00
Clinton Blackburn
dbfd77e661 Disabled CSRF Validation for checkout cancel page
CyberSource will POST to this view if the user cancels payment. CSRF validation cannot be enabled when this happens.

ECOM-1689
2015-06-03 17:14:21 -04:00
chrisndodge
bfe7527686 Merge pull request #8292 from edx/muhhshoaib/SOL-916-invalidate-revalidate-registration-codes
SOL 916 invalidate revalidate registration codes
2015-06-03 16:24:38 -04:00
Adam Palay
6012a34765 disable contracts that were breaking capa problems on devstack (TNL-2343) 2015-06-03 16:17:30 -04:00
Kevin Falcone
fecd3d55a7 Merge branch 'release' 2015-06-03 16:12:32 -04:00
Phil McGachey
ee70d45976 [LTI Provider] Basic LTI authentication
This change cleans up the work in progress request at https://github.com/edx/edx-platform/pull/8176

This is an initial authentication implementation that allows LTI users to log in transparently to
edX. The behavior is driven by pilot users at Harvard; this was the most requested feature.

The patch creates a new database model that maps users' LTI identifiers to newly-created edX
accounts. If an LTI launch comes in with a user_id field that is not in the database, a new edX
account is created with a random user name and password. This account is then stored in the database,
so that it is permanently associated with the LTI user ID.

This patch takes a simplistic approach to session management. If a user is logged in with a
different account when they perform an LTI launch, they will be logged out and then re-logged
in using their LTI account.

In order to keep the patch simple, I have split out some refactoring that needs to be done into
a separate branch that I'll post once this has been merged. Since we no longer redirect to the
login page, we don't need to maintain two separate LTI endpoints (one for the LTI launch and
one for authenticated users), or deal with the session management that requires. There are
also multiple fetches of the LtiConsumer object (one in the view, one in the signature
validation) that the later patch will consolidate into one.
2015-06-03 15:41:07 -04:00
Sarina Canelake
f78be26a5e Merge pull request #8341 from mcgachey/mcgachey-lti-consumer-bugfix
[LTI Provider] Bugfix in LtiConsumer handling code
2015-06-03 15:36:40 -04:00
Ben McMorran
f01b2f4311 Merge pull request #8243 from edx/benmcmorran/team-api-a
TNL-1897: Implement Course Team API, Part A
2015-06-03 14:59:36 -04:00
Muhammad Shoaib
4dff8ecf09 SOL-916 Add ability to query, enable, disable, unredeem Enrollment Codes 2015-06-03 14:46:01 -04:00
Phil McGachey
71ee9d3bb8 [LTI Provider] Bugfix in LtiConsumer handling code
The line below was left in during the refactoring shuffle from PR #8205, and causes
an issue in a corner case where an LTI launch provides an instance GUID where there
wasn't one already set for the consumer. This change fixes the bug, and adds a test
to prevent it from recurring.
2015-06-03 14:34:36 -04:00
Ben McMorran
9d336c33eb TNL-1897 Implement Course Team API 2015-06-03 18:04:17 +00:00
Christopher Lee
103ae47759 Merge pull request #8199 from edx/clee/get_topic_threads
MA-642 Add topic_id query to discussion/thread api
2015-06-03 12:29:05 -04:00
Daniel Friedman
58c3c0c2d7 Expose EDXNOTES_PUBLIC_API/EDXNOTES_INTERNAL_API 2015-06-03 12:09:45 -04:00
Ali Mohammad
94e98e9cae Merge pull request #8257 from edx/alawibaba/plat589
Make clean_history.py use the StudentHistoryModule django model.
2015-06-03 11:45:33 -04:00
christopher lee
f552eca7d6 MA-642 Add topic_id query to discussion/thread api
Also added thread_list_url field.
2015-06-03 11:29:48 -04:00
Diana Huang
6534503c93 Add teams tab
TNL-1939
2015-06-03 09:10:44 -04:00
David Ormsbee
f03a80c2aa Merge pull request #8205 from mcgachey/mcgachey-lti-grade-passback
[LTI Provider] Use the LTI Outcome Service to pass back scores
2015-06-02 17:41:41 -04:00
Diana Huang
15291aa43b Merge pull request #8015 from edx/andya/add-tab-extensions
Add extensible course view types for edX platform
2015-06-02 17:08:45 -04:00
Phil McGachey
0fe413744f [LTI Provider] Use LTI Outcome Service to pass back scores
This change allows the LTI provider to pass grades back to the campus LMS platform using the
LTI outcome service. For full details of the outcome service, see:
    http://www.imsglobal.org/LTI/v1p1/ltiIMGv1p1.html

In brief, the LTI 1.1 spec defines an outcome service that can be offered by an LTI consumer.
The consumer determines whether a score should be returned (in Canvas, this means that the LTI
tool is used in an assignment, and the launch was performed by a student). If so, it sends
two additional parameters along with the LTI launch:

lis_outcome_service_url: the endpoint for the outcome service on the consumer;
lis_result_sourcedid: a unique identifier for the row in the gradebook (i.e. the tool/student/assignment combination).

The LTI Provider launch view detects the presence of these optional fields, and creates database
records for the specific Outcome Service and for the graded LTI launch. Later, when a score on
edX changes (identified using the signal mechanism from previous LTI Provider pull requests),
a Celery task is launched to pass the score back to the LTI consumer.
2015-06-02 16:55:50 -04:00
chrisndodge
11fef20101 Merge pull request #8165 from edx/muhhshoaib/SOL-236/make-manual-enrollments
SOL-236 Manual Enrollments
2015-06-02 16:31:32 -04:00