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

20527 Commits

Author SHA1 Message Date
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
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
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
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
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
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
391c4aecb6 Merge pull request #22674 from edx/awais786/BOM-1126 
BOM-1126
 2020-01-16 10:44:21 +05:00
Adeel Khan
c06e7cecc0 Fix footer link for wcag. 
PROD-604
 2020-01-16 03:24:19 +05:00
Jansen Kantor
cec55074e8 jkantor/teamconfig (#22863) 
Add TeamsConfigurationService to lms xblock runtime
 2020-01-15 14:27:27 -05:00
Awais Qureshi
220cab965f BOM-1126 
Removing the moto from repo.
 2020-01-15 22:34:13 +05:00
adeelehsan
12708a093d Unsubscribe link added in bulk emails 2020-01-15 16:56:35 +05:00
M Zulqarnain
e5407a31ee Merge pull request #22841 from mzulqarnain1/zulqarnain/BOM-1147 
BOM-1147 -- Create a code mod for Widget.render change
 2020-01-15 11:35:58 +05:00
Jansen Kantor
b2f69fc803 EDUCATOR-4858: Update teams service to consider teamset/topic (#22834) 
* update teams service and api to consider topic
 2020-01-14 16:06:27 -05:00
Julia Eskew
84de6bc6de Revert "This stage does the following: (#22692)" 
This reverts commit cebeab4348.
 2020-01-14 13:01:21 -05:00
Nicholas D'Alfonso
796f1802d2 remove left boarder from upcoming dates 2020-01-14 10:56:02 -05:00
Julia Eskew
cebeab4348 This stage does the following: (#22692) 
- Adds the new field and migration to create the column.
- Makes all writes go to both old and new field.
 2020-01-14 10:40:39 -05:00
Zulqarnain
e6a6fd15d4 Merge branch 'master' into zulqarnain/BOM-1147 2020-01-14 15:23:43 +05:00
Zulqarnain
834079104b BOM-1147 Widget.render change 2020-01-14 15:15:19 +05:00
Nicholas D'Alfonso
3ad963b8a7 AA-3 course dates cleanup 
-change Important Course Dates to Upcoming Dates
-remove today's date
-left align date, right aling rest of info
 2020-01-13 14:58:23 -05:00
Brittney Exline
e33b4614af ENT-2475 Upgrading edx-enterprise and adding settings for enterprise catalog service 2020-01-13 09:36:20 -05:00
Awais Qureshi
3eb4154c6b Merge pull request #22742 from edx/wiki-ver 
BOM-1126
 2020-01-13 19:01:22 +05:00
Usama Sadiq
6349606b55 Merge pull request #22774 from edx/usama/bom-1140 
Updated LtiBackend.authenticate() method
 2020-01-13 11:50:37 +05:00
Mahyar Damavand
532f3e80fa Delete extra parentheses which prevented a message from being extracted 2020-01-12 17:17:51 +03:30
Awais Qureshi
48dbebd28f Bom-1146 
In mobile-api model PLATFORM_CLASSES tuple of list and make migrations generate new migration due to different order.
 2020-01-10 18:10:05 +05:00
usama sadiq
889f7d492d Updated LtiBackend.authenticate() method 
Added a positional `request` arugment in the function header.
 2020-01-10 17:00:22 +05:00
usama sadiq
720dcb6c3a Updated ExceptionViews handles 
Added additional 'exception' parameter to function headers.
Disabled pylint warnings for missing docstring and unused arguments.
 2020-01-10 15:56:24 +05:00
Waheed Ahmed
833af45ef4 Fix course about page video. (#22775) 
PROD-1124
 2020-01-09 17:43:31 +05:00
Awais Qureshi
4eb1a98f21 BOM-1108 
Updating wiki.
 2020-01-09 14:49:50 +05:00
Mahyar Damavand
f1c5981fab Removing deprecated management commands which intended to clear historical data (#21522) 2020-01-08 12:50:34 -05:00
Andytr1
24115bc696 Merge pull request #22751 from edx/andytr1/EDUCATOR-4828-team-prefix 
EDUCATOR-4828
 2020-01-08 10:47:28 -05:00
aarif
79bf089406 updated the django-waffle to support django 2.2 
made changes to test with previous version of django-waffle

updated the query count to test

testing with version 0.13

testing with version 0.14

testing with version 0.15

added version 0.14

updated the django-waffle version to use 0.18

updated the django-waffle version to use 0.16

updated the query counts to pass tests

ran make upgrade

updated the django-waffle to support django 2.2

made changes to test with previous version of django-waffle

updated the query count to test

testing with version 0.13

testing with version 0.14

testing with version 0.15

added version 0.14

updated the django-waffle version to use 0.18

updated the django-waffle version to use 0.16

updated the query counts to pass tests

removed the pdb statements

ran make upgrade
 2020-01-08 14:11:42 +05:00
Usama Sadiq
2de89d6e49 Merge pull request #22732 from edx/usama/bom-1136 
BOM-1136
 2020-01-08 11:49:04 +05:00
Alex Dusenbery
6ab42849b7 CR-1640 | Makes course_api.api.get_due_dates() a little more defensive. 2020-01-07 21:34:09 -05:00
atesker
b4202bf8b7 EDUCATOR-4828 2020-01-07 15:42:02 -05:00
Calen Pennington
dd5f85c870 Read STATICFILES_STORAGE_KWARGS from config to allow separate storage configuration for static assets 2020-01-07 14:03:37 -05:00
atesker
8234208cbb Delete persisten subsection grade override history 
Removed model

renamed file
 2020-01-07 12:05:24 -05:00
usama sadiq
1c52f19f19 Deprecation of the direct assignment to the forward side of a many-to-many set 
Changed the direct assignments with the use of set() method.
 2020-01-07 14:40:23 +05:00
Aarif
8f5a166ab4 Merge pull request #22616 from edx/BOM-1120 
Removed the deprecated usage of include urls.
 2020-01-07 12:52:57 +05:00
Jeremy Bowman
f10a7550d7 Unpin more dependencies (#22690) 2020-01-06 15:07:01 -05:00
Calen Pennington
a20d511e4e Merge pull request #22702 from cpennington/static-files-s3-configs 
Load any AWS_ prefixed settings from ENV_TOKENS to allow S3Boto3Stora…
 2020-01-06 14:20:43 -05:00
Waheed Ahmed
8cd9f141fd Merge pull request #22721 from edx/waheed/PROD-800-add-page-title-for-program-webviews 
Add page title for program dashboard webviews.
 2020-01-06 18:55:18 +05:00
Waheed Ahmed
8a1c3b4ae2 Add page title for program dashboard webviews. 
PROD-800
 2020-01-06 18:05:24 +05:00
adeel khan
c654c31db7 Merge pull request #22711 from edx/adeel/prod_1130_security_option_contact_form 
Add security option to contact us form
 2020-01-06 16:30:02 +05:00
Adeel Khan
b849b14269 Add security option to contact us form 
PROD-1130
 2020-01-06 14:12:59 +05:00
Adeel Khan
4765e93bd1 Add new options and remove duplicate ones 
PROD-1129
 2020-01-06 13:58:56 +05:00
aarif
cfbac50a12 removed the deprecated usage of include 
added on_delete parameter

changes made as suggested

updated the courses wiki url to use include

updated the wiki urls

made changes as suggested
 2020-01-06 13:13:31 +05:00
Calen Pennington
e11e9d9073 Allow overriding ProductionStorage and ProductionS3Storage kwargs with a django settings value 2020-01-03 12:14:12 -05:00