Commit Graph

56880 Commits

Author SHA1 Message Date
azanbinzahid
17261b9886 PROD-2143 2021-01-06 11:36:36 +05:00
azanbinzahid
7788b9ea62 PROD-2185 2021-01-06 11:36:36 +05:00
Ali-D-Akbar
f45b526692 PROD-2188
PROD-2188
2021-01-06 11:36:36 +05:00
azanbinzahid
e26f8f223a PROD-2210 2021-01-06 11:36:36 +05:00
Awais Qureshi
44d97d72f1 Merge pull request #25799 from edx/awais786/make-docs
Fixing make docs issue
2021-01-06 01:09:09 +05:00
Awais Qureshi
c4ae96d000 Running makeupgrade 2021-01-06 00:35:33 +05:00
Michael Terry
c3baf5c19e Merge pull request #25972 from edx/mikix/banner-cta-tweaks
AA-505: Some design updates for courseware "shift dates" UI
2021-01-05 13:28:37 -05:00
Igor Degtiarov
acbefd1079 Extend appropriate proctoring exam modes if provider allows it. (#25927)
The honor enrollment mode is widely used in OpenEdx installations,
and recently it was not allowed for proctoring exam, but very anticipated.

Current PR makes it possible to start the proctoring exam in the honor enrollment
mode in case the provider is configured in that way.
2021-01-05 13:20:35 -05:00
Alex Dusenbery
3cd212ee70 Bump edx-enterprise to 3.16.7. Modifies the learner portal enterprise_course_enrollments endpoint to include an is_enrollment_active key that indicates the status of the enterprise enrollment's related student.CourseEnrollment. Allow the endpoint to optionally accept an ?is_active query param, so that clients may request only active enrollments from it. 2021-01-05 12:55:06 -05:00
Awais Qureshi
1f616f6fcd Fixing make docs
Adding constraint on sphinx.
2021-01-05 22:42:01 +05:00
Usman Khalid
75391262da [BD-04] Convert SplitTest XModule to XBlock. (#25696) 2021-01-05 09:55:14 -05:00
irfanuddinahmad
b5438c52b7 Merge pull request #25982 from edx/iahmad/ENT-3688
ENT-3688: Updated requirements with new edx-enterprise version
2021-01-05 17:32:47 +05:00
irfanuddinahmad
49292d65a3 Fixed test data 2021-01-05 16:18:21 +05:00
Ali Akbar
40fdf46f81 update after IM security fixes 3 (#25983) 2021-01-05 16:12:05 +05:00
Muhammad Soban Javed
dd534a90e5 Added celery task documentation (#25926)
* Added celery task documentation
2021-01-05 14:32:52 +05:00
edX requirements bot
5c186507c3 Python Requirements Update (#25977)
* Updating Python Requirements

* Fixing test failure.

* Update timezone count for new pytz version

Co-authored-by: Awais Qureshi <awais.qureshi@arbisoft.com>
Co-authored-by: usamasadiq <usama.sadiq@arbisoft.com>
2021-01-05 14:12:03 +05:00
Saad Yousaf
c9c2c3b8e4 Merge pull request #25963 from edx/saad/TNL-7749
[TNL-7749] - Remove italic styling for warning msg on expired state for ID verification card (Rebrand).
2021-01-05 14:07:24 +05:00
irfanuddinahmad
6e7c23d1cb Updated requirements with new edx-enterprise version 2021-01-05 13:58:54 +05:00
SaadYousaf
0809b6338e [TNL-7749] - Remove italic styling for warning msg on expired state. 2021-01-05 13:34:56 +05:00
edx-pipeline-bot
0b4fe3bfc3 Merge pull request #25980 from edx/private_to_public_d93abb8
Mergeback PR from private to public.
2021-01-05 02:39:44 -05:00
Ali-D-Akbar
6cdcfb9f72 Merge branch 'master' into private_to_public_d93abb8 2021-01-05 11:43:25 +05:00
Zainab Amir
d5c9536f0a send in-active user details on auth failure (#25931) 2021-01-05 10:33:04 +05:00
Michael Terry
d000eb4f67 AA-505: Some design updates for courseware "shift dates" UI
- Makes the action buttons underneath problems into link buttons
  instead of push buttons. Per UI team
- Updates some colors of status pills like "Past due" or "Completed"
2021-01-04 13:29:58 -05:00
Ali Akbar
278e66e34c disable xsslint (#25951)
* disable xsslint

* fix quality errors

* disable xsslint
2021-01-04 22:48:22 +05:00
Adam Stankiewicz
3ff5fc7d5f bump edx-enterprise to 3.16.3 (#25969) 2021-01-04 11:01:26 -05:00
Ali Akbar
d93abb8d6e Merge pull request #212 from edx/IM/security-fixes-3
Incident Management Security Fixes 3
2021-01-04 18:41:49 +05:00
Feanil Patel
db152dda45 Merge pull request #25908 from edx/feanil/sandbox-py2-code
Remove py2 requirements.
2021-01-04 08:09:36 -05:00
Awais Qureshi
2b3ab8846f Merge pull request #25961 from edx/awais786/fixing-test-failure
Fixing test failure due to 31-dec-2020 date issue
2021-01-04 18:01:04 +05:00
Awais Qureshi
0423434132 Fixing test failure. 2020-12-31 15:11:00 +05:00
edX Transifex Bot
6aa37e2b4d geoip2: update maxmind geolite country database 2020-12-30 16:28:51 -05:00
edX Transifex Bot
e19f474e54 geoip2: update maxmind geolite country database 2020-12-23 16:28:39 -05:00
Awais Jibran
90776770dc Revert ".is-hidden" CSS hack and related hint fix (#25938)
Reverts two PRs:
* "Fix hiding of completion/bookmark indicators in legacy courseware (#25919)"
* "Fix hint show" (#25930)

TNL-7845
2020-12-23 11:35:25 -05:00
David Ormsbee
5dac11948a Add user_tasks to LMS (for Django admin access). (#25933)
The user_tasks app is used by Studio import/export and not used by
anything in the LMS. But because our app-permissions user/role
provisioning script invokes the LMS process, any app+permission
listed there must exist in the LMS or the provisioning fails. So
this commit adds the user_tasks app to the LMS list of installed
apps because it's a lot faster than getting app-permissions to do
the right thing.
2020-12-22 15:38:19 -05:00
Diana Huang
037b09ace5 Merge pull request #25904 from edx/diana/update-edx-lint
Upgrade python requirements.
2020-12-22 11:46:15 -05:00
Diana Huang
f6085e5139 Bump threshold limits due to previously broken pylint. 2020-12-22 11:12:27 -05:00
Awais Jibran
da318c4de2 Merge pull request #25930 from edx/aj/fix-hint-show
Fix hint show
2020-12-22 20:22:14 +05:00
Diana Huang
a4ca84e92a Add DJANGO_SETTINGS_MODULE to pylint runs. 2020-12-22 09:41:24 -05:00
Diana Huang
7a3ead747e Upgrade python requirements. 2020-12-22 09:41:24 -05:00
Awais Jibran
409a3c799f Update display.js
fixes quality
2020-12-22 16:19:15 +05:00
Awais Jibran
278a5d0e5c Fix hint show 2020-12-22 15:31:15 +05:00
Adam Stankiewicz
26de4961ab bump edx-enterprise to 3.16.2 (#25928) 2020-12-21 16:33:21 -05:00
Simon Chen
78407b4a8f MST-400 Update the support verification_api to provide the correct status under the same API used by learner (#25917) 2020-12-21 09:14:57 -05:00
Usama Sadiq
f2d4ccf49e Merge pull request #25923 from edx/jenkins/upgrade-python-requirements-0c376e5
Python Requirements Update
2020-12-21 15:13:04 +05:00
edX requirements bot
39814ae0bf Updating Python Requirements 2020-12-20 23:57:15 -05:00
stvn
0c376e578d Merge PR #25913 origin/bd03/model/is_enabled
* Commits:
  Add get-accessor helper for discussions plugins
  Add is_enabled helper for discussions plugins
2020-12-18 15:39:40 -08:00
Kyle McCormick
a03bb13492 Fix hiding of completion/bookmark indicators in legacy courseware (#25919)
In the edx.org-next theme, the completion green check-
marks and the little bookmark icons were appearing on every
single unit. This was because a fontawesome CSS rule
in the new theme was overriding the `display: none`,
as set by `.is-hidden`, to be `display: inline: block`.

The fix is to add `!important` to a couple definitions
of `.is-hidden`. Definitely somewhat hacky, but this is
SCSS that we plan to deprecate at some point anyway.

TNL-7823
2020-12-18 17:08:13 -05:00
Feanil Patel
ea78e44029 Update sandbox requirement mechanism.
We seperated base and py35 as a part of the upgrade to python 3 so
that we could get newer versions of some requirements during that
upgrade.  This change is the first step in removing the old requirements
files that were only relevant to python 2.

We leave the python version centric named files instead of base because
we'll need to bump the version of this file regularly and clearly
indicating what version of python it's for makes it easier to reason
about.
2020-12-18 13:33:02 -05:00
David Ormsbee
bb0492e598 Merge pull request #25338 from open-craft/nizar/xframe_allow_whitelist
Sets default X-Frame-Options for login and registration forms to environment setting
2020-12-18 12:39:08 -05:00
Kyle McCormick
54d5f7f394 Course Blocks API: Fix handling of incorrectly-cased course keys (#25911)
Commit 7f59688 attempted to solve this using
`CourseOverview.course_exists`, but that check is case-
insensitive. This commit instead does a small refactor
to `lms.djangoapps.courseware.get_course` so that we can
handle a failed course lookup without broadly catching
a `ValueError`.
2020-12-18 11:26:29 -05:00
Ali-D-Akbar
c754f20dac PROD-2199 2020-12-18 20:48:05 +05:00