Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,754 Commits 1 Branch 0 Tags
549941e6080b3a5bf43bf06db59101e52ea8d00a
Commit Graph

16452 Commits

Author SHA1 Message Date
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
David Ormsbee
f9ae594dfe Merge pull request #18720 from open-craft/paulo/anonymous-views 
Support for anonymous_view
 2018-11-07 08:45:15 -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
63d84d65e5 Merge pull request #19215 from edx/nedbat/remove-unused-imports 
Remove unused imports
 2018-11-06 13:57:46 -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
3353e7425e Remove unused imports 2018-11-03 16:07:05 -04:00
Ned Batchelder
8acea435cf setUpClassAndTestData is tricker than pylint understands 2018-11-02 11:06:59 -04:00
Ned Batchelder
9fc2e9b000 Merge pull request #19208 from edx/nedbat/fix-pycodestyle 
Fix pycodestyle violations
 2018-11-02 10:06:04 -04:00
Jeremy Bowman
31e6a04a83 Merge pull request #19203 from edx/jmbowman/TE-2802 
TE-2802 Make notes visibility toggling tests more reliable
 2018-11-02 09:52:27 -04:00
Ned Batchelder
2d438d8bb5 Fix 'W605 invalid escape sequence' errors from pycodestyle 2018-11-02 06:06:43 -04:00
Simon Chen
34fd4a65f0 Remove auto grade column from override modal 2018-11-01 15:37:06 -04:00
Jeremy Bowman
11c2185d90 TE-2802 Make notes visibility toggling tests more reliable 2018-11-01 14:57:38 -04:00
Jeremy Bowman
b14d9b4813 Merge pull request #19063 from open-craft/jazzar/bleach-upgrade 
Upgrade bleach to 2.1.4
 2018-11-01 09:47:39 -04:00
Feanil Patel
f323ab00ed Merge pull request #19194 from edx/feanil/revert_gunicorn_upgrade 
Revert "upgrade gunicorn 19.0 and make upgrade"
 2018-10-31 16:37:59 -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
Feanil Patel
4e13a1c2dd Revert "upgrade gunicorn 19.0 and make upgrade" 
This reverts commit f6c215ae5b.
 2018-10-31 15:01:00 -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
Matt Tuchfarber
9c0e8567f1 Merge pull request #19178 from edx/tuchfarber/REV-508 
Update course mode selection text for content gating
 2018-10-30 15:42:03 -04:00
Matt Tuchfarber
2f283c411b Update course mode selection text for content gating 2018-10-30 15:04:44 -04:00
Dillon-Dumesnil
1754dc5119 Merge pull request #19105 from edx/ddumesnil/unicode_cleanup 
Cleaning up unicode waffle flag
 2018-10-30 13:20:41 -04:00
Nadeem Shahzad
eea6a0488c Merge pull request #19173 from edx/nadeem/OPS-3445 
Upgrade gunicorn to 19.0 and make upgrade (OPS-3445)
 2018-10-30 18:56:24 +05:00
nadeemshahzad
f6c215ae5b upgrade gunicorn 19.0 and make upgrade 2018-10-30 10:42:58 +00:00
Simon Chen
4edbbbb66f Update the gradebook functionality to allow grades update. 
The override modal is now able to update grades for all users for each gradable unit in the course
 2018-10-29 15:00:35 -04:00
Calen Pennington
c02b195ff7 Merge pull request #19155 from edx/rev/allow-studio-content-gating-override 
Add Studio UI for tagging Full/Limited access contont
 2018-10-29 13:19:45 -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
Simon Chen
eb083a8475 Merge pull request #19163 from edx/schen/EDUCATOR-3582-comments 
Take away the comments column on grade override modal dialog
 2018-10-26 10:40:52 -04:00
Simon Chen
a9f4151d26 Merge pull request #19162 from edx/schen/EDUCATOR-3582-current_grade 
Remove the current_grades column that is not supported by backend
 2018-10-25 22:20:04 -04:00
Simon Chen
39fddf472e Take away the comments column on grade override 2018-10-25 15:16:54 -04:00
Simon Chen
95ea9d065e Remove the current_grades column that is not supported by backend 2018-10-25 14:53:26 -04:00
edx-cache-uploader-bot
2bad03fe0d Updating migrations 2018-10-25 13:08:02 -04:00
Dillon-Dumesnil
fbb5e6c99c Merge pull request #19139 from edx/ddumesnil/entitlements-email-opt-in 
Adding email opt in to create entitlement
 2018-10-24 09:50:12 -04:00
Attiya Ishaque
cc1898d189 Merge pull request #19144 from edx/ai/EDUCATOR-3581-discussion-loading-profile 
Fix that discussions are loading in the profile view.
 2018-10-24 17:28:13 +05:00
Dillon Dumesnil
ac43d5faac Adding email opt in to create entitlement 2018-10-23 17:33:30 -04:00
Matthew Piatetsky
073df570fa Merge pull request #19095 from edx/expired_dashboard_message 
Add course duration limit and dashboard expiration code
 2018-10-23 12:17:58 -04:00
attiyaishaque
fca88da078 Fix that discussions are loading in the profile view. 2018-10-23 12:40:58 +05:00
Matthew Piatetsky
9037999bd2 add content gating waffle flag 2018-10-22 20:49:08 -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
Saleem Latif
ec2a36b4a4 Third Party Authentication (SSO): Default values for SAML attributes 2018-10-22 11:03:01 +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
Simon Chen
fc24371b18 Merge pull request #19091 from edx/rir/masters-gradebook 
Add extesion engine gradebook ui in under the mastersGradebook route
 2018-10-19 13:37:32 -04:00
Dillon Dumesnil
0a0df72fc9 Cleaning up unicode waffle flag 2018-10-19 13:25:08 -04:00