Commit Graph

51562 Commits

Author SHA1 Message Date
aarif
64bd86c12c ran python-modernize and isort on files mentioned in INCR-435 2019-07-12 15:29:19 +05:00
Ayub khan
337408437d INCR-437 python3 compatibility 2019-07-12 15:08:50 +05:00
Ayub khan
892ca0611b INCR-436 python3 compatibility 2019-07-12 14:58:11 +05:00
Awais Qureshi
158e406290 Merge pull request #20995 from edx/awais786/INCR-339
INCR-339
2019-07-12 14:52:47 +05:00
Syed Muhammad Dawoud Sheraz Ali
f741a32fb1 Merge pull request #20985 from edx/dsheraz/prod-361
update login lockout params
2019-07-12 14:23:23 +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
Muhammad Ammar
2cefd88776 Merge pull request #21091 from edx/ammar/upgrade-edx-enterprise
upgrade edx-enterprise
2019-07-12 12:51:59 +05:00
Ayub khan
9cb5274e91 INCR-429 python3 compatibility 2019-07-12 12:50:59 +05:00
Ayub khan
39d90628f3 INCR-428 python3 compatbility 2019-07-12 12:46:20 +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
Ayub
0cbb643c6d Merge pull request #20981 from edx/INCR-330
INCR-330 python3 compatibility
2019-07-12 12:14:39 +05:00
Ayub
2aa5d89831 Merge pull request #20980 from edx/INCR-329
INCR-329 python3 compatibility
2019-07-12 12:05:31 +05:00
Ayub
1f982901f8 Merge pull request #20978 from edx/INCR-328
INCR-328 python3 compatibility
2019-07-12 12:04:04 +05:00
Alan Zarembok
1e6d6de4c1 Merge pull request #21093 from edx/azarembok/handle-capa-exceptions
PROD-448: Capa problems become uneditable.
2019-07-11 17:34:31 -04:00
adeel khan
9d7683237b Merge pull request #21052 from edx/part2a_template_fix
Fix edx-platform templates.
2019-07-12 01:26:11 +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
Alan Zarembok
95616d7d11 PROD-448: Gracefully handle exceptions from user-supplied code in
advanced problems so that they do not become uneditable.
2019-07-11 14:45:58 -04:00
Troy Sankey
d7902e91f6 Merge pull request #21092 from edx/pwnage101/add-discovery-to-devstack-logout-uris
Add discovery to the list of devstack logout URIs
2019-07-11 12:21:47 -04: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
Dave St.Germain
774ea806de Merge pull request #21089 from edx/dcs/proctoring-bump
Bump proctoring to fix bug
2019-07-11 10:55:49 -04:00
Amit
a1b5f6fe73 INCR-431: Updates on Python 3.x (#21056) 2019-07-11 10:47:15 -04:00
muhammad-ammar
5ce289f538 upgrade edx-enterprise 2019-07-11 19:38:15 +05:00
usama sadiq
79d02a1b67 Python3 Update
Added absolute_import
Changed unicode() with six.text_type()
2019-07-11 19:27:15 +05:00
Amit
0044bef4fd INCR-393: Updates on Python 3.x (#21054) 2019-07-11 10:21:47 -04:00
Amit
9ecb771aa8 INCR-452: Updates on Python 3.x (#21058) 2019-07-11 10:19:53 -04:00
Dave St.Germain
b3f7e31388 Bump proctoring to fix bug 2019-07-11 10:07:28 -04:00
aarif
0750f9a262 ran python-modernize and isort on files mentioned in INCR-423 2019-07-11 16:46:50 +05:00
Ayub khan
1521f5fce0 INCR-418 2019-07-11 16:00:23 +05:00
Ayub khan
811356b002 INCR-417 python3 compatibility 2019-07-11 15:54:47 +05:00
Ayub khan
a13321cc76 INCR-416 python3 compatibility 2019-07-11 15:45:22 +05:00
Ayub khan
e40e18ab32 INCR-414 python3 compatibility 2019-07-11 15:38:18 +05:00
Aarif
51ca3d5e10 ran python-modernize and isort on files mentioned in INCR-356 (#21023) 2019-07-11 15:36:23 +05:00
Ayub khan
f4fc14ca92 INCR-408 python3 compatibility 2019-07-11 15:19:08 +05:00
Ayub khan
07275a5715 INCR-407 python3 compatibility 2019-07-11 15:14:30 +05:00
Ayub khan
8a7a39af11 INCR-406 python3 compatibility 2019-07-11 15:09:27 +05:00
Ayub khan
102dca6ae6 INCR-403 python3 compatibility 2019-07-11 14:45:01 +05:00
Ayub khan
6661745e77 INCR-402 python3 compatibility 2019-07-11 14:42:14 +05:00
arbisoft
e87dc6cc77 Fixing python-modernize issues. 2019-07-11 14:24:38 +05:00
arbisoft
004d856316 Fixing python-modernize issues. 2019-07-11 14:04:05 +05:00
arbisoft
c82b0110b0 Fixing python-modernize issues. 2019-07-11 13:37:11 +05:00
Ayub khan
2250411222 INCR-349 python3 compatibility 2019-07-11 13:29:34 +05:00
Waheed Ahmed
3e9f503de5 Merge pull request #21053 from edx/geoip2-bot-update-country-database2019-07-10
geoip2: update maxmind geolite country database
2019-07-11 13:21:42 +05:00
arbisoft
503622c5d2 Fixing python-modernize issues. 2019-07-11 12:59:47 +05:00
Usama Sadiq
decf48166d Merge pull request #20996 from edx/usama/learner-6648-certificate-generation-after-id-verification
Added logs in Certificate Generation after Id Verification
2019-07-11 12:49:23 +05:00