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

46471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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