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

8552 Commits

Author SHA1 Message Date
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
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
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
ad2423fcc3 python3 compatibility 2019-07-09 15:22:19 +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
Usman Khalid
0b27c62ca6 Convert VideoModule to VideoBlock. 
Some deprecated functionality has been removed:

- Reading data field and transforms being applied in the init() method.
- The source field.
- The source_visible attribute.
 2019-06-20 22:12:39 +05:00
DawoudSheraz
5747e97895 Merge branch 'master' into private_to_public_319d54e 2019-06-19 11:22:07 +05:00
Calen Pennington
92d9a1f541 Merge pull request #20789 from cpennington/first-enroll-discount-strikeout 
Add strike-out price to LMS Course Home sidebar
 2019-06-18 13:02:15 -04:00
Calen Pennington
4152e16016 Install openedx.features.discounts in Studio so that it can be imported by student 2019-06-17 15:11:33 -04:00
Dave St.Germain
8ebdfb4b74 Added Staff Graded Points to CMS settings 2019-06-17 09:17:54 -04:00
Farhanah Sheets
658c632178 Merge pull request #19958 from raccoongang/fix_too_many_rerenders_textbooks 
Fix bug: re-render is triggered too many times in textbooks.
 2019-06-12 13:23:39 -04:00
Awais Jibran
66298b8761 fix activation emails for login failure 2019-06-12 16:35:56 +05:00
Ned Batchelder
5dcb8bac33 Merge pull request #20802 from edx/revert-20393-nedbat/drf-yasg 
Revert "Use drf-yasg for Open API documentation"
 2019-06-11 16:34:21 -04:00
Amit
2f6935863a INCR-344 (#20785) 2019-06-11 16:11:46 -04:00
Ned Batchelder
39c7a2db7c Revert "Use drf-yasg for Open API documentation" 2019-06-11 16:05:00 -04:00
Ned Batchelder
7b9040f6b0 This enum was backwards 2019-06-10 15:27:39 -04:00
Ned Batchelder
f0fa5f7169 Enable Studio API docs in devstack 2019-06-10 15:27:39 -04:00
Ned Batchelder
9257f68fd8 The default TIME_ZONE should be UTC 
In production, we use UTC as the time zone.  DRF 3.7.7 now puts all
times in the currently set timezone where it used to use UTC.  By
setting TIME_ZONE to UTC, we keep the same results we used to get.

In a few places, we had to change the expected test results to be UTC.
 2019-06-10 15:27:39 -04:00
Andytr1
765559c708 Merge pull request #20758 from edx/andytr1/grades_simple_history 
Adding simple history to track grade changes. Educator-4347
 2019-06-10 12:39:54 -04:00
atesker
817de2b215 Potential fix for review rules - EDUCATOR-4262 2019-06-10 10:56:13 -04:00
Dave St.Germain
23ab20a6fd Prevent import failure on CMS 2019-06-10 10:49:06 -04:00
atesker
6ed1bb72cc Potential fix for review rules - EDUCATOR-4262 2019-06-10 09:54:11 -04:00
atesker
b5acb55dcc Potential fix for review rules - EDUCATOR-4262 2019-06-10 09:32:22 -04:00
atesker
a914faf11c Adding simple history to track grade changes. Educator-4347 
added migration

Adding simple history to track grade changes. Educator-4347
Adding migration file

Adding simple history to track grade changes. Educator-4347
Adding migration file

Adding simple history to track grade changes. Educator-4347
Adding migration file

Re-adding lms.djangoapps reference to see if it will fix the build issues

Re-adding lms.djangoapps reference to see if it will fix the build issues
 2019-06-07 16:32:56 -04:00
Jillian Vogel
22ebf0e16f Strings used in models should always use gettext_lazy. 
Otherwise, they generate false migrations when languages other than
English are used as the default.
 2019-06-04 18:48:46 +09:30