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

48612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
adeelehsan
a6ede6ac09 Merge pull request #19780 from edx/aehsan/LEARNER-6943/adding_logs_to_check_discovery_response 
Adding logs
 2019-02-20 13:21:32 +05:00
adeelehsan
f265d58cb1 Merge branch 'master' into aehsan/LEARNER-6943/adding_logs_to_check_discovery_response 2019-02-20 12:37:15 +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
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
Brian Mesick
7db7f9cc96 Merge pull request #19675 from edx/juliasq/add_pii_annotations 
Add PII annotations, un-pin stevedore, upgrade deps.
 2019-02-19 13:46:59 -05:00
adeelehsan
94c563be4f Merge pull request #19808 from edx/aehsan/LEARNER-6943/if_template_language_is_None_use_user_language 
Get User language
 2019-02-19 23:25:56 +05:00
adeelehsan
86ae3a9f20 Adding logs 
adding logs to check response
returned by discovery

LEARNER-6943
 2019-02-19 22:50:34 +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
adeelehsan
212d7efa72 Get User language 
if template language is None
then use user language instead
of getting from setings which is
always english

LEARNER-6943
 2019-02-19 22:39:56 +05:00
Christopher Pappas
7404fdf0ff Bumping edx-enterprise 
ran make upgrade, but not upgrading pytest or pytest-forked to try to isolate travis test failures

Running make upgrade again
 2019-02-19 12:39:48 -05:00
bmedx
7df1e05f49 Fix xxslint errors in touched files 2019-02-19 11:24:24 -05:00
Julia Eskew
368f221f0a Initial start on annotations. 2019-02-19 11:24:21 -05:00
Julia Eskew
e5621c91fc Add code-annotations. Un-pin stevedore. Upgrade deps. 2019-02-19 11:23:07 -05:00
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
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
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
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
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
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