Commit Graph

18314 Commits

Author SHA1 Message Date
Saad Yousaf
66297177e6 Merge pull request #24843 from edx/saad/PROD-1991
[PROD-1991] - Add mgmt command to update entitlement mode.
2020-09-10 15:25:24 +05:00
uzairr
c68155f76f Modify the api response
Update the api response so that it cannot contain the response
in the form of HTML which may prove vulnerable for MFE in future.

VAN-14
2020-09-10 12:39:09 +05:00
edX cache uploader bot
df4ba9c8ba Updating Bokchoy testing database cache (#24935) 2020-09-08 20:19:51 +05:00
taliaedX
728d57aac2 Merge pull request #24888 from edx/trhodes/ENT-3350
SAML Configuration API endpoint (And Public Flag)
2020-09-08 10:42:45 -04:00
SaadYousaf
0a3faf08a0 add mgmt command to update entitlement mode. 2020-09-08 18:22:47 +05:00
Talia
9cbd1907ea SAML Configuration API endpoint + Public flag 2020-09-04 14:58:05 -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
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 Butterworth
6231bad22e Revert "Revert "[BD-10] [DEPR-92] Remove directories that includes pattern library."" (#24696) 2020-09-02 15:39:58 -04:00
Bill Currie
6edd28c73c Remove course bypass_home setting and references 2020-09-02 19:26:03 +02: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
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
Awais Jibran
a113dd2f90 Adding debug logs for CR-2618 2020-08-31 16:50:22 +05:00
edX cache uploader bot
7f9ba4c401 Updating Bokchoy testing database cache 2020-08-28 01:45:31 -04:00
edX cache uploader bot
f6c6a71959 Updating Bokchoy testing database cache (#24859) 2020-08-28 00:11:10 +05:00
edX Transifex Bot
a96b30d2e2 geoip2: update maxmind geolite country database 2020-08-26 17:03:40 -04:00
Matt Tuchfarber
c4cf0b9bb7 Refactor program type enrollment checks
Checking if a user was enrolled in a program type was using the `name`
field which is subject to be translated. This change allows for us to check by
the type's slug which will be constant. This also includes the addition
of api.py files for the course_modes, catalog, and programs apps.
2020-08-26 14:29:39 -04:00
stvn
3da9362ac8 Log and skip empty children when rendering library_content
instead of throwing an exception on None-access.
2020-08-24 10:04:25 -07:00
David Ormsbee
63567122fd Merge pull request #24149 from open-craft/mtyaka/video-transcript-cookies
Fix issues with video transcript panel
2020-08-24 12:37:07 -04:00
Waheed Ahmed
13b3764f20 Allow entitlements to be used past course has ended.
Allow entitlements to be used past the course has ended but
upgrade deadline is still in future for already enrolled
learners.

PROD-1497
2020-08-24 13:20:11 +05:00
Matjaz Gregoric
68eddcee38 Fix issues with video transcript panel
This fixes a bug where the video transcripts panel would be open on
page load even when no transcripts were present. It also cleans up the
code a bit to remove unused cookies and tries to reduce flickering of
the transcript panel.
2020-08-22 09:56:24 +02:00
Régis Behmo
288ccc6705 Fix creation of LTIProviderConfig object in admin
When attempting to create a "Provider Configuration (LTI)" object in the
django admin, the following 500 error was being triggered:

    "Either an icon class or an icon image must be given (but not both)"

This was caused by the `clean()` method of the mother class
(OAuth2ProviderConfig) which checked whether at least the icon_class XOR
icon_list attribute was well defined. In the case of the
LTIProviderConfig objects it isn't, but that's ok because this object
is not meant to be displayed in the login form.

To resolve this issue, we modify the `clean()` method to ensure that at
most icon_class or icon_image is set. Alternatively, we could have set
`visible = False` and then dropped the `visible` column from the
database, but it was deemed too risky.
unused.

Close CRI-205.
2020-08-21 09:51:12 +02:00
Felipe Montoya
7813850bc6 Merge pull request #24779 from msegado/master
Fix double-wrapped exception in capa/inputtypes.py
2020-08-20 14:48:23 -05:00
Dillon Dumesnil
d75fbde9e7 Merge pull request #24813 from edx/ddumesnil/xml-import-lcm-disable
Disable updating Library Content children during import
2020-08-20 09:10:42 -07:00
Dillon Dumesnil
79e96af197 Disable updating Library Content children during import 2020-08-20 07:26:27 -07:00
Awais Qureshi
8c43855cfe Merge pull request #24810 from edx/testeng/bokchoy_auto_cache_update_d2adb857a0d748001be791cd8e8b82219b4d943c
Bokchoy Testing DB Cache update
2020-08-20 17:47:01 +05:00
Ali Akbar
847cd4af8e Merge pull request #24806 from edx/aakbar/PROD-924
allow cursor to be in the whole text area
2020-08-20 14:55:44 +05:00
edX Transifex Bot
e6132cdf06 geoip2: update maxmind geolite country database 2020-08-19 17:13:30 -04:00
Ali-D-Akbar
183da5e020 allow cursor to be in the whole text area 2020-08-20 00:27:06 +05:00
edX cache uploader bot
322b572884 Updating Bokchoy testing database cache 2020-08-19 11:29:54 -04:00
Ali Akbar
38b1615484 Revert "allow cursor to be in the whole text area" 2020-08-19 18:14:45 +05:00
Ali-D-Akbar
c217d7c134 allow cursor to be in the whole text area 2020-08-19 15:37:15 +05:00
Martin Segado
b2a32bbb69 Fix double-wrapped exception in capa/inputtypes.py
(accidentally introduced in 07df64eb8c last year)
2020-08-13 16:01:11 -04:00
David Ormsbee
5d33501c82 Merge pull request #19986 from open-craft/kshitij/report-status
Inline problem response report status
2020-08-13 12:51:55 -04:00
edX Transifex Bot
d2693e09fd geoip2: update maxmind geolite country database 2020-08-12 17:07:17 -04:00
Kshitij Sobti
559ff54a06 Add UI to display report creation progress.
Adds an in-line status display for problem report generation progress.

Co-authored-by: Adam Kovari <adam@opencraft.com>
Co-authored-by: Eugeny Kolpakov <eugeny.kolpakov@gmail.com>
Co-authored-by: Kshitij Sobti <kshitij@sobti.in>
Co-authored-by: Braden MacDonald <braden@opencraft.com>
2020-08-12 19:05:31 +05:30
Manjinder Singh
c76ed6ae45 Extracting plugin app from edx-platform (#24678)
* Moving plugins infrastructure to edx-django-utils
This PR extracts the code that enables plugins in edx-platform and puts it in edx-django-utils. This is done to allow other IDAS to add plugin functionality.
2020-08-12 07:48:53 -04:00
Guruprasad Lakshmi Narayanan
149ebfec58 Fix the order randomization behaviour of Randomized Content Block
The Randomized Content Block XBlock only randomizes the selection of
the children blocks and has unpredictable randomization of
the order of the selected child blocks due to the usage of sets, which
are unordered, for storing the selected blocks. This becomes apparent
when all the available child blocks in a library are chosen for a
Randomized Content Block, to randomize just the order of the child
blocks and not just the selection of the blocks. The order of the
selected blocks ends up being similar for multiple learners.

This change modifies the XBlock to store the selected child blocks in
a list, instead of a set, after randomly shuffling them.

A new block structure transformer, ContentLibraryOrderTransformer has
been added to transform the order of the selected children XBlocks to
match the order of the selections made in the
ContentLibraryTransformer. This ensures that same correct randomized order
of blocks is also returned by the course blocks API.
2020-08-11 11:46:49 -04:00
Dave St.Germain
8795bb8c82 Merge pull request #24680 from open-craft/ahmed/fix-capa-dropdown-indexing
[TNL-6993] [BD-29]: Handle edge case where dropdown values are not being indexed
2020-08-11 11:35:29 -04:00
edX cache uploader bot
e36228db6b Updating Bokchoy testing database cache 2020-08-11 09:46:54 -04:00
Dillon Dumesnil
9602d405c4 Merge pull request #24740 from edx/ddumesnil/format-fix-mfe
Adding format to metadata for use in Learning MFE
2020-08-11 06:14:55 -07:00
Dillon Dumesnil
a6ab7141ca Adding format to metadata for use in Learning MFE 2020-08-10 10:14:35 -07:00
edX cache uploader bot
b09e90cf7a Updating Bokchoy testing database cache 2020-08-07 09:36:17 -04:00
DawoudSheraz
1947f2105b drop precentage column from VemPipelineIntegration model 2020-08-07 13:09:48 +05:00
DawoudSheraz
dae599b517 skip db test 2020-08-07 10:27:50 +05:00
Tim McCormack
b64c8c2283 ARCHBOM-1281: Vendor in AppleID backend to support Sign-In With Apple (#24623)
This version contains necessary fixes for validating the "audience"
component of the JWT, as seen in ARCHBOM-1281. (I believe we'll need to
pass both the App ID and the Service ID in an additional AUDIENCE "other
settings" key for this third-party-auth backend.)

Vendored from version 3.4.0 (9d93069564a60495e0ebd697b33e16fcff14195b)
social-core:
https://github.com/python-social-auth/social-core/blob/3.4.0/social_core/backends/apple.py

v3.4.0 is unreleased at this time (2020-07-28) and contains several
necessary bugfixes over 3.3.3 for AppleID, but also causes the
TestShibIntegrationTest.test_full_pipeline_succeeds_for_unlinking_testshib_account
test in common/djangoapps/third_party_auth/tests/specs/test_testshib.py
to break (somehow related to social-core's change 561642bf which makes
a bugfix to partial pipeline cleaning). ARCHBOM-1389 filed to address
this at our convenience.

Note: 3.4.0 was not released to PyPI due to a broken test, so we might
see a 3.4.1 when it's actually released:
https://github.com/python-social-auth/social-core/issues/485
2020-08-06 20:11:23 +00:00
Ahmad Bilal Khalid
30274b00e3 fixed nit 2020-08-07 01:03:42 +05:00