David Ormsbee
f577a6d278
Add body hash to LTI outcome message.
...
This is necessary to properly implement the LTI outcome passback
spec. It was not included previously because it was causing problems
with Canvas, but Blackboard will not accept outcomes unless they are
properly signed.
The requests_oauthlib doesn't support the body hash spec out of the
box, so BodyHashClient needed to be made. Fortunately, it's a pretty
simple spec:
https://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/oauth-bodyhash.html
2015-09-01 15:29:00 -04:00
David Ormsbee
664544035a
Add explicit name for LTI provider outcome celery task.
2015-09-01 15:29:00 -04:00
David Ormsbee
37cdb89a5e
Allow LtiConsumer.instance_guid to be blank.
...
The instructions say that this should be left blank until the
initial launch, but Django Admin kicks that out because blanks
are not allowed at the model level.
2015-09-01 15:29:00 -04:00
Adam
06a20054b0
Merge pull request #9561 from edx/hotfix/2015-09-01a
...
Revert "OSPR-535 Partial Credit"
2015-09-01 15:15:34 -04:00
Syed Hassan Raza
f82662356f
Revert "OSPR-535 Partial Credit"
...
This reverts commit 7624c63362
2015-09-01 14:04:42 -04:00
David Ormsbee
02cc9ca86a
Merge pull request #9436 from edx/rc/2015-08-25
...
2015-08-25 Release
2015-08-26 14:11:12 -04:00
Fred Smith
4bc622745c
Merge pull request #9481 from edx/revert-9456-derf/add_setting_for_DISPLAY_ANALYTICS_ENROLLMENTS
...
Revert "DEVOPS-2620 - get setting from environment for DISPLAY_ANALYT…
2015-08-26 12:04:47 -04:00
David Ormsbee
74394bfe1b
Merge pull request #9480 from edx/ormsbee/pull_from_last_weeks_hotix
...
Fixes modal color
2015-08-26 11:44:55 -04:00
Fred Smith
16ac5801c9
Revert "DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENRO…"
2015-08-26 11:10:21 -04:00
Chris Rodriguez
96fc306337
Fixes modal color
2015-08-26 11:00:54 -04:00
Kevin Falcone
65377423c0
Merge pull request #9471 from edx/jibsheet/third-party-auth-settings
...
Allow configuring sensitive third_party_auth settings via lms.auth.json
2015-08-25 17:39:13 -04:00
Braden MacDonald
79a075328f
Allow configuring sensitive third_party_auth settings via lms.auth.json
2015-08-25 16:35:35 -04:00
Fred Smith
c1f1821963
Merge pull request #9456 from edx/derf/add_setting_for_DISPLAY_ANALYTICS_ENROLLMENTS
...
DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENRO…
2015-08-25 10:18:20 -04:00
Fred Smith
28368a0d71
DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENROLLMENTS
2015-08-25 09:29:17 -04:00
David Ormsbee
f83dcaa37d
Merge pull request #9448 from mitocw/fix/aq/email_ccx
...
Fixed URL and course title in CCX enrollment/unenrollment email
2015-08-24 12:17:35 -04:00
unknown
88a038aa1e
Fixed email parm function for CCX email
...
modified: lms/djangoapps/instructor/tests/test_enrollment.py
2015-08-24 20:34:11 +05:00
chrisndodge
cbd39318cf
Merge pull request #9437 from edx/cdodge/update-edx-proctoring
...
bump version of edx-proctoring
2015-08-24 09:31:43 -04:00
Chris Dodge
01425c0baf
bump version of edx-proctoring
2015-08-21 16:55:37 -04:00
Mark Hoeber
68414a1345
Merge pull request #9352 from edx/markhoeber-doc2219
...
Updated Certificate's config page help
2015-08-21 14:40:38 -04:00
Will Daly
a7e9789021
Merge pull request #9424 from edx/will/remove-unused-dependencies
...
Remove django-followit and django-keyedcache
2015-08-21 10:58:24 -07:00
Eric Fischer
9a7605497b
Merge pull request #9430 from edx/revert-9405-efischer/js-flakes
...
Revert "JS Flakiness in TeamDiscussionView"
2015-08-21 13:57:42 -04:00
Eric Fischer
f07c303628
Revert "JS Flakiness in TeamDiscussionView"
2015-08-21 13:56:44 -04:00
Will Daly
689efedeee
Merge pull request #9427 from edx/will/update-django-extensions
...
Upgrade django-extensions to 1.5.5
2015-08-21 10:32:25 -07:00
Will Daly
5d53c4a12a
Remove django-followit and django-keyedcache
2015-08-21 10:09:11 -07:00
Will Daly
9382db5a76
Merge pull request #9426 from edx/will/upgrade-django-ipware
...
Upgrade django-ipware to 1.1.0
2015-08-21 10:05:42 -07:00
Will Daly
0f590adde2
Upgrade django-extensions to 1.5.5
2015-08-21 09:16:56 -07:00
Sarina Canelake
1822d66120
Merge pull request #9425 from edx/sarina/20150821-translations-update
...
Update translations (autogenerated message)
2015-08-21 12:11:05 -04:00
Will Daly
3901c03d30
Upgrade django-ipware to 1.1.0
2015-08-21 09:00:42 -07:00
Sarina Canelake
8f3310c04b
Update translations (autogenerated message)
2015-08-21 10:49:56 -04:00
chrisndodge
e9638039de
Merge pull request #9420 from edx/cdodge/upgrade-edx-proctoring
...
Update edx-proctoring version to 0.7.1
2015-08-21 10:33:57 -04:00
Usman Khalid
9330ce6669
Merge pull request #9384 from edx/usman/update-ora
...
Update edx-ora2 to release-2015-08-19T17.17.
2015-08-21 19:30:10 +05:00
Eric Fischer
a1a9f3bdcb
Merge pull request #9405 from edx/efischer/js-flakes
...
JS Flakiness in TeamDiscussionView
2015-08-21 10:29:21 -04:00
Mushtaq Ali
d1e31afa4b
Merge pull request #9397 from edx/mushtaq/tnl-3095-fix-course-sidebar-padding
...
Fix course info sidebar padding
2015-08-21 19:20:31 +05:00
Mushtaq Ali
7c61e08dcd
Fix course info sidebar #3095
2015-08-21 18:39:38 +05:00
Eric Fischer
90b94a46bc
Potential fix for flaky TeamDiscussionView js tests
...
Adding waitsFor check in the beforeEach method. The condition I'm
waiting for here is shamelessly borrowed from bok-choy's
wait_for_ajax._is_ajax_finished() method:
https://github.com/edx/bok-choy/blob/master/bok_choy/page_object.py#L431
This seems to fix the errors I was able to generate with the
set_timeout, which themselves looked ver similar to the failing
master tests, so I *think* this will fix our woes, but since I was
never able to get the tests to fail exactly the same way I can't be sure.
Since there don't seem to be any drawbacks, this is going into mainline
as-is and we'll monitor for the sporadic failures over the next few
weeks.
2015-08-21 09:38:46 -04:00
Chris Dodge
02d47d62f4
Update edx-proctoring version to 0.7.1
2015-08-21 09:27:38 -04:00
chrisndodge
045a67aa30
Merge pull request #9416 from edx/cdodge/remove-external-id-from-report
...
alter columns in proctoring exam report
2015-08-21 07:29:00 -04:00
tasawernawaz
68da716d3d
Merge pull request #9399 from edx/tasawer/bugfix/ecom-1932-Upgrade-page-not-displaying-in-French
...
Fixing issue for french language
2015-08-21 11:24:09 +05:00
Will Daly
b0e12b5f3d
Merge pull request #9411 from edx/will/upgrade-django-babel-underscore
...
Upgrade django-babel-underscore to 0.3.0
2015-08-20 20:03:12 -07:00
Chris Dodge
110dbc048c
alter columns in proctoring exam report
2015-08-20 20:21:54 -04:00
Alison Hodges
1e374f4d4e
Merge pull request #9382 from edx/ahodges/comments_on_roles
...
Adds a comment to reduce confusion over remaining role name differences
2015-08-20 20:18:04 -04:00
Will Daly
a730cbf1f9
Merge pull request #9412 from edx/will/upgrade-django-cors-headers
...
Upgrade django-cors-headers to 1.1.0
2015-08-20 14:07:47 -07:00
Peter Fogg
16503d9853
Merge pull request #9410 from edx/peter-fogg/fix-tnl-3101-quality
...
Peter fogg/fix tnl 3101 quality
2015-08-20 16:16:08 -04:00
Alison Hodges
3547821b1a
Adds a comment to reduce confusion over remaining role name differences
2015-08-20 16:09:35 -04:00
Will Daly
f4b0d55a2d
Upgrade django-cors-headers to 1.1.0
2015-08-20 12:43:50 -07:00
Will Daly
cf259b42e7
Upgrade django-babel-underscore to 0.3.0
2015-08-20 12:37:53 -07:00
Ned Batchelder
1d23c55727
Merge pull request #9407 from edx/ned/getattr-lint-checker
...
Use latest edx-lint. Adds getattr/setattr string literal checking.
2015-08-20 15:32:03 -04:00
Peter Fogg
5c855bdc7b
Fix quality violation.
2015-08-20 15:15:14 -04:00
Adam
b0247f1735
Merge pull request #9408 from edx/hotfix/2015-08-20
...
Fix Forum Update Issue #TNL-3101
2015-08-20 14:59:08 -04:00
chrisndodge
3294b3165d
Merge pull request #9386 from edx/cdodge/dont-return-none-for-non-credit-course
...
Cdodge/dont return none for non credit course
2015-08-20 14:35:13 -04:00
