Commit Graph

25151 Commits

Author SHA1 Message Date
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
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
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
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
jinder1s
ae2c2c4765 Course Content boilerplate blurb (and link to discussions)
PROD-1475
2020-05-12 13:05:10 +05: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
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
Farhanah Sheets
d37b333d53 Revert "Add financial assistance link in course tools (#23921)"
This reverts commit cbb4cfb988.
2020-05-10 16:43:39 -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
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
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
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
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
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
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
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
stvn
d608b43471 Revert "Add logging to Learning MFE iframe, temporarily"
This reverts commit 2ddc35cd79.
2020-05-06 19:43:11 -07: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
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
Dillon Dumesnil
10759a9046 Merge pull request #23819 from edx/ddumesnil/more-date-pills-aa-99
AA-99: Adding in new date pills for the dates tab
2020-05-06 06:12:50 -07:00
Simon Chen
262574b815 Move all the upgrade display logic into courseware.utils 2020-05-05 17:54:22 -04:00
Dave St.Germain
29c0cc7b5e Merge pull request #23891 from edx/dcs/mfe-redirect
Redirect to courseware MFE, including unit
2020-05-05 13:58:17 -04:00
Feanil Patel
3a6b2afe0c Merge pull request #23895 from edx/feanil/simplify_bokchoy_config
Feanil/simplify bokchoy config
2020-05-05 13:43:05 -04:00
Feanil Patel
865eca0c7d This is now handled by production.py 2020-05-05 09:38:13 -04:00
Feanil Patel
b0931dd166 Move settings out of bok_choy.py to bok_choy.yml
There's more to do here but get the easy ones first and make sure we didn't break anything.
2020-05-04 16:05:53 -04:00
Feanil Patel
e15c2c5187 Remove load_test.py which we don't use anywhere. 2020-05-04 16:05:24 -04:00
Adam Stankiewicz
6d942bc94d revert learner portal links blocking juniper release 2020-05-04 14:55:06 -04:00
Dave St.Germain
2c400184e4 Redirect to courseware MFE, including unit 2020-05-04 13:49:20 -04:00
Dave St.Germain
617cc26a37 Merge pull request #23845 from edx/dcs/staff-access
Allow global staff to access data download tab
2020-05-04 12:01:22 -04:00
Kyle McCormick
e6acdd080d Change IDv response time to 5-7 days (#23887)
It was previously 1-2 days, but we need to increase it
in response to our increased ID verification demand.
2020-05-04 11:33:53 -04:00
Dave St.Germain
b7927bedc9 Allow global staff to access data download tab 2020-05-04 11:31:53 -04:00
Dillon Dumesnil
858154a7d6 AA-99: Adding in new date pills for the dates tab 2020-05-04 07:24:01 -07:00
Kyle McCormick
ec9ac34886 Paginate course card API for Programs Learner Portal
* Pull business logic of ProgramCourseEnrollmentOverviewView
  out of view class and into utils.py.
* Add UserProgramCourseEnrollmentsView, which is a paginated
  version of ProgramCourseEnrollmentOverviewView with a
  URL that is parameterized on the user (to enable masquerading
  in MST-109).
* Add get_certificates_for_user_by_course_keys to certs API
  to make enrollments overviews REST API use fewer SQL queries.
* Document new course cards API with edx-api-doc-tools.

In a follow-up ticket, the Programs Learner Portal will switch
to the new paginatd API in order to speed up its page load.

MST-126
2020-05-04 09:26:23 -04:00
Kyle McCormick
2983fb0af6 Speed up ProgramCourseEnrollmentOverviewGetTests with setUpClass 2020-05-04 09:26:23 -04:00
Kyle McCormick
a86576e69b Fix isort and pylint violations in program_enrollments
Run isort -rc lms/djangoapps/program_enrollments
Run pylint lms/djangoapps/program_enrollment and fix messages.

Stop pylint from complaining about DictFactoryBase instances
2020-05-04 09:26:23 -04:00
Zainab Amir
c5395a2a67 Add veda fernet key to LMS (#23722) 2020-05-04 17:27:48 +05:00
adeel khan
0262d0e3ee Merge pull request #23836 from edx/adeel/prod_1477_enable_recovery_email_for_all_learners
Removes enterprise filter for account recovery banner
2020-05-04 17:23:15 +05:00
Samuel Walladge
71fcf6e725 Fix issues with xss linters
Improve accuracy of javascript-escape linter: Previously this would
match on FOOescape() and FOO.escape calls, but neither are the global
escape function we are worried about.

The regex probably isn't 100% accurate; there may be still false
positives (javascript allows a large range of characters in identifiers,
some of which may not be covered by [\w.$]). The main thing is to avoid
false negatives here though - this will definitely catch any use of
`escape()` or `window.escape()`.

Also remove javascript-interpolate lint - this was deemed unecessary.
StringUtils.interpolate is not in fact safe (it does no html escaping),
so the results of this lint are misleading.
2020-05-04 09:27:18 +09:30
edX Transifex Bot
063e1d45c8 fix(i18n): update translations 2020-05-03 17:19:10 -04:00
Simon Chen
34d4d162f7 MST-108 Add masquerading fix to the upgrade message display 2020-05-01 16:54:43 -04:00
Aarif
98af9ce418 remove useless-supression warnings 2020-05-01 19:42:15 +05:00
Aura Milena Alba
ce96d6c92d DEPR-66 Remove pattern library on programs_details (#23416) 2020-05-01 10:39:51 -04:00
Régis Behmo
cc6e823fe6 Quiet courseware import warnings
As it is explained in courseware/__init__.py:

    Importing 'lms.djangoapps.courseware' as 'courseware' is no longer
    supported

This warning, while relevant, decreased the signal/noise ratio when
investigating the lms logs.

The "bulk_email" app was the only remaining app importing the courseware
module incorrectly. All edx-platform modules and dependencies now follow
the new convention.

This is in part for CRI-196.
2020-05-01 00:07:30 +02:00