Commit Graph

46462 Commits

Author SHA1 Message Date
David Ormsbee
72ed987dff Enable model-caching of discussions ID mapping.
Doing modulestore lookups is expensive, so commit 695b036 created a
course_publish listener that would materialize the discussion ID to
XBlock usage key mapping into the CourseDiscussionSettings model.

However, the signal wasn't hooked up to the Studio process, so that
async task was never called. When hooking it up, I also discovered that
bok choy tests related to partitioning were failing because of a race
condition where multiple processes are overwriting the discussion
settings. To make sure this wasn't an issue, I moved the mapping to
its own table.

This is part of ARCH-111, and the overall Course Structures API
deprecation.
2018-06-13 08:21:08 -04:00
Uzair Rasheed
a2d16de840 Merge pull request #18307 from edx/LEARNER-4351/extract-course-run-with-highest-grade
Extract course run with highest grades.
2018-06-11 12:49:58 +05:00
edX Transifex Bot
6e59025501 Update translations 2018-06-10 17:13:53 -04:00
Robert Raposa
50f36603f5 Merge pull request #18346 from edx/clee/trottle3
Change waffle flag for enrollment throttle to switch
2018-06-08 17:11:33 -04:00
Stu Young
5fadf8cca0 Merge pull request #18278 from edx/estute/TE-2573
add script to detect dead code
2018-06-08 15:32:29 -04:00
christopher lee
443aa7977c Change waffle flag for enrollment throttle to switch 2018-06-08 15:07:26 -04:00
Stuart Young
bfd2f1c8f8 add script to detect dead code 2018-06-08 14:53:17 -04:00
J Eskew
0335b100e3 Merge pull request #18347 from edx/jeskew/bump_poll_xblock_version
Bump poll xblock version to 1.5.1 - removes warning.
2018-06-08 13:10:06 -05:00
John Eskew
6a268e0d76 Bump poll xblock version to 1.5.1 - removes warning. 2018-06-08 11:00:45 -05:00
George Babey
49e80dcdcd Merge pull request #18334 from edx/asadiqbal08/ENT-1029-verioson-bump
[ENT-1029] edx-enterprise version bump 0.69.1
2018-06-08 10:43:38 -04:00
asadiqbal
6734dcab33 version bump 0.69.1 2018-06-08 10:10:51 -04:00
adeel khan
0a5d11c757 Merge pull request #18319 from edx/adeel/learner_3810_ratelimit_form_validation_calls
Rate limiting registration form validation end point.
2018-06-08 17:38:58 +05:00
Adeel Khan
7768dd1de3 Ratelimiting registration form validation end point.
This patch would ratelimit registration form validation
endpoint for anonymous user based on his/her ip.

LEARNER-3810
2018-06-08 14:45:15 +05:00
Calen Pennington
947d82737e Merge pull request #18341 from edx/revert-18290-switch-container-factory-to-webpack
Revert "Switch container factory to webpack"
2018-06-07 13:48:25 -04:00
Calen Pennington
18d93b00ba Revert "Switch container factory to webpack" 2018-06-07 13:46:47 -04:00
Michael Youngstrom
6d8aebe05b Merge pull request #18328 from edx/youngstrom/use-require-https-arg
Add require_https to all is_safe_url calls
2018-06-07 12:18:27 -04:00
Michael Youngstrom
d6616c9036 Add require_https to all is_safe_url calls 2018-06-07 10:10:28 -04:00
Brian Mesick
ca0ec641db Merge pull request #18329 from edx/bmedx/is_safe_url_allowed_hosts
Change usages of is_safe_url to use new allowed_hosts instead of host
2018-06-07 10:06:40 -04:00
Qubad786
9f820c9e71 Fix tests 2018-06-07 15:57:45 +05:00
Qubad786
981be5db57 Fix migrations of external video component transcripts and beautify/refatoring 2018-06-07 15:57:45 +05:00
irfanuddinahmad
2146d7219c fixed migrate command's aws settings issues 2018-06-07 15:57:45 +05:00
Ahsan Ul Haq
c02283b472 Merge pull request #18281 from edx/ahsan/LEARNER-5326-csrf-exempt-on-donations
Exempt csrf on donate
2018-06-07 15:02:09 +05:00
sanfordstudent
5998214925 Merge pull request #18330 from edx/revert-15940-upstream-call-xblock-handler-with-oauth
Revert "OAuth2 API to call XBlock handlers"
2018-06-06 17:09:24 -04:00
sanfordstudent
3c0e2f36e7 Revert "OAuth2 API to call XBlock handlers" 2018-06-06 16:09:31 -04:00
Tyler Hallada
01191e34a5 Merge pull request #18324 from edx/thallada/PLAT-1746-format-lazy
PLAT-1746: Use Django 1.11 format_lazy instead of allow_lazy
2018-06-06 15:09:43 -04:00
Calen Pennington
f7038db3a3 Merge pull request #18290 from cpennington/switch-container-factory-to-webpack
Switch container factory to webpack
2018-06-06 14:42:57 -04:00
bmedx
29ad5fce6f Change usages of is_safe_url to use new allowed_hosts instead of host
"host" parameter is deprecated and throws a warning
2018-06-06 14:41:52 -04:00
Brian Mesick
3eb5e432e5 Merge pull request #18322 from edx/bmedx/remove_sessionauthenticationmiddleware
Remove SessionAuthenticationMiddleware from INSTALLED_APPS
2018-06-06 14:09:20 -04:00
Calen Pennington
ec8d4cea29 Fix errant javascript test 2018-06-06 12:52:12 -04:00
Calen Pennington
b9a72a4dc9 Remove hard-coded codemirror script tags from LMS XBlock pages 2018-06-06 12:52:12 -04:00
Calen Pennington
5487230b54 Load CodeMirror from an external 2018-06-06 12:52:12 -04:00
Calen Pennington
85a375a38f Add webpack assets directly to xmodule fragments, rather than injecting them in fragment contents 2018-06-06 12:52:12 -04:00
Calen Pennington
0abe75a7c6 Re-apply the changes to convert XBlocks to Webpack
Reapplies edx/edx-platform#17509

This reverts commit 0f7e2373d0.
2018-06-06 12:52:12 -04:00
edX Transifex Bot
69341f806c Update translations 2018-06-06 11:55:35 -04:00
Eric Fischer
a09494bc3c Merge pull request #18323 from edx/efischer/ora_update
Upgrade edx-ora2 to 2.1.17
2018-06-06 11:37:45 -04:00
Brian Mesick
832f6a7157 Merge pull request #18320 from edx/bmedx/remove_111_test_marks
Remove unused pytest markers for Django 1.11 upgrade
2018-06-06 11:15:26 -04:00
Michael Youngstrom
f4dc2ca000 Merge pull request #18314 from edx/youngstrom/remove_django_18_shim
Remove temp django upgrade logic
2018-06-06 11:09:17 -04:00
Tyler Hallada
8b0de593a1 Use Django 1.11 format_lazy instead of allow_lazy 2018-06-06 11:07:35 -04:00
Eric Fischer
47690173e3 Upgrade edx-ora2 to 2.1.17 2018-06-06 11:07:02 -04:00
bmedx
2ca632aec9 Remove SessionAuthenticationMiddleware from INSTALLED_APPS
It is always on now, and this is just a deprecated stub which will be
removed in Django 2.0.
2018-06-06 10:47:57 -04:00
Tyler Hallada
1f42d1b384 Merge pull request #18316 from edx/thallada/PLAT-1524-on-delete
PLAT-1524: Add on_delete kwarg to ForeignKey & OneToOneFields
2018-06-06 10:38:15 -04:00
Michael Youngstrom
26b4e30833 Remove django 1.8 shim 2018-06-06 10:34:56 -04:00
bmedx
c125ff6a57 Remove unused pytest markers for Django 1.11 upgrade 2018-06-06 09:58:38 -04:00
Bill DeRusha
890f7c5a5e Merge pull request #18311 from edx/bderusha/pw-rollout-copy-change
Update copy for password compliance message to be more clear.
2018-06-06 09:12:01 -04:00
Waheed Ahmed
23d1beedf7 Merge pull request #18285 from edx/waheed/LEARNER-4520-fix-pdf-certificates
Fix PDF cert gereration/regeneration and URLs.
2018-06-06 15:36:52 +05:00
Tyler Hallada
1540f9ec72 Add on_delete kwarg to ForeignKey & OneToOneFields
Django 2.0 will make this field required for `ForeignKey` and `OneToOneFields`.
In previous versions the option defaulted to `models.CASCADE` when not
specified. This change should make the deprecation warnings in the current
Django version go away.

The migrations where also modified, but the changes should not cause a change in
the database schema since `models.CASCADE` was already the old default.
2018-06-05 17:05:12 -04:00
Bill DeRusha
40b46d04c1 Update copy for password compliance message to be more clear. 2018-06-05 16:26:57 -04:00
Brian Beggs
4d75ed3381 Merge pull request #15940 from open-craft/upstream-call-xblock-handler-with-oauth
OAuth2 API to call XBlock handlers
2018-06-05 16:13:09 -04:00
Eric Fischer
bea86a673a Merge pull request #18313 from edx/hack_xix/PLAT-1397
s/django.core.urlresolvers/django.urls/g
2018-06-05 15:32:31 -04:00
Chandrakant Gopalan
a3df96bf1c OAuth2 API to call XBlock handlers 2018-06-05 15:12:31 -04:00