Commit Graph

55665 Commits

Author SHA1 Message Date
Dillon Dumesnil
76034047eb Merge pull request #24891 from edx/ddumesnil/fix-reset-dates-banner-aa-318
AA-318: Update PLS CTA to use the dates_banner_should_display
2020-09-03 10:03:21 -07:00
Kyle McCormick
b24cb48eb0 Decentralized Devstack changes: Add and push Dockerfile; add decentralized devstack settings (#24666)
* Add and push Dockerfile; add decentralized devstack settings

Co-Authored-By: Diana Huang <dkh@edx.org>
Co-Authored-By: Kyle McCormick <kmccormick@edx.org>

* Remove Python requirements hack

Remove the attempted optimization to the installation of Python
package dependencies.  The dependencies in edx-platform change
about three times per day, so this was of dubious value.  And
because npm is run through nodeenv, which is a Python package,
the Python dependencies installation has to happen first.

* ARCHBOM-1439: Changing workdir to /edx/app/edxapp/edx-platform (#24835)

Context: The Dockerfile tries to stay in sych with legacy stuff.
In the ansible we configure the directory structure such that things
relating to the app but not in the codebase,
such as the env file wind up in /edx/app/edxapp/.
And the codebase winds up in /edx/app/edxapp/edx-platform.

I think due to accident, the dockerfile does
/edx/app/edx-platform/edx-platform instead of /edx/app/edxapp/edx-platform.

This commit tries to have Dockerfile more reflect what is currently happening in production

* Update ports for decentralized devstack ARCHBOM-1447 (#24841)

Switch from the LMS ports we've historically used for NGINX to those used for gunicorn, and fix the Studio ports to match the ones we've historically used for its gunicorn service. Also removed some leftover bits of the requirements hack.

Co-authored-by: Adam Blackwell <ablackwell@edx.org>
Co-authored-by: Diana Huang <dkh@edx.org>
Co-authored-by: jinder1s <msingh@edx.org>
Co-authored-by: Jeremy Bowman <jbowman@edx.org>
Co-authored-by: Manjinder Singh <49171515+jinder1s@users.noreply.github.com>
2020-09-03 11:47:08 -04:00
Dillon Dumesnil
767af37d3d AA-318: Update PLS CTA to use the dates_banner_should_display
This will make it so audit and verified learners will not see the CTA
after due dates. Previously it would only check if the xblock is
self_paced and there are still attempts and it's past due
2020-09-03 10:50:44 -04:00
Adam Butterworth
1757fa3610 Revert "Revert "[BD-10] [DEPR-92] Remove pattern library of pavelib folder (#24591)" (#24635)" (#24695)
This reverts commit a463fbeca9.
2020-09-03 09:27:41 -04:00
Alex Dusenbery
2cbfd2c568 Upgrade edx-enterprise to 3.7.3 2020-09-03 09:12:14 -04:00
edX requirements bot
86832e2c2d Updating Python Requirements (#24906) 2020-09-03 12:20:56 +05:00
edX cache uploader bot
7c67e8d0c5 Updating Bokchoy testing database cache (#24901) 2020-09-03 12:19:11 +05:00
edX Transifex Bot
d3590bcf2d geoip2: update maxmind geolite country database 2020-09-03 12:11:58 +05:00
stvn
c87df89be5 Merge PR #24055 regisb/fix-lti-provider-admin
* Commits:
  Fix creation of LTIProviderConfig object in admin
2020-09-02 13:49:28 -07:00
Adam Stankiewicz
d7e6e01bae Map admin feature roles to admin system role (#24897) 2020-09-02 15:45:33 -04:00
Adam Butterworth
6231bad22e Revert "Revert "[BD-10] [DEPR-92] Remove directories that includes pattern library."" (#24696) 2020-09-02 15:39:58 -04:00
Awais Jibran
1a6c33b4d3 Merge pull request #24895 from edx/aj/fix-video-handouts
Fix video handouts uploads.
2020-09-02 23:57:09 +05:00
David Ormsbee
f49440688f Merge pull request #24399 from open-craft/taniwha/bb-2673_TNL-7261_Course_Outline_API_Beta_User_Support
[BD-29] [TNL-7261]  Course Outline API: Beta User Support
2020-09-02 14:21:01 -04:00
Awais Jibran
60822404e5 Fix video handouts uploads. 2020-09-02 19:04:01 +05:00
Bill Currie
17e69d7881 Adds support for beta users to the course outline API
Adds days_early_for_beta to the ScheduleData class, and its loading
and usage to ScheduleOutlineProcessor.
2020-09-02 16:48:51 +05:30
edX requirements bot
cb1635a60c Updating Python Requirements (#24892) 2020-09-02 12:10:22 +05:00
Carla Duarte
559f7261c7 Merge pull request #24887 from edx/ciduarte/swagger-bug
Fix for Swagger error
2020-09-01 14:02:43 -04:00
Alex Dusenbery
a06f4dc09d Upgrade edx-enterprise to 3.7.2 2020-09-01 12:09:43 -04:00
Carla Duarte
11d52f154f Fix for Swagger error 2020-09-01 11:38:46 -04:00
edx-pipeline-bot
cfa6183744 Merge pull request #24881 from edx/private_to_public_96fc73c
Mergeback PR from private to public.
2020-09-01 12:04:13 +05:00
Aarif
ecce477226 Updating Python Requirements (#24880) 2020-09-01 11:55:42 +05:00
Ali Akbar
96fc73c13f Merge pull request #195 from edx/sustaining/security-fixes-3
Sustaining/security fixes 3
2020-09-01 11:14:55 +05:00
edX requirements bot
44c5725058 Updating Python Requirements 2020-09-01 02:14:06 -04:00
Michael Terry
a7ab16355a Merge pull request #24878 from edx/mikix/outline-tweaks
AA-126: Expose more course-outline info to learning MFE
2020-08-31 16:25:47 -04:00
Michael Terry
c653ac2c8a AA-126: Expose more course-outline info to learning MFE
- Use the same get_course_outline_block_tree call that the current
  outline uses
- Show number of problems in subsection display names
- Don't send links if the user is not enrolled or course isn't public
- Send subsection icons to MFE
- Send subsection descriptions to MFE
- Send completion info to MFE
2020-08-31 15:38:41 -04:00
Braden MacDonald
1c60d5477b Merge PR #24803: [BD-14] BlockLimitReachedError should returns a 400 response instead of 500
https://github.com/edx/edx-platform/pull/24803
2020-08-31 10:39:20 -07:00
David Ormsbee
961b71f15d Merge pull request #22446 from open-craft/agrendalath/bb-1505-fix_mobile_timer
Fix timer text wrapping on smaller screens
2020-08-31 13:24:34 -04:00
Dillon Dumesnil
315b974b82 Merge pull request #24868 from edx/ddumesnil/courseware-due-date-fixes
AA-314/AA-330: Updates to courseware due date.
2020-08-31 09:49:22 -07:00
Dillon Dumesnil
1341068d20 AA-314/AA-330: Updates to courseware due date.
This will fix a bug about if assignment type is None, we will only
show the due date.
This will also fix a bug where we would show the assignment type and
due date on non-scored units within a subsection. Now it will only
show on scored units.
This also fixes the pill that displays from stretching out if the due
date text is multi-lined.
2020-08-31 10:50:42 -04:00
Binod Pant
bc5b71f044 upgrade edx-enterprise 3.7.1 (#24876) 2020-08-31 10:34:43 -04:00
edx-pipeline-bot
98ad7ce677 Merge pull request #24877 from edx/private_to_public_372254e
Mergeback PR from private to public.
2020-08-31 19:19:38 +05:00
Ali Akbar
9068b43ea6 Merge pull request #24871 from edx/aj/check-capa-logs
Adding debug logs for CR-2618
2020-08-31 18:36:53 +05:00
Régis Behmo
ba18d48ac3 Get rid of lepl deprecation warning by removing rfc6266 dependency (#24059)
The LEPL dependency was triggering a lot of deprecation warnings of the
form:

    venv/lib/python3.5/site-packages/lepl/matchers/support.py:497:
    DeprecationWarning: inspect.getargspec() is deprecated, use
    inspect.signature() instead
    argspec = getargspec(func)

It turns out that LEPL was only used by the rfc6266_parser package, which
itself was only used in one place to generate utf8-compliant
Content-Disposition headers.

This issue was noticed here:
https://github.com/SWW13/python-rfc6266-parser/issues/2
Unfortunately it is quite difficult to extract LEPL from the
rfc6266-parser package.

The rfc6266-parser package (https://pypi.org/project/rfc6266-parser/) is
itself a fork of the now-unmaintained rfc6266 package
(https://pypi.org/project/rfc6266/). Thus, it became high time to get
rid of this package. The FileResponse object can appropriately set the
Content-Disposition header, and thus replace the rfc6266 functionality,
since Django 2.0: https://code.djangoproject.com/ticket/16470

In our testing, the FileResponse object correctly set the
`filename*=utf-8''` value, following the RFC. The only difference is
that it does not provide "filename" fallback value, as expressed in the
RFC: https://tools.ietf.org/html/rfc6266#appendix-D

With rfc6266_parser:

    >> import rfc6266_parser
    >> rfc6266_parser.build_header("my_file_é.csv", filename_compat="video_urls.csv")
    b"attachment; filename=video_urls.csv; filename*=utf-8''my_file_%C3%A9.csv"

With FileResponse we have:

    >> from django.http import FileResponse
    >> import io
    >> response = FileResponse(io.StringIO(), as_attachment=True, filename="my_file_é.csv", content_type="text/csv")
    >> response.get("Content-Disposition")
    "attachment; filename*=utf-8''my_file_%C3%A9.csv"

We consider that this is a sufficiently minor difference, that will
impact very few browsers.
2020-08-31 09:30:27 -04:00
Carla Duarte
4e6bff8868 Merge pull request #24819 from edx/ciduarte/AA-125
AA-125: Add Course Goals to MFE API
2020-08-31 09:28:57 -04:00
Awais Jibran
a113dd2f90 Adding debug logs for CR-2618 2020-08-31 16:50:22 +05:00
edX requirements bot
3d70cfcbe3 Updating Python Requirements (#24870) 2020-08-31 14:42:32 +05:00
Uzair Rasheed
372254e3cb Merge pull request #200 from edx/security-fix/fix-xss-in-templates
Security fix/fix xss in templates
2020-08-31 10:53:24 +05:00
edX Transifex Bot
7a7cb2f984 fix(i18n): update translations 2020-08-30 17:48:44 -04:00
Sid Verma
1170a17b5f BlockLimitReachedError should returns a 400 response instead of 500 2020-08-29 01:08:38 +05:30
Carla Duarte
6392722e0e AA-125: Add Course Goals to MFE API 2020-08-28 10:31:59 -04:00
Albert (AJ) St. Aubin
a206e777af Write a migration to clean up and secure duplicate UserDemographics
entries

[MICROBA-551]
2020-08-28 10:23:06 -04:00
Agrendalath
acccc3a981 Fix exam timer text wrapping on smaller screens
This fixes wrapping the exam-text bar on smaller screens during timed exams, which prevented users from viewing the exam's content.
2020-08-28 14:56:26 +02:00
Ali Akbar
75495fd003 Merge pull request #24865 from edx/aakbar/remove-data-download-logs
Remove problem report and data download logs
2020-08-28 15:00:47 +05:00
Saleem Latif
9b72042bf4 Merge pull request #24854 from edx/saleem-latif/3336
ENT-3336: Added default for new enterprise setting INTEGRATED_CHANNELS_API_CHUNK_TRANSMISSION_LIMIT
2020-08-28 14:04:15 +05:00
Saleem Latif
c5502057b1 Added default for new enterprise setting INTEGRATED_CHANNELS_API_CHUNK_TRANSMISSION_LIMIT 2020-08-28 13:17:49 +05:00
Ali-D-Akbar
a316c6dbf6 remove problem report and data download logs 2020-08-28 12:44:42 +05:00
Usama Sadiq
0bef56a6ca Merge pull request #24863 from edx/testeng/bokchoy_auto_cache_update_a6bb5986b084ef773ba68686f3221eadd42157af
Bokchoy Testing DB Cache update
2020-08-28 12:09:10 +05:00
edX cache uploader bot
7f9ba4c401 Updating Bokchoy testing database cache 2020-08-28 01:45:31 -04:00
Aarif
dd6271e74a Updating Python Requirements (#24862) 2020-08-28 10:40:07 +05:00
edX requirements bot
b727458245 Updating Python Requirements 2020-08-28 00:46:17 -04:00