Commit Graph

7928 Commits

Author SHA1 Message Date
Shadi Naif
4df2073376 Fix exceptions raised when a lazy text is used in json dump 2018-11-05 12:24:45 +02:00
jerry
a104eb8e8c fix: closed caption can't move when mutiplevideos in one page 2018-11-05 11:00:15 +08:00
Nimisha Asthagiri
ab9587dce8 Merge pull request #19058 from stvstnfrd/kill/image-modal/deprecate-upstream
Deprecate ImageModal HtmlModule
2018-11-04 10:09:00 -05:00
Ned Batchelder
8acea435cf setUpClassAndTestData is tricker than pylint understands 2018-11-02 11:06:59 -04:00
Bessie Steinberg
2aa3129adc Merge pull request #19166 from edx/rev/content-gating-waffle
Rev/content gating waffle
2018-10-31 14:50:15 -04:00
Bill Filler
cab11bde68 Merge pull request #19138 from edx/ziafazal/WL-1830
WL-1830: change min-height of video player to support mobile devices
2018-10-31 14:34:00 -04:00
Calen Pennington
83d676cbfa Add Content Type Gating Behind Waffle Flag
Content Type Gating: Xblocks that have a graded component cannot be
accessed by audit track users.
  - Caveats:
    - In studio, instructors can set certain xblocks to be available to
      all users, but graded components will default to not being
      available for audit users
    - If a course does not have a verified mode option, all users will
      have access to graded content.

The Waffle Flag: The waffle flag is of for now.
  It's name is: ```content_type_gating.debug```

This Commit Does NOT Include: Displaying for a user WHY they do not have
access to a specific piece of content.  That change will be part of
another PR.
2018-10-31 12:34:48 -04:00
Calen Pennington
f9dd7fe223 Allow Studio override of Feature Based Enrollment status for individual xblocks 2018-10-29 12:37:30 -04:00
Calen Pennington
99f8918b74 Add an automatic UserPartition and Scheme for Content Type Gating.
For now, this UserPartition groups all users as Full-access users.
2018-10-29 12:37:30 -04:00
George Babey
f39cd81a31 Merge pull request #18545 from open-craft/kshitij/stylelint-fixes
Bulk stylelint fixes
2018-10-22 14:59:11 -04:00
Zia Fazal
77a39f4820 min-height 158 px to remove empty space on mobile device
setting min-height 158 px to remove empty space at the bottom on mobile devices 320px wide.
2018-10-22 15:51:55 +05:00
Michael Youngstrom
49e287b703 Merge pull request #19131 from edx/youngstrom/mongo-tweaks
Use uuid instead of randint for db names in Mongo builders
2018-10-19 15:57:00 -04:00
Michael Youngstrom
cc1d389f21 Replace randint in db name with pid 2018-10-19 14:24:27 -04:00
Cory Lee
305167cd86 Removing unnecessary log statements 2018-10-18 11:08:54 -04:00
Calen Pennington
969728874b Merge pull request #19065 from cpennington/access-control-messaging
Access control messaging
2018-10-12 11:21:34 -04:00
Calen Pennington
2ce5417e0c Allow UserPartitions to specify a text or html message when a user is denied access because of their partition membership 2018-10-11 09:54:12 -04:00
Calen Pennington
72f556c1a9 Import courseware module from fully-qualified module name 2018-10-10 15:34:33 -04:00
stv
9112de2309 Deprecate ImageModal HtmlModule
Stop displaying the template in CMS.

This has no effect on already-existing components; it merely prevents
new components from being created with this template.

All functionality has been replaced by the XBlock version [1][2].

Backstory:

This was written by Stanford, circa 2013; it was always a bit of
a hack. While it masquerades as if it were an XBlock/XModule, it's
really a YAML template for the HTML module. It depends on JS/CSS
that is embedded as a first-class citizen of the platform. This has
all caused confusion. Worse, it's a pain to edit/configure/update,
since it uses none of the XBlock infrastructure.

Nearly two years ago, we XBlock-ified the component and have
been running it ever since [1][2]. As such, we no longer support
this "component" and would suggest edX follow suite. Consider this
a request-for-comments on the path forward.

Process:

Deprecation of this module would follow a few steps:

1. Prevent new components from being added in Studio with this template.
    - This PR represents step 1.
    - This is backward compatible; it will have no effect on
      existing components.
2. (optional) Install the XBlock version.
    - This allows new ImageModal components to be added, now via the
      XBlock.
3. (optional) Identify and convert existing HTML modules to XBlocks [3].
    - We have enough of the legacy components in use that we can't
      just break support by removing this feature; we need a
      conversion process.
    - Because these are really just HTML modules with special
      contents, we have to query based on file contents (see, I told
      you this thing was hacky!):
        - All such components must contain an HTML anchor tag with
          the class `modal-content`.
    - Beyond the query, we don't intend to automate the actual
      conversion. Our use of the original component is limited
      enough that it's probably not worth converting from one module
      type to the other. Exacerbating the situation, because it's
      HTML, other changes could have been made to the module that
      would prevent automatic parity. As such, we'll work with our
      CoureOperations team to convert these manually at Stanford.
4. Remove all references.
    - At this point, we can safely remove all supporting static
      assets like CSS, JS, etc.
5. Enjoy less technical debt.

[1] https://github.com/Stanford-Online/xblock-image-modal
[2] https://pypi.python.org/pypi/xblock-image-modal/
[3] The one saving grace of the legacy component is that it was designed
    to degrade gracefully. Specifically, the HTML itself is just an
    image inside a link. The extra platform JavaScript progressively
    enhances the display, if the relevant CSS classes are found. As
    such, even if you removed all supporting CSS/JS from the platform
    tomorrow, existing legacy components would simply render as an image
    that links to a larger copy of itself. This is deemed an acceptable
    failure mode; graceful degradation FTW!
2018-10-03 16:47:38 -07:00
Calen Pennington
5b7e59e02b Return an unresolved promise when loading javascript resource urls in ConditionalModule 2018-09-19 15:00:51 -04:00
Amir Qayyum Khan
0e2febbce2 OLX export: Reverted url_name from a constant to course run
- New exported courses include course run information in:
  - `url_name` of root course node
  - file name of root node in course folder
  - root key name in policy.json
  - directory name inside policies folder

- when imported via management command, the OLX will overwrite an
available existing course with the same course key (i.e. same org,
course number and course run)
  - if there is no matching course, one will be created

- when imported via the studio web ui (or import API), the OLX will
replace the current course (no change in behavior)

- courses exported with this commit have been tested to import via
management command and studio web UI in hawthorn and ginkgo releases.
They should also work in prior releases, but have not been tested.
2018-09-14 14:50:40 +05:00
Calen Pennington
5b71d4408b Merge pull request #18902 from cpennington/fix-educator-3262-v3
Load all webpack chunks into fragments as correctly-typed resources
2018-09-13 10:11:26 -04:00
Calen Pennington
461f35255c fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-12 21:54:19 -04:00
Nimisha Asthagiri
700a902b68 Cleanup and remove deprecated RequestCache Django app
ARCH-223
2018-09-12 14:39:11 -04:00
Calen Pennington
db2078ed2f fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-12 14:27:54 -04:00
AsadAzam
3c04f41de4 Merge pull request #18877 from edx/asad/educator-3335-fix-download-transcript-500-error
Fixed download transcript 500 error
2018-09-12 22:02:09 +05:00
Calen Pennington
9c32073e9b fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-11 13:56:05 -04:00
Qubad786
71e40eb798 dont stop loading on pause 2018-09-11 19:33:25 +05:00
muhammad-ammar
d23e8a3ed8 fix poster display issue with hls
EDUCATOR-2606
2018-09-11 19:33:25 +05:00
asadazam93
0ec8e38422 Fixed download transcript 500 error 2018-09-11 16:04:35 +05:00
Simon Chen
af3e5ba4c3 Merge pull request #18149 from mitodl/pdpinch/expose-attempts
Expose attempt number to python custom grader
2018-09-10 15:50:28 -04:00
Robert Raposa
ba4cc62ff8 Retire deprecated RequestCache (Take 2)
ARCH-223
2018-09-08 15:09:28 -04:00
Calen Pennington
e6f11072b0 fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-07 09:24:35 -04:00
Calen Pennington
41c71505e3 Load all webpack chunks into fragments as correctly-typed resources 2018-09-06 15:47:13 -04:00
Calen Pennington
139d40b76b Merge pull request #18854 from cpennington/cale/edu-3262-logging
Log conditional xblock fragment resource loading
2018-09-05 10:40:49 -04:00
Qubad786
89925a96dc use waffle_flags from video pipeline and fix tests 2018-09-04 19:07:03 +05:00
muhammad-ammar
809175d4cf add support to enable/disable hls as primary playback
EDUCATOR-2714
2018-09-04 19:07:03 +05:00
Nimisha Asthagiri
4ca165f690 Revert "ARCH-223: Retire deprecated RequestCache." 2018-08-30 16:33:03 -04:00
Jolyon Bloomfield
9981b153b3 Remember to add changes before committing... 2018-08-30 16:22:50 -04:00
Jolyon Bloomfield
28e64d95cc Handle situation where attempts have been reset to 0 and problem is regraded; Update comments 2018-08-30 16:21:23 -04:00
Peter Pinch
3763d26651 clarify comments 2018-08-30 15:57:42 -04:00
Nimisha Asthagiri
8459982512 Merge pull request #18847 from edx/robrap/ARCH-223-replace-request-cache
ARCH-223: Retire deprecated RequestCache
2018-08-30 12:59:49 -04:00
Robert Raposa
3df339a56a Retire deprecated RequestCache.
ARCH-223
2018-08-30 08:55:19 -04:00
Calen Pennington
8878edea26 Log conditional xblock fragment resource loading 2018-08-29 13:46:17 -04:00
rabiaiftikhar
72cba77bbb EDUCATOR-3030 donot submit completion for grader's response while updating problem score. 2018-08-29 16:04:28 +05:00
Peter Pinch
ddd8d41906 expose attempts to python custom grader 2018-08-27 11:49:55 -04:00
Michael Youngstrom
52a8c9703b Maintain ignore file tests without storing themn on platform 2018-08-17 16:05:28 -04:00
Michael Youngstrom
75bd297337 Merge pull request #18795 from edx/youngstrom/try-unique-db
Use a unique name for test mongo dbs
2018-08-17 11:23:15 -04:00
Michael Youngstrom
4575c351cc Use unique db names for mongo tests 2018-08-17 10:38:37 -04:00
Calen Pennington
228868acc7 Merge pull request #18799 from edx/cale/fix-educator-3262-again
Cale/fix educator 3262 again
2018-08-17 09:54:30 -04:00
Calen Pennington
865e43edf3 Delay initialization of XBlocks until after all fragments have been rendered 2018-08-17 09:16:47 -04:00