Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,240 Commits 1 Branch 0 Tags
862e1a37d4782d03f5465d6c19ccf331ed73e33e
Commit Graph

9118 Commits

Author SHA1 Message Date
Alex Wang
9b74414893 Deprecate relevant course fields after the new exam setting is enabled (#24500) 
mst-292
 2020-07-21 09:18:51 -07:00
Awais Jibran
de49eb7059 Merge pull request #24549 from edx/update-logs 
Updating ProblemClose Log.
 2020-07-21 11:23:24 +05:00
Awais Jibran
0b9087346b Updating ProblemClose Log. 2020-07-20 23:27:09 +05:00
Awais Jibran
c90e8231d0 Merge pull request #24540 from edx/aj/bug-fix-capa-ec 
bug: fix an edge case in capa problem tolerance
 2020-07-20 16:28:27 +05:00
Awais Jibran
5ad10d4555 Update log / problem closed. 
PROD-1586
 2020-07-20 15:29:18 +05:00
Awais Jibran
e2b60e1c97 bug: fix an edge case in capa problem tolerance 
PROD-1586
 2020-07-20 15:27:47 +05:00
Matthew Piatetsky
1fec3b997b Revert "[REV-774] Show content type gating upsell when a limited access learner tries to access a timed exam" 2020-07-15 15:43:57 -04:00
Michael Terry
939f268da8 AA-225: Only consider scored items for past due assignments 
When considering if an assignment is past due for the dates tab,
only look at the scored and graded units in the subsection (i.e.
ignore reading and video units).

This still leaves the "complete" field alone -- i.e. those
subsections will still be left incomplete generally. But for
assignment-focused tasks, they will instead be considered complete.
 2020-07-14 15:04:19 -04:00
David Ormsbee
3b6965599c Merge pull request #23910 from open-craft/samuel/fix-get-video-subs 
SE-2589 fix AttributeError: 'LibraryLocatorV2' object has no attribute 'make_asset_key'
 2020-07-10 14:59:30 -04:00
Usman Khalid
4cc0f30db7 Convert WordCloudDescriptor and WordCloudModule into WordCloudBlock. 2020-07-09 09:46:54 +05:00
Samuel Walladge
34516b9660 Consolidate get_transcript methods 
There were two get_transcript methods. The broken one that was being
used (VideoTranscriptsMixin.get_transcript) is stripped out here - it
has been superseded by transcripts_utils.get_transcript. The latter
includes support for blockstore and VAL, while the former did not.

This fixes the `AttributeError: 'LibraryLocatorV2' object has no
attribute 'make_asset_key'` error seen when attempting to load a
transcript from a video through the xblock api when the video had the
transcript stored in blockstore.

Note that if you were previously using video.get_transcript, you should
now use `transcripts_utils.get_transcript(video, ...)`, and note that
the returned 'filename' will be prefixed with the language code, as
other `get_transcript*` functions already do.
 2020-07-03 08:20:55 +09:30
Dillon Dumesnil
35549f56ba AA-220: Making Library Content an Aggregator CompletionMode 
This change will prevent Library Content from being marked as
complete on view and the corresponding version bump to
edx-completion contains code that will start looking at the
children of the library content for completeness.
 2020-07-01 17:33:54 -04:00
Zachary Hancock
bcc1ddd375 add proctoring escalation contact setting (#24243) 2020-06-24 16:02:17 -04:00
Awais Qureshi
af3691ed52 Merge pull request #24311 from eduNEXT/eric/bom-1748 
[BD-6] Order VideoBlock html metadata alphabeticallly to fix test.
 2020-06-24 22:31:36 +05:00
Dillon Dumesnil
a7dff8c21e Merge pull request #24303 from edx/ddumesnil/due-dates-in-courseware-AA-44 
AA-44: Adding due dates into courseware
 2020-06-24 09:22:01 -07:00
Luis Moreno
ba297ab16c Solve quality issues 2020-06-24 12:10:09 -04:00
Eric Herrera
c40aa67fd0 Order VideoBlock html metadata alphabeticallly to fix test. 2020-06-24 12:07:55 -04:00
Dillon Dumesnil
7f6a2518cb AA-44: Adding due dates into courseware 
Due dates will only display for graded subsections.
If the assignment has already been completed, there will be a pill
to indicate that. If the assignment is past due, there will be a
pill. If it is upcoming, there are no pills
 2020-06-24 08:26:52 -07:00
M. Zulqarnain
39b109a9ad Fixed bad escape character (#24316) 
As of Python 3.7, a backslash-character pair that is not a valid escape sequence now generates an error, earlier it was a deprecation warning.
 2020-06-24 18:23:11 +05:00
Awais Qureshi
b7500cd2a0 Merge pull request #24268 from eduNEXT/lmm/safe_exec 
[BD-6] Fix test for python3.8
 2020-06-24 13:39:35 +05:00
Matthew Piatetsky
b3c2d37dcc Merge pull request #24214 from edx/REV-774 
[REV-774] Show content type gating upsell when a limited access learner tries to access a timed exam
 2020-06-23 11:48:31 -04:00
Luis Moreno
1d557616b1 Fix test for python3.8 2020-06-23 10:16:37 -04:00
Matthew Piatetsky
78317ca115 Show content type gating upsell when a limited access learner tries to access a timed exam 
Otherwise, these learners could start the timer and then be unable to take the exam once they have access to the content
REV-774
 2020-06-22 16:18:58 -04:00
leomartinez2019
943bd6f15b Fixing cgi.escape DeprecationWarning 
- Change cgi.escape to html.escape

- Add quote=False to html.escape

- Use function HTML() to address python-wrap-html warning
 2020-06-22 14:41:27 -04:00
Michael Roytman
361a2c92b3 Merge pull request #24266 from edx/mroytman/course-fields-exclude-list 
rename blacklist/whitelist to exclude list/include list in Course Met…
 2020-06-19 16:42:10 -04:00
Michael Roytman
6a21cd3f91 rename blacklist/whitelist to exclude list/include list in Course Metadata class 2020-06-19 14:33:41 -04:00
David Ormsbee
e69a5fce56 Merge pull request #24220 from open-craft/samuel/fix-youtube-metadata-api 
SE-2634 Fix crashes in yt_video_metadata
 2020-06-19 12:24:28 -04:00
David Ormsbee
0b4cf7e06c Merge pull request #23039 from open-craft/samuel/fix-unescaped-selector 
SE-2176 Fix elem not selected if id contains special chars
 2020-06-19 12:13:20 -04:00
Luis Moreno
398a8a2b23 Fix python 3.8 compatibility 2020-06-17 16:08:20 -04:00
Samuel Walladge
43f0cd72af Merge remote-tracking branch 'origin/master' into samuel/fix-unescaped-selector 2020-06-16 09:52:38 +09:30
Samuel Walladge
4da0c64cc3 Fix crashes in yt_video_metadata 
- yt_video_metadata returned a generic non-json-api-friendly 500 error
  when called on a non-youtube video
- load_metadata_from_youtube was crashing when called from the xblock
  yt_video_metadata endpoint. It passes a webob request, which has a
  different api for retrieving the http referer.
 2020-06-15 17:29:57 +09:30
David Ormsbee
4f3a45f444 Revert "[BB-112] Fix the unpredictable order randomization issue with randomized content blocks" 2020-06-08 16:47:35 -04:00
David Ormsbee
d507a5cd99 Merge pull request #23265 from open-craft/guruprasad/BB-112-fix-randomized-content-block-order 
[BB-112] Fix the unpredictable order randomization issue with randomized content blocks
 2020-06-08 10:11:48 -04:00
Feanil Patel
a88da3b5cd Merge pull request #24089 from edx/feanil/improve_import_error_logging 
Log what thing we failed to import.
 2020-05-29 15:52:45 -04:00
Feanil Patel
c15fae3564 Log what thing we failed to import. 
This should help more quickly narrow down where things are failing on an import.
 2020-05-29 13:24:10 -04:00
Dillon Dumesnil
826d5fe3da AA-167: Making the LTI icon class dynamic 
We will now show the problem icon if the LTI problem
is scored and 'other' if it is not.
 2020-05-28 07:18:18 -07:00
Ahtisham Shahid
1e103b2fdd Merge pull request #23996 from edx/ahtisham/PROD-1540 
Fixed Import error due to pre tag
 2020-05-20 21:56:34 +05:00
Ahtisham Shahid
4f5496f02c Fixed Import error due to pre tag 
Fixed regex for nested pre tags

Updated import export test

fixed quality test issue

fixed No exception type(s) specified

updated tests

fixed linter issue

fixed linter issue

fixed linter issue
 2020-05-20 13:17:53 +05:00
Guruprasad Lakshmi Narayanan
5a2b607ea6 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.
 2020-05-20 13:07:57 +05:30
Ben Warzeski
7778347aed remove old_format from team config tests 2020-05-15 14:44:23 -04:00
Awais Jibran
0dc5bacfb4 Adding logs in capa_base 2020-05-13 22:09:51 +05: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
Ned Batchelder
3d179a0666 Merge pull request #22539 from open-craft/pooja/fix-autoadvance-not-working-for-hls-videos 
Enable auto start for HLS if autoadvance is set
 2020-05-11 11:52:52 -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
mariajgrimaldi
4bf975fdd8 changed count to count_documents (#23945) 
This PR contributes to the elimination of deprecation warnings, specifically the one mentioned above and reported in the Warnings Report: https://build.testeng.edx.org/job/edx-platform-python-pipeline-master/warning_5freport_5fall_2ehtml/ .

Changed collection.find(filter).count() to collection.count_documents(filter) in the following file:

    common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py

And collection.find(filter).limit(1).count() to collection.count_documents(filter, limit=1) in the following file:

    common/lib/xmodule/xmodule/modulestore/mongo/draft.py

The method count_documents is part of the collection, not the cursor (find returns a cursor), according to StackOverflow (https://stackoverflow.com/questions/56303331/warning-message-in-pymongo-count-is-deprecated). Because of that after changing count, I removed the calling to the find method and use the filter parameter in count_documents. Also, I removed limit because count_documents accepts limit parameter.

This warning occurs due to deprecation: https://pymongo.readthedocs.io/en/3.9.0/api/pymongo/collection.html#pymongo.collection.Collection.count_documents
 2020-05-11 08:28:45 -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
Shadi Naif
7142d55b1a Missing translation function call 2020-05-07 14:32:50 +03:00
Simon Chen
262574b815 Move all the upgrade display logic into courseware.utils 2020-05-05 17:54:22 -04:00
Simon Chen
f8cc58618a Create a new plugin manager called DynamicPartitionGenerators to remove the dependency of openedx.features.content_type_gating by xmodule.partition_services 2020-05-04 11:16:26 -04:00