Commit Graph

9300 Commits

Author SHA1 Message Date
Nimisha Asthagiri
b842d4b1f1 Colocate Modulestore docs with modulestore code 2018-12-05 11:08:33 -05:00
Calen Pennington
31047260cc Switch ContentTypeGatingConfig.enabled_as_of and CourseDurationLimitConfig.enabled_as_of to datetimes 2018-11-30 10:02:53 -05:00
rabiaiftikhar
6fbd86108c EDUCATOR-2303 allow learners to see gated banner before starting proctored or timed exam 2018-11-28 14:11:17 +05:00
Simon Chen
8941f8afbf Handle the case where assignment type is not in default_labeler 2018-11-27 12:53:28 -05:00
Alex Dusenbery
009074ec4b Add an /api/courses/v1/grading endpoint to get assignment type and subsection info about a course. 2018-11-26 10:12:12 -05:00
Gabe Mulley
1441cba962 Merge pull request #19272 from edx/reve-37/prevent-studio-edits
REVE-37: prevent studio edits to feature based enrollments
2018-11-26 09:57:23 -05:00
Gabe Mulley
5177e994c8 REVE-37: Prevent modifications to feature based enrollment user partitions 2018-11-25 21:42:02 -05:00
Calen Pennington
0cb48dfe1c Add StackedConfigurationModels for managing content_type_gating and course_duration_limits 2018-11-21 12:18:10 -05:00
Cali Stenson
4dcda2858e Add group partitions information to user metadata in the dom.
This information will inform our A/B testing and experiments.

REV-612
2018-11-16 16:34:17 -05:00
Cali Stenson
ecb052125c Move get_user_partition_groups to partition_services to call
from multiple contexts.
2018-11-16 16:28:07 -05:00
rabiaiftikhar
633a3a5dfd EDUCATOR-3615 make code defensive if self.child is None in log_child_render method 2018-11-14 18:49:44 +05:00
Awais Jibran
194c6bacb6 Revert "Merge pull request #18720 from open-craft/paulo/anonymous-views"
This reverts commit f9ae594dfe, reversing
changes made to 7c08e50fde.
2018-11-09 22:49:14 +05:00
Ned Batchelder
644cf1e60a Merge pull request #19237 from edx/nedbat/remove-unused-imports
Remove unused imports
2018-11-08 09:56:57 -05:00
Ned Batchelder
046fe60913 Remove unused imports 2018-11-07 10:31:51 -05:00
Farhanah Sheets
95aa21870d Merge pull request #18431 from jerrybox/master
fix: closed caption can't move when mutiple videos in one page.
2018-11-07 08:46:30 -05:00
Usman Khalid
d65c9a331a Disable xss-lint false positives in x_module.py. 2018-11-07 16:19:46 +05:00
Paulo Viadanna
e6e0a02e0a Adds CouseModule.course_visibility and XBlock.public_view() for unenrolled users access to courses.
The course_visiblity field can have one of three values:
1. private (default): This keeps the standard access rules.
2. public_outline: Allows unenrolled and anonymous users access to the outline.
3. public: Allows unenrolled and anonymous users access to both outline and
   course content.

When an unenrolled user accesses course content, instead of student_view(),
public_view() is used. A default implementation is provided for XBlocks
which do not implement this view. The public_view() must not have any
functionality which assumes the presence of a valid User and should show
a readonly only interface for the XBlock content.
2018-11-07 16:18:39 +05:00
Ned Batchelder
63b43ce4e4 Merge pull request #19072 from shadinaif/fix_lazy_text_with_json_dumps
Fix exceptions raised when a lazy text is used in json dump
2018-11-05 06:20:05 -05:00
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
Ned Batchelder
2d438d8bb5 Fix 'W605 invalid escape sequence' errors from pycodestyle 2018-11-02 06:06:43 -04:00
Ahmed Jazzar
b16b4eb4e7 Upgrade bleach to 2.1.4
Update ORA2 repo version

Fix Python tests

Upgrade Recommender XBlock version

Remove unnecessary requirements and update bleacher usage

Keep html5lib unpinned

Upgrading requirements

Ignore python-interpolate-html for bleached html
2018-10-31 12:24:22 -07: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
44c6936ecb Merge pull request #18950 from cpennington/fix-educator-3262-v4
Return an unresolved promise when loading javascript resource urls in…
2018-09-19 19:14:15 -04:00
Calen Pennington
5b7e59e02b Return an unresolved promise when loading javascript resource urls in ConditionalModule 2018-09-19 15:00:51 -04:00
Peter Pinch
b43f2242ad more descriptive error messages for UndefinedVariable 2018-09-17 17:14:25 -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