Commit Graph

54359 Commits

Author SHA1 Message Date
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
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
Michael Terry
e521e0db25 Only set due dates on graded content
When a self paced course was published and we were configured to
automatically space out due dates among its sections, we were
accidentally setting due dates on ungraded content. Which limited
access to it.

AA-162
2020-05-08 11:10:33 -04:00
Ali Akbar
0955865fa9 Merge pull request #23885 from edx/aakbar/PROD-1478
Unauthenticated Contact Us improvements
2020-05-08 19:49:06 +05:00
Diane Kaplan
cbb4cfb988 Add financial assistance link in course tools (#23921)
Add financial assistance link in course tools for eligible courses, so it'll be more visible to learners
2020-05-08 10:35:10 -04:00
Albert (AJ) St. Aubin
5a427bcb14 Merge pull request #23897 from edx/aj/dashboard_error
PR to fix issue loading dashboard when there is a version mismatch in
2020-05-08 09:28:01 -04:00
Jeff LaJoie
c1130e60c4 Merge pull request #23944 from edx/jlajoie/course-update-command-fixes
Changes type of objects that get serialized, removes a problematic log statement
2020-05-08 09:22:39 -04:00
Saad Yousaf
c099932830 Merge pull request #23914 from edx/saad/PROD-1230-certificate-available-date-adr
[PROD-1230] - ADR for upcoming update for certificate_available_date.
2020-05-08 17:57:56 +05:00
Jeff LaJoie
c87269956a Changes type of objects that get serialized, removes a problematic log statement 2020-05-08 08:39:03 -04:00
Albert (AJ) St. Aubin
bf3aaffe4d PR to fix issue loading dashboard when there is a version mismatch in
CourseOverview

    This line of code will cause a failure in the retrieval of the
    CourseOverview get_from_id method because it attempts to load with a
    string rather than a CourseKey.
2020-05-08 08:18:25 -04:00
Ali-D-Akbar
94907cc4a9 Unauthenticated Contact Us improvements
fix password reset page, add another test and remove typo

improve js test

add quality changes

add quality changes
2020-05-08 14:14:35 +05:00
Zia Fazal
d04f2735a1 Merge pull request #23934 from edx/ziafazal/ENT-2730
ENT-2730: Apply same username restrictions during SSO pipeline
2020-05-08 09:29:19 +05:00
SaadYousaf
6b7a51f86c ADR for upcoming update for certificate_available_date. 2020-05-08 04:26:10 +05:00
Adam Stankiewicz
e51bd9abd6 Merge pull request #23941 from edx/aed/ent-3.2.8
Bump edx-enterprise to 3.2.8
2020-05-07 18:38:54 -04:00
Alex Dusenbery
ee1b92b412 Bump edx-enterprise to 3.2.8 2020-05-07 17:59:48 -04:00
atesker
5462a176a8 EDUCATOR-4990 - Modify team membership via CSV upload. Slight refactoring - removal happens post static validation 2020-05-07 16:23:23 -04:00
stvn
599adebf21 Merge PR #23932 revert/iframe-logging
* Commits:
  Revert "Add logging to Learning MFE iframe, temporarily"
2020-05-07 12:41:57 -07:00
Nick
d24e4fe5a8 Merge pull request #23876 from edx/revert-23871-ndalfonso/AA-138-banner-debug
Revert "add logs for debugging"
2020-05-07 15:31:00 -04:00
Robert Raposa
6e26247649 constrain ddt<1.4.0 (#23938)
Constrain ddt<1.4.0 until this issue is fixed:
- https://github.com/datadriventests/ddt/issues/83
2020-05-07 13:25:03 -04:00
Dave St.Germain
cd7f88e1be Merge pull request #23937 from edx/dcs/researcher-admin
Enable access role in django admin
2020-05-07 12:18:23 -04:00
Matt Tuchfarber
8193763e92 Merge pull request #23931 from edx/tuchfarber/strip_phone_number
Strip non-numeric characters from phone number
2020-05-07 11:40:01 -04:00
zia.fazal@arbisoft.com
647da21191 Apply same username restrictions during SSO pipeline
Apply same username restrictions during SSO pipeline as we have user registeration flow to avoid SSO flow breakage at the time of user creation.
ENT-2730

Code quality fixes
2020-05-07 19:50:56 +05:00
Dave St.Germain
fedcf045eb Enable access role in django admin 2020-05-07 10:45:24 -04:00
Matt Tuchfarber
4910cfa180 Strip non-numeric characters from phone number
Allows user to type in phone number in whichever
format they prefer.
2020-05-07 10:10:42 -04:00
Ned Batchelder
1fc881b90e Merge pull request #23911 from shadinaif/shadinaif/fix-untranslated-text
Missing translation function call
2020-05-07 09:59:29 -04:00
Nick
7db6e92977 Merge pull request #23923 from edx/ndalfonso/AA-149-enable-masquerade-on-dates-tab
Enable masquerade on dates tab
2020-05-07 09:48:15 -04:00
Robert Raposa
b98d200fdc Revert "Dark launch: Fix site shadowing and 1+N queries in third party auth config fetching (#23824)" (#23935)
This reverts commit 79420640d5.
2020-05-07 09:38:54 -04:00
Michael Roytman
681c3ebed0 Merge pull request #23873 from edx/mroytman/MST-181-program-enrollment-sync-support-tool
MST-181: Add the ability to unlink and relink Program Enrollments via Support Tool to Address SSO Issues
2020-05-07 09:25:54 -04:00
Shadi Naif
7142d55b1a Missing translation function call 2020-05-07 14:32:50 +03:00
Waheed Ahmed
c603111895 added another test case. 2020-05-07 15:14:31 +05:00
Waheed Ahmed
05d18effde Implement both IP and email based rate limiting. 2020-05-07 15:14:31 +05:00
Waheed Ahmed
f3db71171e Fix password reset rate limiting for existing users.
PROD-1427
2020-05-07 15:14:31 +05:00
stvn
d608b43471 Revert "Add logging to Learning MFE iframe, temporarily"
This reverts commit 2ddc35cd79.
2020-05-06 19:43:11 -07:00
Ned Batchelder
5caf9b02fa Merge pull request #23922 from regisb/regisb/fix-offset-naive-static-assets
Fix naive offset-naive/aware error in asset compilation [CRI-191]
2020-05-06 17:13:30 -04:00
edX Transifex Bot
eeecda6703 geoip2: update maxmind geolite country database 2020-05-06 16:54:21 -04:00
Jeff Chaves
56fb62cad0 ran make upgrade to bump edx-enterprise version (#23925) 2020-05-06 16:09:50 -04:00
Adam Butterworth
42cc0d0145 Fix all stylelint errors (#23920)
* Fix all stylelint errors

For any errors that fixing would require changing the output of the css disable stylelint for that line instead of modifying.

* Update quality.py

Make stylelint quality check pass when there are no errors

* Delete empty selectors
2020-05-06 16:07:14 -04:00
Nicholas D'Alfonso
5d28f0e0c3 Enable masquerade on dates tab 2020-05-06 13:28:22 -04:00
edX requirements bot
485e36e44a Updating Python Requirements (#23912) 2020-05-06 16:44:20 +00:00
Régis Behmo
1d859569b6 Fix naive offset-naive/aware error in asset compilation
The XBlockPackageStorage used to return offset-naive datetime objects
which were compared to offset-aware objects when we ran static asset
collection:

    ./manage.py lms collectstatic

Close CRI-191
2020-05-06 18:39:46 +02:00
Michael Roytman
38c255dbd2 Enhance the Link Program Enrollments Support Tool to handle the case of linking a learner to a ProgramEnrollment that is already linked to a different edX account.
In this case,
* unenroll the currently linked learner from the courses associated with related ProgramCourseEnrollments
* for each course the is enrolled in as part of a ProgramCourseEnrollment, if the coures has an audit track, then move the enrollment into the audit track. Otherwise, keep the learner's enrollment in the existing track.
* link the new user to the ProgramEnrollment
* enroll the new user in the Master's track in the courses associated with related ProgramCourseEnrollments
2020-05-06 10:15:42 -04:00