Commit Graph

22621 Commits

Author SHA1 Message Date
Aura Milena Alba
04802d2d72 Remove pattern library of programs.html (#23951) 2020-05-19 09:33:24 -04:00
uzairr
39b4a3f4a7 Restrict api to staff users 2020-05-19 17:22:50 +05:00
Ned Batchelder
68aceff860 Merge pull request #23968 from edx/nedbat/docs-progress
Update swagger.yaml, fix some markup errors
2020-05-16 14:50:35 -04:00
Jansen Kantor
9707dcff6e EDUCATOR 5042: Learner's Private Team Appears When Learner Browses all Team Sets (#24004)
* fix query to remove dulicates and incorrect teams
2020-05-15 16:50:31 -04:00
Jeff Chaves
34634eb8e8 ENT-2885: importing ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG list from settin… (#23999)
importing ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG list from settings following same pattern that is used for CORS_ORIGIN_WHITELIST
2020-05-15 16:02:48 -04:00
Ben Warzeski
7778347aed remove old_format from team config tests 2020-05-15 14:44:23 -04:00
Dave St.Germain
45a71cfcf7 Merge pull request #24001 from edx/dcs/hide-tabs
Only the data download tab should appear for data researchers
2020-05-15 11:14:20 -04:00
Dave St.Germain
c6344aa577 Only the data download tab should appear for data researchers
TNL-7222
2020-05-15 08:11:45 -04:00
Dillon Dumesnil
39d45eee42 Moving SUPPORTED_FIELDS for transformers into serializers
It is only referenced inside of the serializers so we can just
define it there
2020-05-14 13:12:43 -07:00
Dillon Dumesnil
4d4b93c6ed AA-159: Improving performance of get_course_assignments
We saw an increase in response time with recent changes to the logic
behind get_course_assignments. This effort works to better access
the information we need in order to improve performance.
Namely, this is done by using the course_blocks_api
2020-05-14 13:12:25 -07:00
Ben Warzeski
d559a35879 Update teams scss (#23989)
highlight topic cards on tab-select
add border highlight to sorting select input on teams and topics pages.

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.local>
2020-05-14 11:37:29 -04:00
edX requirements bot
5724432741 Python Requirements Update (#23984)
* Updating Python Requirements

* Constrain django-cookies-samesite until dep bug fixed

* Fix PEP 8 problems revealed by pycodestyle upgrade

Co-authored-by: Tim McCormack <tmccormack@edx.org>
Co-authored-by: Jeremy Bowman <jbowman@edx.org>
2020-05-13 20:24:30 +00:00
Carla Duarte
069aea8f40 Dates Intro Messaging
Added a banner to introduce learners to the Dates Tab.
The banner is hidden when the learner has missed deadlines.

Refactored naming conventions in the dates sass file to better
reflect the function of our banners.

AA-156
2020-05-13 13:20:53 -04:00
atesker
839a0edc4e EDUCATOR-4989 - use student-key 2020-05-13 13:07:31 -04:00
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
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
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
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
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