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

50308 Commits

This Branch
This Branch
All Branches
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
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
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
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
51ca3d5e10 ran python-modernize and isort on files mentioned in INCR-356 (#21023) 2019-07-11 15:36:23 +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
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
Aarif
a6ff5e3005 ran python-modernize and isort on openedx/core/djangoapps/user_authn (#20976) 2019-07-11 12:25:22 +05:00
Awais Qureshi
868a891b29 Merge pull request #20990 from edx/awais786/INCR-331 
INCR-331
 2019-07-11 12:21:15 +05: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
Alex Dusenbery
df3d6d160f give create_api_access_request mgmt cmd an option to disconnect signals. 2019-07-10 19:50:08 -04:00
edX Transifex Bot
3298119374 geoip2: update maxmind geolite country database 2019-07-10 20:33:14 +00:00
Ayub
b92c30de10 Merge pull request #20977 from edx/INCR-326 
INCR-326 python3 compatibility
 2019-07-11 00:04:37 +05:00
Ayub
8dde05840e Merge pull request #20975 from edx/INCR-325 
INCR-325 python 3 compatibility
 2019-07-11 00:04:08 +05:00
Ayub
a4ea763b95 Merge pull request #20974 from edx/INCR-324 
INCR-324 python 3 compatibility
 2019-07-11 00:03:41 +05:00
Awais Qureshi
a443a4ac94 Merge pull request #20979 from edx/awais786/INCR-322- 
INCR-322 python3 compatibilty
 2019-07-10 23:28:28 +05:00
Edward Zarecor
ecb5d000a3 Merge pull request #20931 from edx/e0d/fix-circuit-js 
Adding changes from CT to fix circuit simulator on moder chrome.
 2019-07-10 12:28:24 -04:00
Awais Qureshi
421b0c9280 Merge pull request #20992 from edx/awais786/INCR-338 
INCR-338
 2019-07-10 21:11:07 +05:00
David Ormsbee
a480b6ad52 Merge pull request #21049 from edx/revert-20742-jill/inline-discussion-underscore 
Revert "SE-1151 Campus.il Inlines all 36 discussion underscore templates"
 2019-07-10 12:07:48 -04:00
Awais Qureshi
d72b4e3eb8 Merge pull request #21041 from edx/awais786/INCR-373 
INCR-373
 2019-07-10 20:59:42 +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
Edward Zarecor
2596b67664 updating to ensureHTML 2019-07-10 10:07:52 -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