Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
50,111 Commits 1 Branch 0 Tags
441d2e44b9457817bf9d2e052d160bc2e3effc2a
Commit Graph

50111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nimisha Asthagiri
c1cd1058c5 Merge pull request #19797 from edx/arch/redirect-profile-page 
Redirect Profile view to Profile Microfrontend
 2019-02-19 09:00:37 -05:00
cclauss
c0c935b685 Old style exceptions --> new style for Python 3 2019-02-19 13:09:23 +01:00
cclauss
44d62fac75 Fix explicit tuple parameters for Python 3 2019-02-19 12:37:34 +01:00
DawoudSheraz
9a5b2108b8 Merge pull request #19798 from edx/dsheraz/educator_3994 
add staff exemption for content access in library content
 2019-02-18 13:44:55 +05:00
adeelehsan
a05b3a3305 Merge pull request #19807 from edx/aehsan/LEARNER-6183/disable_third_party_if_account_password_is_unusable 
Disbale third party login
 2019-02-18 12:38:11 +05:00
DawoudSheraz
24d63f25ce add staff exemption for content access in library access 2019-02-18 12:17:19 +05:00
edx-pipeline-bot
44bfbba135 Merge pull request #19821 from edx/private_to_public_d8d2a60 
Mergeback PR from private to public.
 2019-02-16 09:57:35 -05:00
DawoudSheraz
d8d2a60205 Merge pull request #151 from edx/dsheraz/wiki_update 
update django wiki version
 2019-02-16 19:06:59 +05:00
Bessie Steinberg
27e99e6f05 Merge pull request #19794 from edx/bessiesteinberg/ent-1512 
ENT-1512: Make Recovery Email Retireable
 2019-02-15 16:57:21 -05:00
Brian Mesick
22af0e52c9 Merge pull request #19409 from mitodl/course_import_data_dir 
Fix inconsistency in assumed data dir for course import
 2019-02-15 16:25:24 -05:00
Matt Hughes
5dcc3d33e9 Add masters track to instr. dash. enrollment breakdown 
JIRA:EDUCATOR-4027
 2019-02-15 14:41:20 -05:00
Bessie Steinberg
1a94a69560 ENT-1512: Make Recovery Email Retireable 2019-02-15 14:21:32 -05:00
Tobias Macey
c63d153c4e Fix inconsistency in assumed data dir for course import 
With the expanded idea of what `settings.DATA_DIR` pertains to, there is an inconsistency in the assumed location of course repositories that can lead to failed impots. In `import_olx` the root is set to be `settings.GITHUB_REPO_ROOT`, whereas in the `extract_tar.py` file it is validating against `settings.DATA_DIR` which can no longer be assumed to be the same location. This PR brings those two assumptions in line to rely on the `settings.GITHUB_REPO_ROOT` in both locations.
 2019-02-15 13:35:09 -05:00
Dave St.Germain
bdd774eb87 Merge pull request #19802 from edx/dcs/proctoring-rules 
Define permission used in edx-proctoring
 2019-02-15 11:24:33 -05:00
Calen Pennington
832d354962 Merge pull request #19750 from edx/unicode9 
fix unicode strings in openedx/ part 2
 2019-02-15 10:57:29 -05:00
Matthew Piatetsky
444799fb0e fix unicode strings in openedx/ part 2 2019-02-15 10:15:51 -05:00
Awais Jibran
c3682237f8 Merge pull request #19782 from edx/aj/fix-capa-problem-response-csv 
Fix csv of problem responses silent failure
 2019-02-15 16:32:35 +05:00
adeelehsan
73f57457c0 Disbale third party login 
if user password is unusable
then disable third party login

LEARNER-6183
 2019-02-15 16:03:11 +05:00
Giovanni Cimolin da Silva
e8883ad3a8 Add OAuth2 support for problem response reports endpoints and move API 
This commit adds OAuth2 support to the problem response report endpoints and moves them to a better location following EdX API standards while keeping compatibility to the old
endpoint locations.
This was done to enable the use of reports functionality by external agents and provide a better separation between backend and frontend.

The following endpoints have been moved:

* List instructor tasks:
New URL: POST /api/instructor/v1/course/{}/tasks
Old URL: POST /courses/{}/instructor/api/list_instructor_tasks

* Download instructor reports:
New URL: POST /api/instructor/v1/course/{}/reports
Old URL: POST /courses/course-v1:edX+DemoX+Demo_Course/instructor/api/list_report_downloads

* Generate problem response reports:
New URL: POST /api/instructor/v1/course/{}/reports/problem_responses
Old URL: POST /courses/course-v1:edX+DemoX+Demo_Course/instructor/api/get_problem_responses

Note: The behaviour of the URLs was not modified.
 2019-02-15 08:32:21 -02:00
Saleem Latif
d29956beba Merge pull request #19774 from edx/saleem-latif/ENT-1533 
ENT-1533: Updating recovery email address from an already verified email address auto verifies the new address
 2019-02-15 14:42:46 +05:00
Uzair Rasheed
1e9e1808b4 Merge pull request #19788 from edx/translate-links-in-footer 
Translate connect header to spanish
 2019-02-15 14:33:53 +05:00
uzairr
bb4eb90a1e Translate connect header to spanish 
Support team suggests translation of one of the footer title
to spanish.In this PR, hooks are added around that title so
that it can be translated.
 2019-02-15 12:48:27 +05:00
Saleem Latif
00b0baabbb Updating recovery email address from an already verified email address auto verifies the new address 2019-02-15 11:48:11 +05:00
Matt Hughes
a0b6547aeb Merge pull request #19769 from edx/matthugs/reduce-xsslint-false-positives-for-underscore-using-global-js-functions 
Improve XSS lint for underscore templates
 2019-02-14 17:09:42 -05:00
Jeremy Bowman
3eaba4accf Merge pull request #19813 from edx/jmbowman/contentstore_import_order 
Fix import order issues in contentstore
 2019-02-14 15:54:32 -05:00
edX Transifex Bot
965abee1e7 Update translations 2019-02-14 15:31:23 -05:00
Abdul Mannan
e49b496d6d Merge pull request #19799 from edx/amannan/DE-1248 
Add email address to LMS account registeration event
 2019-02-15 00:48:26 +05:00
Jeremy Bowman
d866fed2f1 Fix import order issues in contentstore 2019-02-14 14:20:47 -05:00
Abdul Mannan
583bede6b9 Add email address to LMS account registeration event 2019-02-15 00:15:53 +05:00
Jeremy Bowman
1817e61ca4 Merge pull request #19806 from singuliere/INCR-82-code-block-timer 
INCR-82 remove dependency on code_block_timer
 2019-02-14 13:42:18 -05:00
Michael Roytman
b8e421a52c Merge pull request #19805 from edx/mroytman/bump-edx-proctoring-1.5.12 
bump version of edx-proctoring to 1.5.12
 2019-02-14 12:58:49 -05:00
Michael Roytman
e432f45185 bump version of edx-proctoring to 1.5.12 2019-02-14 11:55:19 -05:00
Stu Young
6b6079b9ae Merge pull request #19810 from edx/estute/temp-bump-pylint-thresholds 
temporarily bump pylint threshold
 2019-02-14 11:53:58 -05:00
Stuart Young
424e621199 temporarily bump pylint threshold 2019-02-14 11:51:43 -05:00
Nimisha Asthagiri
551f07c130 fixup! updated URL config name and value; added DEPR ticket 2019-02-14 09:17:31 -05:00
Awais Jibran
04d17d55a9 Fix csv of problem responses silent failure 2019-02-14 11:37:32 +05:00
singuliere
631c173b1b INCR-82 remove dependency on code_block_timer 2019-02-14 00:51:04 +01:00
Giovanni Cimolin da Silva
650aad6ce5 Add Contact Us form customization options 
This commit adds personalization options for the Contact Us links on 
edx-platform's
page.
To allow for this customization, two SiteConfiguration variables were 
added:
* CONTACT_US_ENABLE: Switch to enable/disable the Contact Us page. 
Setting this to
False will disable the contact page and the links on the footer will 
disappear.

* CONTACT_US_CUSTOM_LINK: If the contact page is enabled, this setting 
allows to set
a custom URL for the Contact Us links on edx-platform. If this setting 
is not set,
the platform will use the default contact form.
 2019-02-13 18:17:45 -02:00
Calen Pennington
afd262e3e1 Merge pull request #19749 from edx/unicode8 
fix unicode strings in openedx/ part 1
 2019-02-13 14:16:00 -05:00
Calen Pennington
8c53ce6493 Merge pull request #19743 from edx/unicode7 
fix unicode strings in lms/ part 2
 2019-02-13 14:15:02 -05:00
Jeremy Bowman
911aecefbb Merge pull request #19795 from edx/jmbowman/progress_page_screenshots 
Capture screenshots on progress page test failures
 2019-02-13 13:49:44 -05:00
Troy Sankey
cfd20b1a99 Merge pull request #19804 from edx/pwnage101/add-missing-production-setting-logout-uris 
Load IDA_LOGOUT_URI_LIST in all the necessary places
 2019-02-13 12:53:07 -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
Dave St.Germain
d780908bbd Define permission used in edx-proctoring 2019-02-13 11:45:44 -05:00
Matthew Piatetsky
f294b1a374 fix unicode strings in openedx/ part 1 2019-02-13 10:47:35 -05:00
Matthew Piatetsky
764319d3e0 fix unicode strings in lms/ part 2 2019-02-13 10:35:56 -05:00
Dave St.Germain
436416d86d Added modes to coursemode model 2019-02-13 10:21:04 -05:00
Dave St.Germain
6802a38a9d Added master's track 
Added mode option to course enrollment management command
 2019-02-13 10:21:04 -05:00
Nimisha Asthagiri
4b4957ad9f Merge pull request #19738 from edx/arch/per-field-visibility 
Account API: Support Per-field Visibility
 2019-02-13 10:05:49 -05:00
Nimisha Asthagiri
7878b2409f Merge pull request #19796 from edx/arch/remove-profile-tab 
Remove Profile Tab on Dashboard pages
 2019-02-13 10:05:02 -05:00