Commit Graph

19668 Commits

Author SHA1 Message Date
Aarif
5ec20b98b1 Merge pull request #21112 from edx/INCR-435
INCR-435 Python 3 compatibility
2019-07-22 14:28:26 +05:00
Uzair Rasheed
eed0dfbbe4 Merge pull request #21149 from edx/PROD-305/add-credit-mode-enrollment
Add credit mode in support enrollment tool.
2019-07-21 00:45:52 +05:00
Farhanah Sheets
7385841c4b Merge pull request #21135 from edx/waheed/PROD-478-move-sso-button
Move secondary SSO login button.
2019-07-19 11:30:35 -04:00
Christie Rice
fee8e17f95 REVMI-341 Stop sending lms_client_id in jwt sent to ecommerce (#21167) 2019-07-19 10:46:46 -04:00
Ayub khan
3a04fbd37a INCR-440 python3 compatibility 2019-07-19 09:54:52 -04:00
Ayub khan
99060623ac INCR-442 python3 compatibility 2019-07-19 09:53:01 -04:00
Feanil Patel
b94b211c29 In python3 force_unicode is renamed to force_text. 2019-07-19 09:48:10 -04:00
Feanil Patel
d9c9d7bab9 Deal with NoneType access.
The `NoneType` object is not available from the `types` module in
python 3. This is a workaronud to deal with that.
2019-07-19 09:48:10 -04:00
Feanil Patel
e51fae3784 letters doesn't exist in python 3.6
Use `ascii_letters` instead which is a reasonable alternative for our
usecases.
2019-07-19 09:48:10 -04:00
uzairr
07821927e2 Add credit modein support enrollment tool.
Currently, enrollment support tool is only allowing support members
to change course enrollment only one of the two modes i.e. audit and
verified.To move a learner other than these modes,they need to ping
devops.To broaden the scope of enrollment support tool,changes have
been done so that enrollment would be changed to other modes as well.

PROD-305
2019-07-19 18:14:35 +05:00
Awais Qureshi
6edf9766df Merge pull request #21134 from edx/awais786/INCR-443
INCR-443
2019-07-19 13:46:34 +05:00
Awais Qureshi
3d2e0f7dde Merge pull request #21133 from edx/awais786/INCR-445
INCR-445
2019-07-19 13:44:38 +05:00
David Ormsbee
a712f1f93b Remove full table scan of VerificationDeadline. (#21119)
* Remove full table scan of VerificationDeadline.

Before this commit, we were doing a full table scan of
student_verificationdeadline, loading the results into a giant
dict, and reading/writing that to the cache. This was fine when the
code was introduced and there were dozens of courses, but now that
we're over 12K courses, it's becoming a major performance issue for
the Student Dashboard.

This uses a subquery to the course enrollment table so that we're
only ever pulling back the deadlines to a student's enrolled courses
for any given request. It removes the cache access entirely.
2019-07-17 10:25:08 -04:00
Waheed Ahmed
a310c87d8e Move secondary SSO login button.
Moved secondary SSO login button to the top of email and
password fields.

PROD-478
2019-07-17 13:29:16 +05:00
nadeemshahzad
4a93420946 defaults to common.py CMS 2019-07-17 12:04:20 +05:00
Amit
b8b910d132 INCR-460: Make compatible with Python 3.x and disable: import-error f… (#20989)
* INCR-460: Make compatible with Python 3.x and disable: import-error for urlparse

* INCR-460: Fixes for useless suppression
2019-07-16 14:28:03 -04:00
Amit
0c513e2139 INCR-449: Make compatible with Python 3.x (#21100)
* INCR-449: Make compatible with Python 3.x

* INCR-449: Fixes for line long
2019-07-16 10:41:06 -04:00
arbisoft
91aac28ca7 Fixing python-modernize issues. 2019-07-16 13:16:03 +05:00
arbisoft
6c39ec43be Fixing python-modernize issues. 2019-07-16 12:34:28 +05:00
Jillian Vogel
d3ce0b759e SE-1151 Campus.il Inlines all 36 discussion underscore templates (fixed) (#21094)
Inlines all 36 discussion underscore templates

imported by lms/templates/discussion/_underscore_templates.html
to reduce file system load when displaying inline discussion blocks.

Ignored error where fix required changing the translated text string,
due to differences between underscore and HtmlUtils format strings.
2019-07-15 20:51:42 -04:00
Amit
e96a789baf INCR-450: Make compatible with Python 3.x (#21097) 2019-07-15 11:57:37 -04:00
Uzair Rasheed
d9e8713077 Merge pull request #21103 from edx/INCR-453/python-modernize-350-of-380
Python-modernize on edx-platform (350 of 380)
2019-07-15 13:39:04 +05:00
Uzair Rasheed
b48dae74ca Merge pull request #21101 from edx/INCR-441/python-modernize-338-of-380
Python-modernize on edx-platform (338 of 380)
2019-07-15 13:38:43 +05:00
adeelehsan
5861ab4b30 Merge pull request #21114 from edx/aehsan/INCR-451
Updated to python3
2019-07-12 17:18:25 +05:00
adeelehsan
b65601e023 Executed python-modernize and isort
on mentioned files in INCR-451
 Please enter the commit message for your changes. Lines starting
2019-07-12 16:15:19 +05:00
adeelehsan
5490bb204e Merge pull request #20966 from edx/aehsan/INCR-464
Updated to python3
2019-07-12 16:07:11 +05:00
adeelehsan
47137ddbab Updated to python3 2019-07-12 15:35:34 +05:00
aarif
64bd86c12c ran python-modernize and isort on files mentioned in INCR-435 2019-07-12 15:29:19 +05:00
DawoudSheraz
c78779949e update login lockout params 2019-07-12 14:01:14 +05:00
uzairr
32aa2273ab Python-modernize on edx-platform (350 of 380)
After executing python-modernize and isort, few changes
occurred in import sequence as well as unicode func is
replaced by six.text_type func.

INCR-453
2019-07-12 13:43:35 +05:00
uzairr
3f6e014f7e Python-modernize on edx-platform (338 of 380)
After executing python-modernize and isort, few changes
occurred in import sequence as well as unicode func is
replaced by six.text_type func.

INCR-441
2019-07-12 13:30:39 +05:00
Waheed Ahmed
eead45987f Merge pull request #21087 from edx/waheed/PROD-433-add-student-support-role
Add system wide student support role.
2019-07-12 12:30:08 +05:00
Adeel Khan
10ae9f5bf1 Fix edx-platform templates for xss.
This is part of a multiple PR to escape
edx-platform templates to prevent xss attack.

PROD-465
2019-07-12 00:52:35 +05:00
Troy Sankey
5b6b853ec0 Add discovery to the list of devstack logout URIs 2019-07-11 11:53:49 -04:00
Amit
8860317772 INCR-455: Updates on Python 3.x (#21057) 2019-07-11 11:17:47 -04:00
Usama Sadiq
89930a0f20 Merge pull request #21061 from edx/usama/INCR-454-python-modernize-on-edx-platform
INCR-454 Python Modernize on Edx-Platform (351 of 380)
2019-07-11 20:11:57 +05:00
Matt Tuchfarber
b1998e202e Merge pull request #20945 from edx/tuchfarber/remove_journals
Remove all references to Journals
2019-07-11 11:08:24 -04:00
Waheed Ahmed
41e8f31765 Add system wide student support role.
Created a data migration to add system wide student support
role, also registered SystemWideRoleAssignment into Django
admin.

PROD-433
2019-07-11 20:03:23 +05:00
Amit
a1b5f6fe73 INCR-431: Updates on Python 3.x (#21056) 2019-07-11 10:47:15 -04:00
usama sadiq
79d02a1b67 Python3 Update
Added absolute_import
Changed unicode() with six.text_type()
2019-07-11 19:27:15 +05:00
Amit
9ecb771aa8 INCR-452: Updates on Python 3.x (#21058) 2019-07-11 10:19:53 -04:00
usama sadiq
26d493e34d Certificate Generation Logs
Added additional logs in the certificate generation
task being executed after id verification of a learner.
2019-07-11 10:51:39 +05:00
Usama Sadiq
b0fee1961d Merge pull request #21033 from edx/usama/INCR-458
INCR-458
2019-07-11 10:48:44 +05:00
David Ormsbee
930d7f2867 Revert "SE-1151 Campus.il Inlines all 36 discussion underscore templates (#20742)"
This reverts commit 44562a1592.
2019-07-10 11:45:28 -04:00
jansenk
8e7b647a4f tests for extra columns 2019-07-10 11:16:25 -04:00
Uzair Rasheed
8c8de6c372 Merge pull request #21047 from edx/INCR-439/python-modernize-336-of-380
Python-modernize on edx-platform (336 of 380)
2019-07-10 20:05:32 +05:00
Amit
f31a894900 INCR-457: Make compatible with Python 3.x (#21011) 2019-07-10 10:22:47 -04:00
Amit
adc91f786f INCR-462: Make compatible with Python 3.x and disable: import-error (#20983) 2019-07-10 10:15:17 -04:00
Amit
15dc31ba6d INCR-456: Make compatible with Python 3.x (#21018) 2019-07-10 10:14:43 -04:00
Uzair Rasheed
a917f109ec Merge pull request #20972 from edx/INCR-463/python-modernize-360-of-380
Python-modernize on edx-platform (360 of 380)
2019-07-10 19:03:43 +05:00