Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,161 Commits 1 Branch 0 Tags
2d79aabacba079d28da9775861eb10cda7a55653
Commit Graph

59161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick
821eb84486 Merge pull request #23963 from edx/ndalfonso/AA-157-dates-page-missed-deadlines 
AA-157 dates page missed deadlines
 2020-05-13 10:24:10 -04:00
Jeff LaJoie
75f60af418 Adds more logging to course updates task 2020-05-13 08:37:44 -04:00
adeelehsan
5f26cde55f Merge pull request #23969 from edx/aehsan/PROD-1579/fixed_quality_violation 
Fixed  xss lint violations
 2020-05-13 06:39:01 +05:00
adeelehsan
3da5144fee Fixed python-wrap-html 
PROD-1579
 2020-05-13 06:12:30 +05:00
morenol
dfa1bf158b Add python 3.8 and django30 to tox.ini and remove django111, django20 and django21 (#23889) 
Add python 3.8 and django30 to tox.ini and remove django111, django20, and django21 tox environments
 2020-05-12 15:21:32 -04:00
Brittney Exline
2a1a35fb97 Merge pull request #23971 from edx/bexline/upgrade_edx_enterprise 
ENT-2788 Upgrading edx-enterprise
 2020-05-12 13:16:24 -06:00
Jeremy Bowman
f17e12ba0e Remove shoppingcart from course about page - DEPR-43 (#23973) 
Remove all references to the shoppingcart app from the course about page. Also removed one test of shoppingcart functionality from the student app.
 2020-05-12 15:03:47 -04:00
Brittney Exline
c4efa7cba8 ENT-2788 Upgrading edx-enterprise to the latest version 2020-05-12 12:49:29 -06:00
Olivia Ruiz-Knott
c5cf016a76 Merge pull request #23877 from edx/ork/MICROBA-311_add-state-to-user-profile 
MICROBA-311 Add US State field to UserProfile
 2020-05-12 14:24:31 -04:00
Olivia Ruiz-Knott
f72a6556a9 MICROBA-311 Add US State field to UserProfile 
Add list of states and field to UserProfile model; add migration; add
state field to relevant serializers and to
ACCOUNT_VISIBILITY_CONFIGURATION. Removes state data if country is
changed to something other than United States.
 2020-05-12 13:55:11 -04:00
Ned Batchelder
cca33732ba Correct markup mistakes in api docs 2020-05-12 13:36:14 -04:00
Nicholas D'Alfonso
637b639e78 AA-157 dates page missed deadlines 
- add banner to dates page when deadlines are missed
 2020-05-12 13:02:26 -04:00
Giovanni Cimolin da Silva
3189db2781 Enable changing the build profile used by RequireJS 2020-05-12 13:21:56 -03:00
ihtram
002a24416e added reverse_sql method attribute to avoid sql operation error 2020-05-12 20:39:32 +05:00
Carla Duarte
3e8d22e3e4 Merge pull request #23948 from edx/cduarte/AA-108 
Remove Shorten Welcome Message flag
 2020-05-12 10:30:56 -04:00
Ned Batchelder
ac166306b3 Swagger.yaml is different due to DRF 3.9.x 2020-05-12 10:15:48 -04:00
Diane Kaplan
9b8af1493b Kaplan/rev 1136 financial aid- handle missing feature flag (#23957) 
Add financial assistance link in course tools where available, so this will be more visible to learners
 2020-05-12 10:11:48 -04:00
Zainab Amir
770e7ea3ab Fix transcript status for VEDA videos (#23962) 2020-05-12 18:42:33 +05:00
Jeff LaJoie
8552403598 Merge pull request #23961 from edx/jlajoie/fix-serialization-course-updates 
Fixes serialization of course key for celery in course updates command
 2020-05-12 09:37:44 -04:00
Jeff LaJoie
972c7f3bc1 Merge pull request #23954 from edx/jlajoie/AA-163 
AA-163: Fixes duplicate dates tab issue
 2020-05-12 09:08:54 -04:00
Jeff LaJoie
c180070a9a Fixes serialization of course key for celery in course updates command 2020-05-12 09:02:49 -04:00
Jeff LaJoie
ee0f4567a8 AA-163: Fixes duplicate dates tab issue 2020-05-12 08:38:14 -04:00
Awais Jibran
5e7cd2f818 Merge pull request #23898 from edx/aj/msingh/details 
Course Content boilerplate blurb (and link to discussions)
 2020-05-12 17:24:37 +05:00
Zainab Amir
87a1c06d4b Display encode and transcript status (#23919) 
* Have separate column for transcript and encode status
* Display error message sent from VEM

PROD-1432
 2020-05-12 16:12:07 +05:00
jinder1s
ae2c2c4765 Course Content boilerplate blurb (and link to discussions) 
PROD-1475
 2020-05-12 13:05:10 +05:00
Calen Pennington
ce6c9383d9 Merge pull request #23958 from cpennington/fix-case-collision-course-keys 
Fix case collision course keys
 2020-05-11 14:29:40 -04:00
Ned Batchelder
878b75191c Update docs_settings.py with latest settings 2020-05-11 14:21:15 -04:00
Calen Pennington
bf16155c0f Make sure that case collisions don't propagate into the CourseOverview data 2020-05-11 13:55:27 -04:00
Ned Batchelder
6a23e6f641 Merge pull request #22358 from open-craft/samuel/custom-search-filter 
SE-1839 Allow overriding SEARCH_FILTER_GENERATOR
 2020-05-11 11:58:44 -04:00
Ned Batchelder
3d179a0666 Merge pull request #22539 from open-craft/pooja/fix-autoadvance-not-working-for-hls-videos 
Enable auto start for HLS if autoadvance is set
 2020-05-11 11:52:52 -04:00
Ned Batchelder
b3b58690e6 Merge pull request #21507 from open-craft/guruprasad/youtube-api-missing-referer-fix 
[BB-1637] Pass the referer from the client to the YouTube API
 2020-05-11 11:46:57 -04:00
Tim McCormack
9cff06d762 Address 1+N django_site queries on login page by comparing keys directly (#23947) 
Rather than fetching the Site for every provider in a loop, just look at
the ID of the site.

Added regression test, showing N `django_site` requests before and 0 after.
 2020-05-11 15:37:22 +00:00
edX requirements bot
b154668753 Updating Python Requirements (#23955) 2020-05-11 09:15:50 -04:00
edX cache uploader bot
57d8a552c7 Updating Bokchoy testing database cache (#23950) 2020-05-11 09:00:57 -04:00
mariajgrimaldi
4bf975fdd8 changed count to count_documents (#23945) 
This PR contributes to the elimination of deprecation warnings, specifically the one mentioned above and reported in the Warnings Report: https://build.testeng.edx.org/job/edx-platform-python-pipeline-master/warning_5freport_5fall_2ehtml/ .

Changed collection.find(filter).count() to collection.count_documents(filter) in the following file:

    common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py

And collection.find(filter).limit(1).count() to collection.count_documents(filter, limit=1) in the following file:

    common/lib/xmodule/xmodule/modulestore/mongo/draft.py

The method count_documents is part of the collection, not the cursor (find returns a cursor), according to StackOverflow (https://stackoverflow.com/questions/56303331/warning-message-in-pymongo-count-is-deprecated). Because of that after changing count, I removed the calling to the find method and use the filter parameter in count_documents. Also, I removed limit because count_documents accepts limit parameter.

This warning occurs due to deprecation: https://pymongo.readthedocs.io/en/3.9.0/api/pymongo/collection.html#pymongo.collection.Collection.count_documents
 2020-05-11 08:28:45 -04:00
Syed Muhammad Dawoud Sheraz Ali
d27ac508bb Merge pull request #23942 from edx/dsheraz/PROD-1553 
update cielo api settings
 2020-05-11 11:42:13 +05:00
Farhanah Sheets
08098c834a Merge pull request #23953 from edx/revert-23921-kaplan/REV-1136_financial_aid 
Revert "Add financial assistance link in course tools"
 2020-05-10 17:09:55 -04:00
Farhanah Sheets
d37b333d53 Revert "Add financial assistance link in course tools (#23921)" 
This reverts commit cbb4cfb988.
 2020-05-10 16:43:39 -04:00
Adam Stankiewicz
eaf9cd4bbc Merge pull request #23949 from edx/astankiewicz/edx-enterprise-upgrade 
upgrade edx-enterprise to 3.2.10
 2020-05-08 16:44:40 -04:00
Adam Stankiewicz
c7b510241a upgrade edx-enterprise to 3.2.10 2020-05-08 16:13:36 -04:00
mariajgrimaldi
8063adf5eb changed cookie_date for http_date (#23929) 
I wanted to make a byte-sized contribution but there were no Jira tickets so we decided, thanks to a conversation with @jmbowman through the Open Edx Community #incr (Slack) channel, to collaborate in the elimination of warnings listed in the Warnings Report at https://build.testeng.edx.org/job/edx-platform-python-pipeline-master/warning_5freport_5fall_2ehtml/

This PR contributes to the elimination of RemovedInDjango30Warnings, specifically the one mentioned above and reported in the Warnings Report

Changed cookie_date to http_date in the following file:

    openedx/core/djangoapps/user_authn/cookies.py

This warning occurs due to deprecation since Django 2.1: https://docs.djangoproject.com/en/2.2/ref/utils/#django.utils.http.cookie_date
 2020-05-08 15:55:23 -04:00
Carla Duarte
6fd6605eed Remove Shorten Welcome Message flag 
Removed use of the 'shorten_welcome_message' waffle flag

AA-108
 2020-05-08 15:25:59 -04:00
Jansen Kantor
f4a2303013 EDUCATOR-5043: remove grades from program progress page (#23940) 
* remove grades from program progress page
 2020-05-08 14:46:20 -04:00
edX requirements bot
21c5ec2cd2 Updating Python Requirements (#23943) 2020-05-08 14:16:17 -04:00
Leonardo Martinez
03c6a46e33 Update the LibraryLocator attribute from 'course' to 'library' (#23924) 
This PR solves the deprecation warning found here:
https://build.testeng.edx.org/job/edx-platform-python-pipeline-master/warning_5freport_5fall_2ehtml/

Change:
(LibraryLocator(org='org', course='course'), False)
To:
(LibraryLocator(org='org', library='course'), False)
In the file:
openedx/core/djangoapps/content/block_structure/tests/test_signals.py

* LibraryLocator is from the opaque_keys.edx.locator module

See documentation:
https://pythonhosted.org/edx-opaque-keys/opaque_keys.edx.html#opaque_keys.edx.locator.LibraryLocator
 2020-05-08 12:19:59 -04:00
mariajgrimaldi
c23071defc Fix DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead (#23909) 
I wanted to make a byte-sized contribution but there were no Jira tickets so we decided, thanks to a conversation with @jmbowman through the Open Edx Community #incr (Slack) channel, to collaborate in the elimination of warnings listed in the Warnings Report at https://build.testeng.edx.org/job/edx-platform-python-pipeline-master/warning_5freport_5fall_2ehtml/

This PR contributes to the elimination of deprecation warnings, specifically the one mentioned above and reported in the Warnings Report.

Changed logger.warn to logger.warning in the following files:

    lms/djangoapps/experiments/utils.py

    lms/djangoapps/lti_provider/outcomes.py

    lms/djangoapps/courseware/module_render.py

This warning occurs due to deprecation in python 3.4+: https://docs.python.org/3.5/library/logging.html#logging.Logger.warning
 2020-05-08 12:15:59 -04:00
mariajgrimaldi
003ccf4f1f changed insert to insert_one (#23908) 
I wanted to make a byte-sized contribution but there were no Jira tickets so we decided, thanks to a conversation with @jmbowman through the Open Edx Community #incr (Slack) channel, to collaborate in the elimination of warnings listed in the Warnings Report at https://build.testeng.edx.org/job/edx-platform-python-pipeline-master/warning_5freport_5fall_2ehtml/

This PR contributes to the elimination of deprecation warnings, specifically the one mentioned above and reported in the Warnings Report.

Changed insert to insert_one in the following file:

* cms/djangoapps/contentstore/management/commands/tests/test_cleanup_assets.py

This warning occurs due to deprecation: https://api.mongodb.com/python/current/api/pymongo/collection.html#pymongo.collection.Collection.insert
 2020-05-08 12:04:29 -04:00
Michael Terry
1fed93c02f Merge pull request #23946 from edx/mikix/due-on-graded-only 
Only set due dates on graded content
 2020-05-08 11:57:23 -04:00
mariajgrimaldi
6eead791a1 Fix DeprecationWarning: Please use assertNotRegex instead (#23907) 
I wanted to make a byte-sized contribution but there were no Jira tickets so we decided, thanks to a conversation with @jmbowman through the Open Edx Community #incr (Slack) channel, to collaborate in the elimination of warnings listed in the Warnings Report at https://build.testeng.edx.org/job/edx-platform-python-pipeline-master/warning_5freport_5fall_2ehtml/

This PR contributes to the elimination of deprecation warnings, specifically the one mentioned above and reported in the Warnings Report.

Changed assertNotRegexpMatches to assertNotRegex in the following files:

    cms/djangoapps/contentstore/views/tests/test_preview.py

    cms/djangoapps/contentstore/views/tests/test_item.py

    lms/djangoapps/commerce/tests/test_views.py

    lms/djangoapps/dashboard/tests/test_sysadmin.py

This warning occurs due to deprecation in python 3.5: https://docs.python.org/3.5/library/unittest.html#unittest.TestCase.assertNotRegex
 2020-05-08 11:53:02 -04:00
Adam Butterworth
307cb30208 Swap deprecated box-sizing mixin with the box-sizing property (#23928) 
* Swap deprecated box-sizing mixin with the box-sizing property

* Linting now that box-sizing is no longer a mixin
 2020-05-08 11:27:51 -04:00