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

49248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cclauss
3ab0d2666f Missing named arguments in formatting call 
Discovered via LGTM https://lgtm.com/projects/g/edx/edx-platform/alerts/?mode=list&severity=error
 2019-02-20 21:00:20 +01:00
adeelehsan
3e2764d9c0 update pygeopip to geoip2 
Update deprecated pygeoip
to geoip2 and all usages
of it

Learner-6238
 2019-02-21 00:42:05 +05:00
Matthew Piatetsky
5b1007cda2 enable unicode format string linter 2019-02-20 14:39:06 -05:00
Spriha Jha
f3532fde76 Modifying required dependencies. 2019-02-20 14:35:35 -05:00
Ned Batchelder
2fc755d43f Merge pull request #19748 from open-craft/dachary/fix-typo 
docs: s/javascript/JavaScript/
 2019-02-20 14:02:46 -05:00
Calen Pennington
0ffcf3a4b0 Merge pull request #19835 from edx/revert-19677-emma-green/REVEM-176/cache-course_runs-to-programs 
Revert "WIP:Cache course runs to programs"
 2019-02-20 13:37:57 -05:00
Matt Hughes
17f0a4fb52 Allow educators to partition masters students as content groups 
JIRA:EDUCATOR-4022
 2019-02-20 12:40:53 -05:00
Matt Hughes
b7523aaea3 Merge pull request #19828 from edx/matthugs/fix-flaky-data-downloads-tab-tests 
Fix flaky test_list_student_profile_information
 2019-02-20 12:29:05 -05:00
emma-green
cbf3f78325 Revert "WIP:Cache course runs to programs" 2019-02-20 12:03:07 -05:00
Matt Hughes
1ebc6f9c5e Revert "Add masters track to instr. dash. enrollment breakdown" 
This reverts commit 5dcc3d33e9.
 2019-02-20 11:52:41 -05:00
Matt Hughes
8250373ddf Merge pull request #19827 from edx/matthugs/add-masters-enrollment-to-instructor-dashboard-enrollment-breakdown 
Add masters track to instr. dash. enrollment breakdown
 2019-02-20 11:51:29 -05:00
Jeremy Bowman
e2d03d0e78 Merge pull request #19831 from edx/jmbowman/upgrade-bok-choy 
Upgrade bok-choy
 2019-02-20 10:56:21 -05:00
Dave St.Germain
ad9986d4d9 Merge pull request #19052 from open-craft/guruprasad/discussion-settings-roles-endpoint 
Cohort discussion settings and roles management API
 2019-02-20 10:28:10 -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
Guruprasad Lakshmi Narayanan
546c021d9c Implement an alternative discussion settings, roles management API 
This is intended to be used for server-to-server communication.
 2019-02-20 19:20:30 +05:30
Jeremy Bowman
761e8ab48d Merge pull request #19628 from cclauss/modernize-common-lib-chem 
INCR-29: Run python-modernize on common/lib/chem
 2019-02-20 08:21:28 -05:00
edX Transifex Bot
913d8149f8 Update translations 2019-02-20 06:39:44 -05:00
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
efac0b7a80 Upgrade bok-choy 2019-02-20 00:54:57 -05:00
cclauss
350b201e43 INCR-29: Run python-modernize on common/lib/chem 
Signed-off-by: cclauss <cclauss@me.com>
 2019-02-20 00:40:27 +01: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
Calen Pennington
f90be0031f Don't sys.exit in management commands, in case they get called from other code 2019-02-19 14:26:32 -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
Matt Hughes
aebe6cf446 Fix flaky test_list_student_profile_information 2019-02-19 12:38:40 -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
Matt Hughes
3efb4def3d Add masters track to instr. dash. enrollment breakdown 
JIRA:EDUCATOR-4027
 2019-02-19 10:40:57 -05:00
Matt Hughes
da6c0d33c8 Merge pull request #19819 from edx/matthugs/add-masters-enrollment-to-instructor-dashboard-enrollment-breakdown 
Add masters track to instr. dash. enrollment breakdown
 2019-02-19 10:27:11 -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
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