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

16483 Commits

Author SHA1 Message Date
Bill Filler
af8f1029cd Merge pull request #19293 from edx/bfiller/REVE-96 
Don't allow audit-only courses to expire
 2018-11-26 15:49:02 -05:00
Bill Filler
7b684106ba Don't allow audit-only courses to expire 2018-11-26 14:28:50 -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
brianhw
2445a38818 Merge pull request #19302 from edx/brian/fix-segment-host 
Fix synthesized URL emitted to Segment.
 2018-11-26 09:58:27 -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
Stu Young
32e5f2855f Merge pull request #19300 from edx/testeng/bokchoy_auto_cache_update_8f2fbeb4aa089dd756f7a7628d5cdecde61ec354 
Bokchoy db cache update
 2018-11-26 09:04:08 -05:00
Gabe Mulley
5177e994c8 REVE-37: Prevent modifications to feature based enrollment user partitions 2018-11-25 21:42:02 -05:00
Brian Wilson
48a3db7ffa Fix synthesized URL emitted to Segment. 
Add schema to URL synthesized from host and path.
 2018-11-22 02:40:02 -05:00
DawoudSheraz
e09fbab133 Avoid multiple mathjax loading on the discussion user profile page 2018-11-22 10:18:43 +05:00
edx-cache-uploader-bot
3d0b28e996 Updating migrations 2018-11-21 14:34:39 -05:00
Calen Pennington
0cb48dfe1c Add StackedConfigurationModels for managing content_type_gating and course_duration_limits 2018-11-21 12:18:10 -05:00
Matthew Piatetsky
2b2560f671 Merge pull request #19278 from edx/REV-620 
[REVE-620] handle case when list of programs for course is empty
 2018-11-20 17:57:24 -05:00
Alex Dusenbery
174d80ed25 Revert "Add extesion engine gradebook ui in under the mastersGradebook route" 
This reverts commit 0c8d66bb2a.
 2018-11-20 14:54:34 -05:00
Matthew Piatetsky
6f8090eadb handle case when list of programs for course is empty 2018-11-20 13:11:33 -05:00
brianhw
22b12b037a Merge pull request #19206 from edx/brian/segment-addpage 
Provide more context to calls to Segment.
 2018-11-19 15:29:52 -05:00
Brian Wilson
9e417fb5e4 Add creation of url from host and path. 2018-11-19 14:36:07 -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
Gabe Mulley
5311509b19 Provide more context to calls to Segment. 
Implementation for DE-1089.

Centralize the definition of context into a single method.  This is in
common/djangoapps/track because the context is originally set there by
middleware.
 2018-11-15 20:56:10 -05:00
Cali
af07971c89 Merge pull request #19268 from edx/cstenson/delete_flaky_videohandlertest 
Delete flaky bokchoy test.
 2018-11-15 09:19:06 -05:00
Waheed Ahmed
930d442592 Merge pull request #19264 from edx/waheed/LEARNER-6219-update-session-cookie-expiry 
Update session cookie expiry.
 2018-11-15 14:09:53 +05:00
Cali Stenson
88dd02079d Delete flaky bokchoy test. 
See ticket: EDUCATOR-3716
 2018-11-14 16:02:55 -05:00
Rabia Iftikhar
260c7e32d8 Merge pull request #19267 from edx/ri/EDUCATOR-3615-split_test-module 
EDUCATOR-3615 make code defensive if self.child is None in log_child_render method
 2018-11-14 21:44:34 +05:00
Brian Mesick
2dfa24d43a Merge pull request #19259 from edx/bmedx/speed_up_lms_misc 
PLAT-2371 - speed up the LMS_MISC retirement step
 2018-11-14 10:54:31 -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
Waheed Ahmed
bf5ad9b871 Update session cookie expiry. 
Update session cookie expiry to 4 weeks regardless of remember me
checkbox is checked or not.

LEARNER-6219
 2018-11-14 17:36:51 +05:00
noraiz-anwar
ce41896deb add babel-polyfill in commons 2018-11-12 18:13:51 +05:00
bmedx
1716b97cfc PLAT-2371 - speed up the LMS_MISC retirement step 2018-11-09 13:00:36 -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
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