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

57 Commits

Author SHA1 Message Date
Diana Huang
238a91c0e6 Merge pull request #20115 from edx/diana/removing-microsites 
Remove dependence on microsite factory.
 2019-04-02 13:57:35 -04:00
Michael Youngstrom
01fa25a595 INCR-187 2019-04-01 15:47:32 -04:00
Diana Huang
bc37cf1247 Remove dependence on microsite factory. 2019-04-01 15:41:28 -04:00
Michael Youngstrom
9ce60190d4 Merge pull request #20090 from edx/youngstrom/INCR-113 
INCR-113
 2019-03-29 14:53:38 -04:00
Michael Youngstrom
69f1c6efdc INCR-113 2019-03-29 11:14:31 -04:00
Michael Youngstrom
cc13efdc2c INCR-138 2019-03-29 09:52:59 -04:00
Julia Eskew
368f221f0a Initial start on annotations. 2019-02-19 11:24:21 -05:00
Matthew Piatetsky
f294b1a374 fix unicode strings in openedx/ part 1 2019-02-13 10:47:35 -05: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
Jeremy Bowman
d90afa4cde TE-2689 Remove useless pylint suppressions part 5 2018-08-21 11:07:52 -04:00
Squirrel18
4f12be0894 Files changed by modernize and new gitignore type file. 2018-06-25 17:27:51 -05:00
Michael Youngstrom
f4dc2ca000 Merge pull request #18314 from edx/youngstrom/remove_django_18_shim 
Remove temp django upgrade logic
 2018-06-06 11:09:17 -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
Michael Youngstrom
26b4e30833 Remove django 1.8 shim 2018-06-06 10:34:56 -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
muhammad-ammar
ee63a7980b update api request form 
ENT-989
 2018-05-18 12:06:39 +05:00
Simon Chen
7ffaaebd05 Create the retire_user method on ApiAccessRequest model 2018-05-11 12:18:28 -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
zubair-arbi
46960ef358 ENT-960 Fix catalogs creation bug due to request data format 2018-04-23 14:29:06 +05:00
Saleem Latif
d2c97d6402 Fix 500 error when adding viewers to catalog. 2018-04-11 14:49:03 +05:00
Jeremy Bowman
54d14098c0 PLAT-1427 Adapt to build_attrs change in Django 1.11 2017-12-05 17:29:35 -05:00
bmedx
68e3894c17 openedx urls cleanup for Django 1.11 
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
 2017-11-03 16:11:41 -04:00
Jeremy Bowman
ba06372cac PLAT-1780 Remove dependency on django-extensions 2017-10-27 13:19:12 -04:00
John Eskew
eb99657770 Merge pull request #16220 from edx/jeskew/delete_historical_data 
Mgmt commands to clear data from historical tables.
 2017-10-18 09:00:21 -04:00
John Eskew
f3e089bd3f Mgmt commands to clear data from historical tables. 2017-10-17 15:27:59 -04:00
John Eskew
194413cdf9 Add migrations which remove HistoricalRecord tables. 2017-10-12 11:20:25 -04:00
John Eskew
737ebccb74 Remove django-simple-history and all HistoricalRecords. 2017-10-11 11:36:06 -04:00
Saleem Latif
cb7d8dcb86 Create API View for ApiAccessRequest model 2017-09-28 12:27:13 +05:00
Hasnain
bb33a3aa25 LEARNER-1146 | Removed the flag and their corresponding code. 2017-08-23 14:58:47 +05:00
Brian Mesick
af43d08b22 Revert "Upgrade django-ratelimit-backend to 1.1.1" 2017-07-06 16:18:02 -04:00
bmedx
705a68b212 Upgrade django-ratelimit-backend to 1.1.1 2017-07-05 10:14:59 -04:00
Afzal Wali
8173182c86 Taking the url change behind the waffle switch. Required for the Learner-1146 
Learner-1111
 2017-06-21 14:02:14 +05:00
Clinton Blackburn
f318661df5 Updated CatalogIntegration to use a site-specific URL 
The internal_api_url field has been deprecated. All usages have been updated with calls to the method get_internal_api_url().

LEARNER-1111
 2017-06-20 18:38:56 +05:00
Andy Armstrong
93235d118d Reorder imports using isort (except lms and cms) 2017-05-30 16:04:54 -04:00
J. Cliff Dyer
f33832a691 scoutrule: dedupe skip_unless_lms 2017-01-18 09:43:46 -05:00
Ahsan Ulhaq
53e84390de Expose the user email to the api-admin view 
ECOM-5365
 2016-10-28 12:55:27 +05:00
Matjaz Gregoric
344c72b3e2 Use non-ascii PLATFORM_NAME in tests. 
It should help catch unicode encoding problems earlier.

This also updates python-saml dependency to a version that includes a
patch for unicode strings.
 2016-09-23 15:38:23 +02:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming 
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
 2016-07-27 13:55:14 +05:00
Renzo Lucioni
f6d7371dd1 Unify JWT generation code 
These changes unify four different approaches to JWT creation, moving the core of the AccessTokenView to a general-purpose JwtBuilder class. This utility class defaults to using the system's JWT configuration, but it will allow overriding of the signing key and audience claim to support those clients which still require this. Part of ECOM-4566.
 2016-07-07 16:38:39 -04:00
Douglas Hall
75945b8c9e Merge pull request #12791 from edx/ibrahimahmed443/WL-529-platform-name-theme-override 
replace references to settings.PLATFORM_NAME in edx-platform with the…
 2016-06-17 10:44:41 -04:00
Ibrahim
603546a04a replace references to settings.PLATFORM_NAME in edx-platform with theme overrides 2016-06-17 18:33:19 +05:00
Clinton Blackburn
eab057c812 Corrected JWT data type 
ECOM-4653
 2016-06-16 23:23:36 -04:00
Clinton Blackburn
372c59e4a4 Added links to download catalog CSVs in API admin tool 
ECOM-4729
 2016-06-16 23:00:48 -04:00
Clinton Blackburn
880493099f Corrected Course Catalog API URL 
Retrieving the URL from settings rather than an OAuth client that might not exist.

ECOM-4729
 2016-06-16 23:00:45 -04:00
Peter Fogg
c43d8e1566 Fix 500 error when searching for a user without catalogs. 
ECOM-4653
 2016-06-09 13:22:51 -04:00
Peter Fogg
760ce74fca Use correct JWT audience when connecting to course discovery. 2016-05-23 17:05:42 -04:00
Peter Fogg
5abb77328e Use the correct JWT key when querying the Catalog API. 
ECOM-4441
 2016-05-17 15:28:19 -04:00
Peter Fogg
b38c4ed9be Provide a link to the catalog admin from the api_admin approval page. 
ECOM-4441
 2016-05-17 14:52:19 -04:00