Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,630 Commits 1 Branch 0 Tags
2fc755d43f9512bc1489e3efbb9617daa39ecfe2
Commit Graph

8434 Commits

Author SHA1 Message Date
emma-green
cbf3f78325 Revert "WIP:Cache course runs to programs" 2019-02-20 12:03:07 -05:00
emma-green
304fba5959 Merge pull request #19677 from edx/emma-green/REVEM-176/cache-course_runs-to-programs 
WIP:Cache course runs to programs
 2019-02-20 09:55:36 -05:00
Jeremy Bowman
974ae50bf4 Merge pull request #19620 from cclauss/new-style-exceptions 
Old style exceptions --> new style for Python 3
 2019-02-19 16:31:35 -05:00
Emma Green
f2139bbe2f add courses to programs to cache 2019-02-19 15:17:23 -05:00
Matt Hughes
1784dec477 Merge pull request #19826 from edx/matthugs/update-proctoring-onboarding-error-messages 
Update onboarding error message copy for proctored exams
 2019-02-19 15:08:08 -05:00
Matt Hughes
0c96ab4e28 Update onboarding error message copy for proctored exams 
Also update a mistake in studio markup related to proctored exams

JIRA:EDUCATOR-4048
 2019-02-19 12:43:50 -05:00
Julia Eskew
368f221f0a Initial start on annotations. 2019-02-19 11:24:21 -05:00
cclauss
c0c935b685 Old style exceptions --> new style for Python 3 2019-02-19 13:09:23 +01:00
Jeremy Bowman
d866fed2f1 Fix import order issues in contentstore 2019-02-14 14:20:47 -05:00
Troy Sankey
11c3588fcc Load IDA_LOGOUT_URI_LIST in all the necessary places 
I missed the LMS production settings, and Studio in its entirety.
 2019-02-13 12:17:02 -05:00
Agha Awais
7d29fbd596 removed old lettuce files for pages/tabs 2019-02-13 10:51:57 +00:00
Nimisha Asthagiri
34201c62e8 Merge pull request #19790 from edx/pwnage101/read-from-extra-list-of-logout-uris 
Additionally logout from a settings list of extra logout URIs
 2019-02-12 22:49:36 -05:00
Troy Sankey
10afe5e52f Additionally logout from a settings list of extra logout URIs 
Currently, the LMS logout endpoint should iframe in the logout pages of
all the IDAs you were logged into. In short, this was made possible with
DOP because keeping track of the logout URIs and leaving a trail of
evidence in the user cookies was part of what we added in our fork of
DOP.  In the case of DOT, we don't have time or desire to fork DOT to
mirror this behavior, so our stop-gap solution is to log out the user
from a list of logout URIs in settings.
 2019-02-12 19:44:41 -05:00
Michael Youngstrom
16b5606404 Remove shards from cms 2019-02-12 11:26:39 -05:00
stv
e7733faa1a Fix tests: Show Answer, Number of Attempts 2019-02-08 12:33:45 -08:00
Michael Roytman
f15fd361ae Merge pull request #19684 from edx/mroytman/EDUCATOR-3952-practice-proctored-to-onboarding 
Change "practice exam" to "onboarding" for courses that support onboarding exams.
 2019-02-08 11:48:56 -05:00
Michael Roytman
af319f3c9a Update version of edx-proctoring and update copy to refer to onboarding exams in Studio for proctoring backends that support onboarding exams. 2019-02-07 14:29:26 -05:00
David Ormsbee
d0c353609d Don't break exports for uninstalled XBlock content 
When an unknown content type is encountered, it's imported as a
RawDescriptor, which will preserve the OLX and export it back out. But
if we import a course while an XBlock is installed and then export it
after that XBlock is removed, we export RawDescriptors that never got to
save the original OLX and have a blank "data" field. Attempting to
export this used to fail and break export altogether. We now test that
the export continues to complete, and just skips over anything it can't
serialize out.

Note that this will stil export pointers in the export, so if you
uninstalled a "AmazingBlock" and exported, you might see something like
the following in a vertical's XML::

<vertical display_name="Unit">
  <amazing url_name="2edebb68d5734395a06b8a62b9bb677e"/>
</vertical>

However there would be no corresponding file at:
  /amazing/2edebb68d5734395a06b8a62b9bb677e.xml

In fact, there would be no /amazing directory at all in the export.

The better long term solution is probably to leave the pointer as-is
and export some generic file that can't be mistaken for OLX (say a
JSON file) that represents the raw key-value data we have in
Modulstore for the now unknown XBlock type. However, this commit at
least keeps export from crashing out entirely.
 2019-02-06 15:36:59 -05:00
Matthew Piatetsky
7df30938c4 fix unicode strings in cms/ 2019-02-04 13:01:51 -05:00
Michael Youngstrom
e7898d153d Move to python3-saml 2019-01-30 16:35:16 -05:00
syedimranhassan
b7f9a78603 Changed time zone to UTC for lms/cms 2019-01-23 15:34:56 +05:00
DawoudSheraz
bd262e000b Update Mathjax version to include a11y 2019-01-17 13:20:07 +05:00
Ned Batchelder
48ac13e73e Merge pull request #19591 from cclauss/print_function 
Use print() function in both Python 2 and Python 3
 2019-01-16 17:59:11 -05:00
Michael Roytman
f3888c0020 add a proctoring settings button to course outline in Studio for each proctored subsection for a course using a provider that supports a dashboard 2019-01-16 11:29:27 -05:00
Ned Batchelder
1e5c753807 Fix quality violations 2019-01-16 08:44:56 -05:00
Calen Pennington
454acb492b Merge pull request #19578 from cpennington/fbe-group-configurations 
Fix Studio Group Configurations for courses with FBE Enabled
 2019-01-14 14:20:25 -05:00
Calen Pennington
bc32819ce0 Fix Studio Group Configurations for courses with FBE Enabled 
This prevents the Feature-Based Enrollments groups from showing
in Group Configurations unless the studio_override_enabled flag
is enabled. It also fixes a bug where FBE group configurations were
displaying usage as though they were Track-based group configurations.

REVMI-78
 2019-01-14 13:16:57 -05:00
cclauss
8fca11b85c Use print() function in both Python 2 and Python 3 2019-01-13 17:16:37 +01:00
zrana
5e56e9ad0a Remove unwanted lettuce grading files 2019-01-11 17:10:59 +05:00
edx-pipeline-bot
674677daf5 Merge pull request #19577 from edx/private_to_public_21245f3 
Mergeback PR from private to public.
 2019-01-10 15:02:38 -05:00
Matthew Piatetsky
e1fd793e86 Merge pull request #19560 from edx/REVMI-2 
add informational banners when masquerading as user who would not have access due to start date
 2019-01-10 13:48:29 -05:00
Matthew Piatetsky
5bb56fe45f add informational banners when masquerading as user who would not have access due to start date 2019-01-10 11:06:30 -05:00
noraiz-anwar
e66ec8bd17 fix typo in message 2019-01-10 17:05:36 +05:00
Diana Huang
15759c2b2f Merge pull request #19420 from edx/diana/remove-datadog 
Remove all references to datadog from our code.
 2019-01-09 09:07:22 -05:00
Diana Huang
6572d99e76 Remove all references to datadog from our code. 2019-01-08 15:41:24 -05:00
Julia Eskew
b350db7ede Read salt for retirement hashing from config. 2019-01-08 15:25:20 -05:00
asadazam93
e451324ed3 Added enable quality waffle flag 2019-01-08 17:14:41 +05:00
noraiz-anwar
3b7918b07a Add basic pagination in video upload page 2019-01-04 23:06:57 +05:00
Dave St.Germain
a6ff120f8f Merge pull request #19366 from edx/dahlia/proctoring-master 
Upgrade edx-proctoring to version 1.5
 2019-01-02 11:37:55 -05:00
Zach Hancock
a93fe4d833 add logging to gradebook bulk update 2018-12-21 14:48:09 -05:00
Michael Roytman
880a06b981 do not show Create Zendesk Tickets For Suspicious Proctored Exam Attempts Studio Advanced Setting field if user is not edX staff 2018-12-21 11:16:28 -05:00
Dave St.Germain
c71c12545a These settings now come from edx-proctoring 2018-12-21 11:16:27 -05:00
Dave St.Germain
f75dff1ec7 Enabled edx-proctoring as a Pluggable Django App. 2018-12-21 11:15:10 -05:00
Michael Roytman
23fcb7e7bb Removed course-run exam rule configuration 2018-12-21 11:14:58 -05:00
Matt Hughes
edd15f1bdb WIP: currently dev-only approach to proctoring webworker JS API 2018-12-21 10:54:51 -05:00
Michael Roytman
ecabcf90dd Enable course run level overrides for proctoring configuration. 2018-12-21 10:54:51 -05:00
Agha Awais
a6dc71e9d1 Merge pull request #18850 from edx/awais/lett_2_bc_problem_editor_I 
TE-2627: Problem Editor bokchoy tests
 2018-12-21 15:40:58 +05:00
Agha Awais
7a6611c9c2 Problem Editor bokchoy tests 2018-12-21 09:17:24 +00:00
Feanil Patel
f81ce41b20 Revert "EDUCATOR-3764 Mathjax accessibility files" 2018-12-19 11:57:52 -05:00
Nimisha Asthagiri
3a45bee3ea Merge pull request #19453 from edx/arch/cleanup-login 
Studio login/registration redirects to LMS
 2018-12-19 11:52:45 -05:00