Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5629 Commits

Author SHA1 Message Date
Jeremy Bowman
5c7a8e3ac1 Merge pull request #19622 from cclauss/Fix-parens-for-Python3 
Fix explicit tuple parameters for Python 3
 2019-02-21 15:45:09 -05:00
Farhanah Sheets
5b38c7e39e Merge pull request #19825 from edx/aehsan/learner-6238/update_deprecated_pygeoip_to_geoip2 
update pygeopip to geoip2
 2019-02-21 13:02:47 -05:00
Calen Pennington
cd107d3cf9 Merge pull request #19751 from edx/unicode10 
enable unicode format string linter
 2019-02-21 06:07:11 -05:00
Zia Fazal
4fc64f9783 Merge pull request #19775 from edx/ziafazal/WL-1882 
WL-1882:Management command to sync contacts with hubspot
 2019-02-21 15:24:06 +05:00
Zia Fazal
7d1dd344d8 Management command to sync contacts with hubspot 
Added unit tests

Fixed pylint quality violation

Added doctstring to add_arguments
 2019-02-21 12:10:06 +05:00
Calen Pennington
78c8950ea3 Clean up a few remaining unicode format string errors 2019-02-20 15:28:14 -05: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
Matt Hughes
17f0a4fb52 Allow educators to partition masters students as content groups 
JIRA:EDUCATOR-4022
 2019-02-20 12:40:53 -05:00
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
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
Emma Green
f2139bbe2f add courses to programs to cache 2019-02-19 15:17:23 -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
adeelehsan
86ae3a9f20 Adding logs 
adding logs to check response
returned by discovery

LEARNER-6943
 2019-02-19 22:50:34 +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
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
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
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
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
Abdul Mannan
583bede6b9 Add email address to LMS account registeration event 2019-02-15 00:15:53 +05:00
Nimisha Asthagiri
551f07c130 fixup! updated URL config name and value; added DEPR ticket 2019-02-14 09:17:31 -05:00
Matthew Piatetsky
f294b1a374 fix unicode strings in openedx/ part 1 2019-02-13 10:47:35 -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
7848dd737f Redirect Profile view to Profile Microfrontend 2019-02-13 09:32:36 -05: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
Douglas Hall
b22c1ed0d6 Merge pull request #19746 from edx/douglashall/user_account_api_auth 
Modify order of user account api authentication classes.
 2019-02-12 17:24:26 -05:00
Michael Youngstrom
d21a57715d Merge pull request #19793 from edx/youngstrom/remove-commonlib-shards 
Remove shards from commonlib-unit tests
 2019-02-12 17:15:33 -05:00
Douglas Hall
12a5b4cc8d Modify order of Account API authentication classes 2019-02-12 16:37:57 -05:00
Michael Youngstrom
4bbd1dee0b Remove shards from commonlib-unit tests 2019-02-12 14:28:35 -05:00
Rabia Iftikhar
22dea124dd Merge pull request #19709 from edx/ri/EDUCATOR-3965-update_course_schedules 
EDUCATOR-3965 fix update course schedules on course start date changed
 2019-02-13 00:01:51 +05:00
Nimisha Asthagiri
74eabcf6bb Account API: support per-field visibility 2019-02-12 11:41:29 -05:00
Stu Young
5ac3ef7158 Merge pull request #19770 from edx/revert-19018-opencraft/taranjeet/opt-out-weekly-highlight-messages 
Revert "Add api support to let users opt out of email updates."
 2019-02-12 10:17:11 -05:00
Awais Jibran
d82314f902 fixing quality 2019-02-12 18:45:18 +05:00
Awais Jibran
717712391f Fixing conflicts 2019-02-12 17:50:58 +05:00
rabiaiftikhar
fdcad0d13c EDUCATOR-3965 fix update schedules on course start date changed 2019-02-12 13:47:22 +05:00
Nimisha Asthagiri
0e79129796 Account API: Enhance Social Link API 2019-02-11 20:17:04 -05:00
Luis Moreno
91ed45099b Fix Collapse All/Expand All translation 2019-02-11 07:40:41 -04:00
Jeremy Bowman
406aa21018 Merge pull request #19763 from singuliere/INCR-40-ipaddress 
INCR-40 use ipaddress instead of ipaddr
 2019-02-09 21:29:42 -05:00
singuliere
d00cb9bda8 INCR-40 use ipaddress instead of ipaddr 2019-02-09 13:10:06 +01:00
Stu Young
e8374ad944 Merge pull request #19773 from open-craft/jill/flaky-tests-email-updates 
Fixes flaky tests in schedules.tests.TestCourseUpdateResolver
 2019-02-08 15:39:53 -05:00
David Ormsbee
4aa6446533 Merge pull request #19385 from open-craft/pooja/implement-public-cohort 
Implement public cohort for anonymous and unenrolled users
 2019-02-08 13:28:02 -05:00
Jillian Vogel
6dfbf94b87 Fixes flaky tests added by https://github.com/edx/edx-platform/pull/19018 
using CacheIsolationTestCase
 2019-02-08 13:57:25 +10:30