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

52981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AsadAzam
cb8f95c838 Merge pull request #22906 from edx/asad/prod-1127 
Fixed bytes in filename
 2020-01-23 12:22:20 +05:00
M Zulqarnain
ec2ca0bd0e Merge pull request #22902 from edx/zulqarnain/BOM-1156 
BOM-1156 : Bridgekeeper Fork Update
 2020-01-23 12:21:31 +05:00
edX cache uploader bot
42d69d0e70 Updating Bokchoy testing database cache (#22917) 2020-01-22 11:51:17 -05:00
Abdul Hannan
c3b5eb900a Merge pull request #22746 from edx/rename_start_in_schedule_3.5/5 
Remove null, blank from start field in Schedules. Step 4/5
 2020-01-22 18:54:48 +05:00
hunytalk
73aae081c3 Remove null, blank from start field in Schedules 2020-01-22 18:10:33 +05:00
Ahtisham Shahid
df25e91648 Merge pull request #22900 from edx/ahtisham/PROD-726 
Updated border color on login page fields Ally
 2020-01-22 15:46:37 +05:00
adeelehsan
f711465862 Merge pull request #22885 from edx/aehsan/fetch_lms_root_url_from_configuration 
fetch lms root url using configuration helper
 2020-01-22 15:40:04 +05:00
Zulqarnain
c6e06b5327 Django 1.1 support of bridgekeeper 2020-01-22 14:25:43 +05:00
M Zulqarnain
4eea92640c Merge pull request #22907 from edx/zulqarnain/BOM-1132 
BOM-1132 : Change deprecated storage methods signatures
 2020-01-22 14:04:08 +05:00
Aarif
fd8c8f09e1 Merge pull request #22891 from edx/BOM-1148 
Added the app_name to URL inclusions to remove warnings - BOM-1148
 2020-01-22 12:50:36 +05:00
Ned Batchelder
2aeec06589 Merge pull request #22547 from edx/nedbat/api-docs-from-lib 
Use API doc tooling from its own library
 2020-01-21 11:39:21 -05:00
Ned Batchelder
079d17b899 Remove code that is now in edx_api_doc_tools 2020-01-21 11:15:41 -05:00
Ned Batchelder
7d7d6a655a make upgrade 2020-01-21 11:09:21 -05:00
Ned Batchelder
2b06a941b4 Use edx/api-doc-tools for api doc support 2020-01-21 11:09:21 -05:00
iamsobanjaved
38493d5092 Removed app_name warning from django.conf.urls.include() 2020-01-21 20:38:27 +05:00
Zia Fazal
209364ece3 Merge pull request #22884 from edx/ziafazal/ENT-2543 
ENT-2543: Added ability to add enrollment with GlobalStaff permissions
 2020-01-21 18:07:55 +05:00
zia.fazal@arbisoft.com
18f73c744c Added ability to add enrollment with GlobalStaff permissions 
added unit test

Reviewer feedback changes

Fixed broken test
 2020-01-21 17:28:47 +05:00
Zulqarnain
644a1fc0a6 Change deprecated methods signatures 2020-01-21 16:33:37 +05:00
asadazam93
86b3dfbc54 Fixed bytes in filename 2020-01-21 16:04:46 +05:00
Ahtisham Shahid
0ce89b70eb Merge pull request #22873 from edx/ahtisham/PROD-1126 
created separate const for search_index_update queue
 2020-01-21 11:45:46 +05:00
Ahtisham Shahid
03e7ec97aa Updated border color on login page fields 2020-01-20 16:40:59 +05:00
adeel khan
8f9dfaba49 Merge pull request #22892 from edx/adeel/prod_1178_add_remove_footer_logo 
Adds instagram and removes google-plus footer links
 2020-01-20 13:29:42 +05:00
edx-transifex-bot
e406aaa658 fix(i18n): update translations (#22899) 2020-01-20 13:28:44 +05:00
adeelehsan
35fb321a89 fetch lms root url using configuration helper 
PROD-1063:
 2020-01-20 12:58:34 +05:00
Aarif
84afadb4e7 Merge pull request #22886 from edx/BOM-1155 
Removed the deprecated app_name usage from lms/urls.py BOM-1155
 2020-01-20 12:09:08 +05:00
Brandon Baker
84ebcdf1ec Bump edx-enterprise to 2.1.0 (#22894) 2020-01-17 15:33:24 -05:00
Brandon Baker
4fc19f5d8c Add enterprise catalog url settings to CMS (#22895) 2020-01-17 14:26:42 -05:00
Adeel Khan
4b6cf4801c Adds instagram and removes google-plus footer links 
PROD-1178
 2020-01-17 23:27:28 +05:00
Jansen Kantor
2043a29477 change lms team config (#22893) 2020-01-17 11:40:12 -05:00
David Ormsbee
0800f5f226 Merge pull request #22837 from open-craft/youtube-metadata-new-runtime 
Add way to get YouTube metadata that doesn't require a session cookie
 2020-01-17 11:02:05 -05:00
Adam Butterworth
ca1dfbce70 fix: fragment include directive should include files in themes if they exist (#22880) 2020-01-17 09:00:03 -05:00
edX requirements bot
5e583a27df Updating Python Requirements (#22889) 2020-01-17 08:48:31 -05:00
M Zulqarnain
9ed8159441 Merge pull request #22875 from edx/zulqarnain/BOM-1145 
BOM-1145 : Django 2.2 Supported version of sorl-thumbnail
 2020-01-17 15:51:53 +05:00
Ahtisham Shahid
7a026b7850 created const for update_search_index 2020-01-17 14:29:30 +05:00
Aarif
9cca22fd8f removed deprecated app_name 2020-01-17 13:00:40 +05:00
adeelehsan
3894021ada Merge pull request #22585 from edx/aehsan/prod-1063/added_unsubscribe_link_in_bulk_email 
Unsubscribe link added in bulk emails
 2020-01-17 12:23:39 +05:00
Usama Sadiq
0ceb324a9c Merge pull request #22874 from edx/usama/bom-1141 
BOM-1141 Upgrade social-auth-app-django
 2020-01-17 11:44:21 +05:00
Braden MacDonald
c7d5efb796 Add way to get YouTube metadata that doesn't require a session cookie 
The Video Player XBlock will sometimes make API calls to /couses/yt_video_metadata, a REST API endpoint that in turn loads video metadata from YouTube using the configured settings.YOUTUBE_API_KEY.

However, in the Blockstore-based XBlock runtime, we are running XBlocks in a secure sandbox, and the user's browser cannot pass session cookies when calling REST API endpoints. So currently, the video XBlock tries to request YouTube metadata from that API endpoint, but it fails if run within such a sandbox.

The existing API also doesn't work for anonymous users (users who are allowed to see video XBlocks but who have not logged in to an LMS user account).

This commit updates the Video XBlock so that it can use a handler to load the data from YouTube instead of a generic REST API. This works well in the new runtime, because it has code to support calling handlers within the sandbox, including by anonymous users.

I also fixed a bug where on a default devstack, the endpoint will try calling YouTube using PUT_YOUR_API_KEY_HERE as an API key, and get a "bad request" error from YouTube.

The code could be re-organized by moving things around, but I've left everything as-is for now to keep the diff as small as possible.
 2020-01-16 13:25:16 -08:00
edX cache uploader bot
c596a533e6 Updating Bokchoy testing database cache (#22878) 2020-01-16 15:15:10 -05:00
Calen Pennington
9c5f1271cf Merge pull request #22865 from cpennington/dont-delete-course-overviews 
Dont delete course overviews
 2020-01-16 13:57:13 -05:00
Zulqarnain
fd036541e8 Use python 2.2 compatible version of sorl-thumbnail 2020-01-16 23:37:57 +05:00
Calen Pennington
be5ca3dedd Add a test that shows that CourseModes aren't deleted when CourseOverview versions are updated 2020-01-16 12:07:27 -05:00
Diana Huang
ad33e0e573 Merge pull request #22876 from edx/testeng/bokchoy_auto_cache_update_e00340173c2d18e4052a08fe465230530b2d3202 
Bokchoy Testing DB Cache update
 2020-01-16 11:28:37 -05:00
brianhw
aac1071f42 Merge pull request #22867 from edx/brian/DE-1824-step3 
Update edx-val from 1.2.0 to 1.2.1
 2020-01-16 09:41:16 -05:00
usamasadiq
6803f75cd7 BOM-1141 Upgrade social-auth-app-django 
Added the link to latest master commit of GitHub for Django 2.2 support.
 2020-01-16 19:28:56 +05:00
Zulqarnain
176b814277 Downgrade version of edxval 2020-01-16 19:13:36 +05:00
edX cache uploader bot
ad631f4d32 Updating Bokchoy testing database cache 2020-01-16 08:54:48 -05:00
adeel khan
425f9368ea Merge pull request #22869 from edx/adeel/prod_604_fix_footer_link 
Fix footer link for wcag.
 2020-01-16 18:52:45 +05:00
Awais Qureshi
2bfe5662e4 Merge pull request #22870 from edx/remove-moto 
BOM-1126
 2020-01-16 18:50:36 +05:00
Awais Qureshi
9b9a74e6fd Merge pull request #22860 from edx/awais786/BOM-1050 
Awais786/bom 1050
 2020-01-16 18:49:28 +05:00