Commit Graph

8572 Commits

Author SHA1 Message Date
Ayub
f7d0b54940 Merge pull request #21012 from edx/INCR-345
INCR-345 python3 compatibility
2019-07-16 11:40:33 +05:00
Ayub
cc07c7c97f Merge pull request #20991 from edx/INCR-336
INCR-336 python3 compatibility
2019-07-16 11:39:10 +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
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
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
Awais Qureshi
aa2f6fc8e1 Merge pull request #20997 from edx/awais786/INCR-340
INCR-340
2019-07-12 18:39:56 +05:00
Awais Qureshi
158e406290 Merge pull request #20995 from edx/awais786/INCR-339
INCR-339
2019-07-12 14:52:47 +05:00
DawoudSheraz
c78779949e update login lockout params 2019-07-12 14:01:14 +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
Awais Qureshi
868a891b29 Merge pull request #20990 from edx/awais786/INCR-331
INCR-331
2019-07-11 12:21:15 +05: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
Awais Qureshi
421b0c9280 Merge pull request #20992 from edx/awais786/INCR-338
INCR-338
2019-07-10 21:11:07 +05:00
arbisoft
39ebb9c191 Fixing python-modernize issues. 2019-07-10 19:22:28 +05:00
Ayub khan
ef228377f1 INCR-345 python3 compatibility 2019-07-10 13:15:52 +05:00
Zainab Amir
92c7a43011 Add system_wide_roles app and roles classes (#20935)
* New system_wide_roles app added in openedx/core/djangoapps
* Added SystemWideRole and SystemWideRoleAssignment classes to govern
  non-enterprise system wide roles

PROD-424
2019-07-10 11:33:33 +05:00
arbisoft
83a742966d Fixing python-modernize issues. 2019-07-09 19:14:04 +05:00
arbisoft
871c8f807b Fixing python-modernize issues. 2019-07-09 18:52:08 +05:00
arbisoft
400fdf6399 Fixing python-modernize issues. 2019-07-09 17:10:40 +05:00
arbisoft
32e89b48bc Fixing python-modernize issues. 2019-07-09 16:25:08 +05:00
arbisoft
9c6bb49abf Fixing python-modernize issues. 2019-07-09 16:21:12 +05:00
Ayub khan
c9f0d26747 INCR-330 python3 compatibility 2019-07-09 16:11:28 +05:00
arbisoft
5f9721a42c Fixing python-modernize issues. 2019-07-09 16:00:41 +05:00
Ayub khan
b06fcd27d2 INCR-334 python3 compatibility 2019-07-09 15:43:24 +05:00
Ayub khan
5613797aa8 INCR-336 python3 compatibility 2019-07-09 15:35:33 +05:00
Ayub khan
ad2423fcc3 python3 compatibility 2019-07-09 15:22:19 +05:00
Ayub khan
d7daac92e7 INCR-335 python3 compatibility 2019-07-09 14:43:10 +05:00
Ayub khan
e9b3d8e8ec INCR-333 python3 compatibility 2019-07-09 14:19:16 +05:00
Ayub khan
171b66114c INCR-329 python3 compatibility 2019-07-09 13:17:51 +05:00
Ayub khan
4ed93be5ff INCR-328 python3 compatibility 2019-07-09 13:09:08 +05:00
Ayub khan
15a89ee0ce python 3 compatibility 2019-07-09 12:51:38 +05:00
Zachary Hancock
b6b04a4551 sync courses command (#20946) 2019-07-08 10:45:36 -04:00
Dave St.Germain
25b9d4791e Merge pull request #20917 from edx/dcs/sgp-setting
Fixed SGP setting
2019-06-28 10:32:34 -04:00
Dave St.Germain
f4d65219fb Fixed SGP setting 2019-06-27 16:43:34 -04:00
Feanil Patel
c5b86eb5c7 Merge pull request #20384 from open-craft/symbolist/video-xblock
VideoModule to VideoBlock [SE-602]
2019-06-27 16:23:00 -04:00
Ned Batchelder
aa13a634a6 Merge pull request #20821 from edx/nedbat/drf-yasg
Upgrade djangorestframework and install drf-yasg to get better OpenAPI support
2019-06-25 13:49:13 -04:00
Nadeem Shahzad
441d2e44b9 Merge pull request #20818 from edx/nadeem/OPS-4041
Defaults to common.py lms (OPS-4041)
2019-06-25 18:47:12 +05:00
nadeemshahzad
993a21181a defaults to common.py 2019-06-25 13:01:29 +00:00
Dave St.Germain
15921ebe65 Ensure that exam due dates reflect course pacing 2019-06-24 12:03:50 -04:00
Ned Batchelder
b3a731550c Fix problems that drf-yasg uncovered.
These were originally fixed individually, but had to be reverted, and
are now combined in one commit.  The originals were:

7b9040f6b0 This enum was backwards
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same.
8a44397139 Is this field missing because it is None?
4a1154a7ca Give a safer buffer for clearing the rate limiting
64c47856dd DRF 3.7.4 changed how you delegate to another view, so don't
7359ca4fb2 Is this right? It fixes two tests
fdd66e5390 Adjust the expected error message for DRF 3.7.7
9257f68fd8 The default TIME_ZONE should be UTC
2019-06-21 18:04:15 -04:00
Ned Batchelder
2e9cae46cb Add drf-yasg
* Install drf-yasg

* Add drf-yasg settings and urls

* Pin drf to make drf-yasg work

* Adjust config-models version to be compatible

* Remove django-rest-swagger (the old way)
2019-06-21 17:47:26 -04:00