Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,344 Commits 1 Branch 0 Tags
954ad2f75e4e7debfe46ab0febc27dea1aa19337
Commit Graph

50344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ayub khan
954ad2f75e INCR-430 python3 compatibility 2019-07-16 15:38:50 +05:00
Muhammad Zaid Bamber
fa693d1aa0 Merge pull request #21090 from edx/zaid-prod-449 
Added logs for XQueue Information
 2019-07-15 18:12:10 +05:00
Ayub
ac0f7f8e20 Merge pull request #21127 from edx/revert-21014-INCR-343 
Revert "INCR-343 Python 3 compatibility"
 2019-07-15 17:04:20 +05:00
Ayub
1a9648a07e Revert "ran python-modernize and isort on files mentioned in INCR-343 (#21014)" 
This reverts commit 87e58c86cc.
 2019-07-15 16:44:13 +05:00
Awais Qureshi
bc542728b7 Merge pull request #21010 from edx/awais786/INCR-346 
INCR-346
 2019-07-15 15:54:48 +05:00
zaidbamber161
d4c41008b4 Updated logs information 2019-07-15 15:50:37 +05:00
zaidbamber161
f02b34c1a1 Updated logs information 2019-07-15 15:50:37 +05:00
zaidbamber161
f86d0c8e16 Fixed quality test 2019-07-15 15:50:37 +05:00
zaidbamber161
bc7e2a900c Added logs for XQueue 2019-07-15 15:50:37 +05:00
Aarif
cc831f8fbd ran python-modernize and isort on files mentioned in INCR-348 (#21017) 2019-07-15 15:16:52 +05:00
Aarif
87e58c86cc ran python-modernize and isort on files mentioned in INCR-343 (#21014) 2019-07-15 14:39:27 +05:00
Aarif
8bdd2b29d2 INCR-337 Python 3 compatibility (#20993) 
* ran python-modernize and isort on files specified in INCR-337

* changes made to comply with pylint
 2019-07-15 14:12:52 +05: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
Ayub
56170466f1 Merge pull request #20988 from edx/INCR-335 
INCR-335 python3 compatibility
 2019-07-15 12:29:55 +05:00
Ayub
30aaeb7d4e Merge pull request #20986 from edx/INCR-334 
INCR-334 python3 compatibility
 2019-07-15 12:29:15 +05:00
Ayub
1709ec0d87 Merge pull request #20984 from edx/INCR-333 
INCR-333 python3 compatibility
 2019-07-15 12:26:29 +05:00
Awais Qureshi
9d29856976 Merge pull request #21000 from edx/awais786/INCR-342 
INCR-342
 2019-07-15 12:22:46 +05:00
Awais Qureshi
ea317028fe Merge pull request #20999 from edx/awais786/INCR-341 
INCR-341
 2019-07-15 12:05:31 +05:00
edX Transifex Bot
3fcc55e414 fix(i18n): update translations 2019-07-14 17:17:24 -04:00
edX Transifex Bot
155a32c797 fix(i18n): update translations 2019-07-12 18:35:43 -04:00
Awais Qureshi
aa2f6fc8e1 Merge pull request #20997 from edx/awais786/INCR-340 
INCR-340
 2019-07-12 18:39:56 +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
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
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