Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,484 Commits 1 Branch 0 Tags
eb35a4105d04ea0506d4ac55ecc8fe675882fbf7
Commit Graph

46484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stu Young
eb35a4105d Merge pull request #18369 from edx/testeng/bokchoy_auto_cache_update_75b254a0cbb6983193faa7a040934a2d45edbb78 
Bokchoy db cache update
 2018-06-13 12:12:15 -04:00
edx-cache-uploader-bot
237d3114e9 Updating migrations 2018-06-13 09:30:52 -04:00
David Ormsbee
386699f7aa Merge pull request #18350 from edx/ormsbee/discussion_map_storage_change 
Fix forums ID mapping
 2018-06-13 09:06:44 -04:00
Waheed Ahmed
b62cf12db2 Merge pull request #18362 from edx/waheed/LEARNER-5527-throttle-course-list-api 
Rate limit course list API.
 2018-06-13 17:55:49 +05:00
Zia Fazal
74c96374e0 Merge pull request #18368 from edx/ziafazal/WL-1616 
WL-1616: Use custom theming.get_current_site method instead of Site.objects.get_current
 2018-06-13 17:41:43 +05:00
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
Waheed Ahmed
780c1d982d Rate limit course list API. 
This endpoint is likely being inefficient with how it's querying various parts
of the code and can take courseware down, it needs to be rate limited until
optimized.

LEARNER-5527
 2018-06-13 16:59:32 +05:00
Zia Fazal
70b35d834f Use custom get_current_site method 2018-06-13 15:17:51 +05:00
Christopher Lee
edb7dd6f60 Merge pull request #18360 from edx/clee/LEARNER-5166-clean-waffle 
Finalize rate limit for enrollment API
 2018-06-12 18:11:59 -04:00
Christopher Lee
f6e0c70f41 Finalize rate limit for enrollment API 
LEARNER-5166
 2018-06-12 15:44:33 -04:00
Feanil Patel
285ae08d42 Merge pull request #18318 from edx/tasawer/learner-4819/update_facebook_integration 
Update Facebook integration
 2018-06-12 13:07:39 -04:00
Feanil Patel
d9c0d1cb7f Don't upgrade py2neo to 4.0.0 
It seems to have broken tests.
 2018-06-12 12:28:55 -04:00
Albert (AJ) St. Aubin
f09e79b7fa Merge pull request #18359 from edx/revert-18355-waheed/LEARNER-5527-throttle-course-list-api 
Revert "Rate limit course list API."
 2018-06-12 12:09:49 -04:00
Albert (AJ) St. Aubin
e3c84bc8de Revert "Rate limit course list API." 2018-06-12 12:06:51 -04:00
Feanil Patel
7290cad5b7 Run make upgrade after unpinning the social auth packages. 2018-06-12 11:27:44 -04:00
Tasawer Nawaz
79e429d5cd Update facebook integration 
LEARNER-4819
 2018-06-12 11:19:39 -04:00
Brian Mesick
e9df135251 Merge pull request #18332 from edx/bmedx/remove_model_options_monkey_patch 
Remove now-unused django_db_models_options.py
 2018-06-12 09:43:35 -04:00
Waheed Ahmed
95fe092e6b Merge pull request #18355 from edx/waheed/LEARNER-5527-throttle-course-list-api 
Rate limit course list API.
 2018-06-12 16:59:27 +05:00
edX Transifex Bot
61b777f6f6 Update translations 2018-06-12 06:57:22 -04:00
Waheed Ahmed
803a6c742c Rate limit course list API. 
This endpoint is likely being inefficient with how it's querying various parts of the code
and can take courseware down, it needs to be rate limited until optimized.

LEARNER-5527
 2018-06-12 14:58:12 +05:00
bmedx
50c46fd9d9 Remove now-unused django_db_models_options.py 
Code that actually used it was removed in this commit:
26b4e30833 (diff-8d36006736e42cad141490ae17f58a89)
 2018-06-11 13:43:09 -04:00
Troy Sankey
6600e8b7e6 Merge pull request #18348 from edx/pwnage101/edxnotes-retirement-correct-url-and-user 
[edxnotes] use the correct url and update the API params
 2018-06-11 12:49:33 -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
Troy Sankey
3172000aba [edxnotes] use the correct url and update the API params 
This is really two separate things:

1. Fix the notes retirement endpoint to generate the correct notes API
url "/api/v1/annotations/" rather than the nonexistent "/api/v1/".

2. Update the API params to use "user" rather than "user_id".  This
depends on another PR in edx/edx-notes-api to make the corresponding
change on the API side.  This is required because "user" is the
hard-coded key that the permissions class uses to check the JWT token
user.
 2018-06-08 15:36:47 -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