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

47754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cali Stenson
549941e608 Add has access tests to content gating graded problem types. 
REV-492
 2018-11-07 09:08:46 -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
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
Nimisha Asthagiri
7c08e50fde Merge pull request #19229 from edx/arch/fix-studio-login 
Add JWT Signing Keys for Studio Login on Devstack
 2018-11-06 22:03:25 -05:00
Michael Youngstrom
6e2e5d0e03 Merge pull request #19233 from edx/youngstrom/fix-flaky-test 
Add waffle to installed_apps in openedx test settings file
 2018-11-06 15:50:38 -05:00
Douglas Hall
f0b63133d7 Merge pull request #19234 from edx/douglashall/devstack_cors_headers 
Set CORS_ALLOW_HEADERS in devstack settings.
 2018-11-06 15:32:27 -05:00
Douglas Hall
b0eb347c32 Set CORS_ALLOW_HEADERS in devstack settings. 2018-11-06 14:56:31 -05:00
Michael Youngstrom
5880fd36bc Add waffle to installed_apps for commonlib 2018-11-06 14:53:33 -05:00
Nimisha Asthagiri
116d3760b3 Add JWT Signing Keys for Studio Login on Devstack 2018-11-06 14:20:34 -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
edx-pipeline-bot
112a3d1bba Merge pull request #19228 from edx/release-mergeback-to-master 
Merge release back to master
 2018-11-06 09:40:47 -05:00
Douglas Hall
f4df64ef26 Merge pull request #19224 from edx/douglashall/fix_login_redirect_whitelist 
Add LOGIN_REDIRECT_WHITELIST setting to production settings.
 2018-11-05 15:18:16 -05:00
Douglas Hall
726b28d4fa Add LOGIN_REDIRECT_WHITELIST setting to production settings. 2018-11-05 14:31:56 -05:00
Farhanah Sheets
44f10be03c Unicode developer_message to handle Spanish failures 2018-11-05 14:00:07 -05:00
Calen Pennington
6c5ee7209c Merge pull request #19108 from cpennington/stacked-configuration-models 
Stacked configuration models
 2018-11-05 13:43:25 -05:00
Douglas Hall
82133433c5 Merge pull request #19211 from edx/douglashall/corsheaders_allow_methods 
Allow custom USE-JWT-COOKIE header on cross origin requests.
 2018-11-05 11:33:41 -05:00
Douglas Hall
0f125c7a62 Allow custom USE-JWT-COOKIE header on cross origin requests. 2018-11-05 10:56:22 -05:00
Ahsan Ul Haq
e04d1a7197 Merge pull request #19197 from edx/ahsan/LEARNER-6612-learner-profile-textarea-char-count 
About Me textarea character counter accessibility issue
 2018-11-05 20:02:25 +05:00
Ahsan Ulhaq
0c00416deb About Me textarea character counter accessibility issue 
LEARNER-6612
 2018-11-05 19:11:18 +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
edX Transifex Bot
c24185ec98 Update translations 2018-11-04 16:18:06 -05: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
Calen Pennington
e1ebb8fe71 Use -v during pip-compiles to get more useful debug information in the case of failures 2018-11-02 15:36:01 -04:00
Calen Pennington
8901bf4482 Add a facility for building stacked configuration models that control the same configuration on a Global, Site, Org and Course level 2018-11-02 15:36:01 -04:00
Ned Batchelder
c0e2fd676a Merge pull request #19175 from edx/nedbat/update-edx-lint 
Use latest edx-lint
 2018-11-02 15:18:58 -04:00
Ned Batchelder
6aed72823f Merge pull request #19209 from edx/nedbat/trim-trailing-comma 
Remove a mistaken trailing comma
 2018-11-02 11:39:38 -04:00
Ned Batchelder
083a8d3a52 We've re-enabled some warnings, so have to raise the limit 2018-11-02 11:06:59 -04:00
Ned Batchelder
8acea435cf setUpClassAndTestData is tricker than pylint understands 2018-11-02 11:06:59 -04:00
Ned Batchelder
59d78031d8 Fix trailing-comma-tuple warnings 2018-11-02 11:06:59 -04:00
Ned Batchelder
d0d904a2cc make upgrade 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
Saleem Latif
fcbe06a434 Merge pull request #19207 from edx/saleem-latif/ENT-1294 
ENT-1294: edx-enterprise version upgrade to 1.0.3
 2018-11-02 15:45:45 +05:00
Ned Batchelder
6f0b007ae3 Remove a mistaken trailing comma 2018-11-02 06:19:45 -04:00
Ned Batchelder
fae196a89b Don't use async as an identifier 2018-11-02 06:10:13 -04:00
Ned Batchelder
2d438d8bb5 Fix 'W605 invalid escape sequence' errors from pycodestyle 2018-11-02 06:06:43 -04:00
Saleem Latif
62051750f9 edx-enterprise version upgrade to 1.0.3 2018-11-02 12:45:17 +05:00
Simon Chen
428c061b07 Merge pull request #19200 from edx/schen/gradebook-no-auto-grade 
Remove auto grade column from override modal
 2018-11-01 16:14:58 -04:00
Bessie Steinberg
062b90c9ec Merge pull request #19204 from cpennington/fix-reve-68 
Don't add the ContentGatingPartition to group_access in content_type_…
 2018-11-01 15:55:14 -04:00
Brian Beggs
ab0326c9c7 Merge pull request #19199 from edx/bbeggs/ungdpr-password-reset 
Reset learners password when user is unGDPRed/unretired via django admin
 2018-11-01 15:45:27 -04:00
Simon Chen
34fd4a65f0 Remove auto grade column from override modal 2018-11-01 15:37:06 -04:00
Alex Dusenbery
53b60607d6 Gradebook data: generate a label attribute if none exists (like for ungraded content). 2018-11-01 15:31:48 -04:00
Calen Pennington
76859f04a8 Don't add the ContentGatingPartition to group_access in content_type_gating.field_overrides if the waffle flag is off 2018-11-01 15:20:15 -04:00
Brian Beggs
49015e6d1a Reset learners password when user is unGDPRed/unretired via django admin. 2018-11-01 15:09:36 -04:00
Jeremy Bowman
11c2185d90 TE-2802 Make notes visibility toggling tests more reliable 2018-11-01 14:57:38 -04:00