Commit Graph

58450 Commits

Author SHA1 Message Date
Dillon Dumesnil
5f1fbe6fd8 AA-324: Mobile API fixes
This updates the Android user agent regex to accept both
Build or MIUI and for "-" and "." to be allowed in that same
part of the user agent
2020-09-04 16:06:51 -04:00
George Babey
94abf6f94b Merge pull request #24920 from edx/gbabey/3400
Bump edx-enterprise to 3.7.4
2020-09-04 15:16:05 -04:00
Talia
9cbd1907ea SAML Configuration API endpoint + Public flag 2020-09-04 14:58:05 -04:00
Matt Tuchfarber
1c8d90ae4f Merge pull request #24917 from edx/tuchfarber/add_debug_messaging_programs
Add debugging for programs enrollment
2020-09-04 14:27:16 -04:00
George Babey
e717758a96 Bump edx-enterprise to 3.7.4 2020-09-04 14:02:58 -04:00
Felipe Montoya
ad6a625704 Merge pull request #24237 from regisb/regisb/fix-no-csmh
Fix problem viewing when CSMH is disabled
2020-09-04 12:37:34 -05:00
Matt Tuchfarber
f90bcabcd7 Add debugging for programs enrollment 2020-09-04 12:05:06 -04:00
edX requirements bot
a77fede84f Updating Python Requirements (#24913) 2020-09-04 10:19:15 +05:00
Aura Milena Alba
9a8e9ea962 [BD-10] [DEPR-92] Remove edx-pattern-library package. (#24631) 2020-09-03 14:01:16 -04:00
stvn
06c9edf764 Merge PR #24675 open-craft/bb-2597-remove_bypass_home
* Commits:
  Remove course bypass_home setting and references
2020-09-03 10:09:46 -07:00
Dillon Dumesnil
a9b6ce9feb Merge pull request #24896 from edx/ddumesnil/aa-346
AA-346: Have dashboard show the later of enrollment and course start
2020-09-03 10:03:31 -07:00
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
Dillon Dumesnil
7bc755adce AA-346: Have dashboard show the later of enrollment and course start
If it is a self-paced course, the dashboard would greedily show the user's
enrollment date. However, it is often possible to enroll before the start
date which leads to a weird dashboard experience. This resolves that issue.
2020-09-03 10:40:36 -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
Bill Currie
6edd28c73c Remove course bypass_home setting and references 2020-09-02 19:26:03 +02: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
Ali-D-Akbar
893a01f1bf PROD-1613 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
e65874c6a3 PROD-1618 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
a36904e6ee PROD-1600 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
b5cee96c56 PROD-1601 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
71322bb4fe PROD-1606 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
51577629ea PROD-1607 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
e6a080ed4d PROD-1608 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
4cbccce4e2 PROD-1611 2020-09-01 16:22:20 +05: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