Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
53,520 Commits 1 Branch 0 Tags
0c2dfd136eafaae88a71df4eecdcacc3845fca45
Commit Graph

113 Commits

Author SHA1 Message Date
Jeremy Bowman
e1d1c29c00 Fix DRF deprecation warnings (#23082) 
Fix all deprecation warnings generated by Django REST Framework during the unit tests:

* ``The `base_name` argument is pending deprecation in favor of `basename`.`` (86 occurrences)
* `` `detail_route` is deprecated and will be removed in 3.10 in favor of `action`, which accepts a `detail` bool. Use `@action(detail=True)` instead.`` (18 occurrences)
 2020-02-12 12:51:40 -05:00
Muhammad Soban Javed
6dfcddd6d8 Merge pull request #23030 from edx/BOM-1251 
Fixing deprecated django-filter features
 2020-02-07 18:45:30 +05:00
Calen Pennington
4901dde748 Clean up pylint errors to get diff-quality to pass 2020-02-06 09:18:30 -05:00
iamsobanjaved
82dd040382 fixed deprecated django-filter features 2020-02-06 18:32:36 +05:00
Zainab Amir
4b458099cf Add unique_together to CourseEntitlement (#22948) 
Add unique_together on course_uuid and order_number to avoid
duplicate records

PROD-1064
 2020-02-03 13:21:44 +05:00
Calen Pennington
675b8c0d71 CourseOverviews may be deleted, but we don't want to delete related objects 2020-01-15 15:23:51 -05:00
Awais Qureshi
8b3b045803 BOM-1084 
Bump django-filter.
Rename the name to field-name.
 2020-01-13 20:25:44 +05:00
Feanil Patel
6e3fe00fff Fix all E303 pep8 errors. 2019-12-30 12:25:38 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w 
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
 2019-12-30 10:35:30 -05:00
Hassan Javeed
596cbbdf6c Add history to CourseEntitlementSupportDetail 2019-12-17 19:10:45 +05:00
Awais Qureshi
2cf8341189 Merge pull request #22138 from edx/awais786/BOM-968 
BOM-968
 2019-10-25 14:55:27 +05:00
Jason Myatt
c30865cce6 Allow empty order numbers in django admin for Entitlements 2019-10-24 12:52:41 -04:00
Awais Qureshi
6abaf893f1 BOM-968 
Fixing migrations.
 2019-10-24 15:21:13 +05:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
Ayub khan
5c47a3b425 BOM Project 
Updated __unicode__ to __str__
 2019-09-25 18:31:54 +05:00
Ayub khan
d1b5c51be2 BOM-629 
python3 compatibility
 2019-09-19 17:03:22 +05:00
uzairr
80316c632d Update Help msgs of management commands 
PROD-399
 2019-08-02 15:20:26 +05: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
39c7a2db7c Revert "Use drf-yasg for Open API documentation" 2019-06-11 16:05:00 -04:00
Ned Batchelder
8a44397139 Is this field missing because it is None? 2019-06-10 15:27:39 -04:00
Troy Sankey
df8f581d36 Add history to CourseEntitlement 
DE-1510
 2019-06-04 13:52:17 -04:00
Amit
a10fbd682c INCR-231: Run python-modernize and isort at common/djangoapps/entitlements (#20515) 2019-05-10 11:14:18 -04:00
Anthony Wee
2ab8794c78 INCR-131: Run python-modernize on common/djangoapps/entitlements/api (#20448) 
* INCR-131: Run python-modernize on common/djangoapps/entitlements/api

* isort
 2019-05-07 13:05:21 -04:00
Anthony Wee
aa1d142ddd INCR-130: Run python-modernize on common/djangoapps/entitlements/migrations (#20447) 
* INCR-130: Run python-modernize on common/djangoapps/entitlements/migrations

* isort
 2019-05-07 13:01:04 -04:00
Anthony Wee
2d8dfa895f INCR-129: Run python-modernize on common/djangoapps/entitlements/management and tests (#20446) 
* INCR-129: Run python-modernize on common/djangoapps/entitlements/management

* isort

* INCR-129: Run python-modernize on common/djangoapps/entitlements/tests

* isort
 2019-05-07 12:52:09 -04:00
Albert (AJ) St. Aubin
d47d22a9bb updating the import for entitlement tasks 2019-03-25 10:28:30 -04:00
Julia Eskew
368f221f0a Initial start on annotations. 2019-02-19 11:24:21 -05:00
Matthew Piatetsky
9681ca36b8 fix unicode strings in common/ 2019-02-05 10:57:00 -05:00
Ned Batchelder
046fe60913 Remove unused imports 2018-11-07 10:31:51 -05:00
Dillon Dumesnil
ac43d5faac Adding email opt in to create entitlement 2018-10-23 17:33:30 -04:00
Robert Raposa
fbc59231fc Update edx-drf-extensions to 2.0.0. 
Note: this version update is backward incompatible.

ARCH-255
 2018-10-17 01:00:34 -04:00
Waheed Ahmed
711343a7c7 Fix entitlement expiring on switching session. 
LEARNER-6313
 2018-09-04 11:38:58 +05:00
Waheed Ahmed
e3dbfe9c0f Fix refund entitlement on audit course un-enroll. 
LEARNER-6247
 2018-08-27 17:47:59 +05:00
Michael Youngstrom
eadf3650a7 Switch where we create the mock 2018-08-24 12:53:54 -04:00
Waheed Ahmed
2849d8f572 Fix unenroll entitlement from instructor dashboard. 
LEARNER-5620
 2018-07-19 14:52:23 +05:00
Albert St. Aubin
06af818322 Update the entitlement fulfilment logic to work with enrollment end 
[LEARNER-5275]

Update the endtitlement fulfillment logic to work for users who have
enrolled, enrollment window has closed, but upgrade window is still
open. These users should be able to use that enrollment on their course
run that they are enrolled in.
 2018-06-22 07:48:35 -04:00
Albert St. Aubin
f23fd19e99 Added search fields to the entitlements admin panel 2018-06-21 08:54:07 -04:00
Tyler Hallada
1f42d1b384 Merge pull request #18316 from edx/thallada/PLAT-1524-on-delete 
PLAT-1524: Add on_delete kwarg to ForeignKey & OneToOneFields
 2018-06-06 10:38:15 -04:00
Tyler Hallada
1540f9ec72 Add on_delete kwarg to ForeignKey & OneToOneFields 
Django 2.0 will make this field required for `ForeignKey` and `OneToOneFields`.
In previous versions the option defaulted to `models.CASCADE` when not
specified. This change should make the deprecation warnings in the current
Django version go away.

The migrations where also modified, but the changes should not cause a change in
the database schema since `models.CASCADE` was already the old default.
 2018-06-05 17:05:12 -04:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g 
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
 2018-06-05 13:59:09 -04:00
J Eskew
edbdae9fb8 Merge pull request #18124 from edx/jeskew/fix_some_django20_deprecation_warnings 
Fix more Django 2.0 deprecation warnings around URLconfs.
 2018-05-08 16:29:12 -04:00
Douglas Hall
c6ec5edbf7 Add API documentation with django-rest-swagger. 2018-05-08 14:38:33 -04:00
John Eskew
e5ee0fc91f Remove more unneeded 'namespace=' params. 2018-05-07 18:25:36 -04:00
John Eskew
ffb1f9fe2a Fix more Django 2.0 deprecation warnings around URLconfs. 2018-05-03 13:50:08 -04:00
McKenzie Welter
435c3c6338 mark support (re)issued entitlements as unrefundable 2018-04-12 12:16:37 -04:00
McKenzie Welter
361af7ef5a add test coverage for entitlement course run retrieval 2018-04-05 14:49:33 -04:00
Albert (AJ) St. Aubin
13e7ec6aa5 Merge pull request #17804 from edx/aj/LEARNER-4493 
Aj/learner 4493
 2018-03-30 12:24:31 -04:00
McKenzie Welter
2762a6114b allow site and mode to be nullable in admin form 2018-03-30 10:24:31 -04:00
Albert St. Aubin
1d9b3842ef Corrects issue with Entitlement Auto upgrade and Soft Upgrade deadline 
issues

[LEARNER-4493]
 2018-03-29 12:27:28 -04:00
Albert St. Aubin
35324a7314 Moved to a try catch block 2018-03-29 10:35:43 -04:00