encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-25 19:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,232 Commits 18 Branches 132 Tags 105 MiB
2c31f10f6e
Commit Graph

4232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ordoquy
2c31f10f6e Release 2.4.7 2015-08-16 10:45:42 +02:00
Tom Christie
743e7572c2 Merge pull request #3184 from damycra/version-2.4.x 
Support Django Guardian 1.3
 2015-07-28 11:21:16 +01:00
Tom Christie
59be95a0c0 Fix for DjangoObjectPermissionsFilter with Guardian < 1.3 2015-07-28 10:30:40 +01:00
Tom Christie
152035aee7 Cherry picks 
Upgrade guardian support to 1.3. #3165
 2015-07-23 20:37:44 +01:00
Xavier Ordoquy
86f7967a7a Version 2.4.6 2015-07-08 08:49:59 +02:00
Xavier Ordoquy
9926241afb Merge pull request #2857 from w-/patch-3 
increase serializer compatibility to django 1.8
 2015-05-04 15:56:58 +02:00
Tom Christie
91ba27174c Merge pull request #2858 from kazmiruk/version-2.4.x 
change SortedDict to OrderedDict + fix list and tuple concatination
 2015-04-27 16:21:10 +01:00
kazmiruk
fad0848b7c fix flake8 warnings 2015-04-27 10:09:43 +07:00
kazmiruk
7d8c95141c remove list\tuple changes from PR 2015-04-27 10:02:05 +07:00
kazmiruk
e3522e8aef move importlib to compat 2015-04-24 22:58:14 +07:00
kazmiruk
73e433ed5c fixes tests for renamed SortedDict 2015-04-23 16:32:36 +07:00
kazmiruk
be66e15c1c renaming of OrderedDict back to SortedDict + some comments 2015-04-23 16:29:39 +07:00
kazmiruk
18f1f57846 fixes flake8 warning 2015-04-22 20:58:19 +07:00
kazmiruk
21bac85489 move compatibility checks into compat.py 2015-04-22 20:52:33 +07:00
kazmiruk
1116a534d4 add compatibility for django 1.6 2015-04-22 20:05:10 +07:00
kazmiruk
b3e03cd8e2 fixes broken test + importlib warnings 2015-04-22 19:52:23 +07:00
kazmiruk
47c61679a5 adds backward compatibility 2015-04-22 13:43:16 +07:00
kazmiruk
e4e3f57321 fix test for OrderedDict 2015-04-22 13:33:58 +07:00
kazmiruk
51650f88b7 fix flake warning 2015-04-22 13:31:49 +07:00
kazmiruk
73978c9560 change SortedDict to OrderedDict 2015-04-22 13:12:12 +07:00
Xavier Ordoquy
4a75a9c0cb Version 2.4.5 
Update release script.
 2015-04-22 07:34:17 +02:00
Xavier Ordoquy
30313d2a8a Merge pull request #2860 from xrmx/patch-1 
Update 2.4 docs url for real
 2015-04-22 09:53:00 +02:00
Riccardo Magliocchetti
5eacaecbec Update 2.4 docs url for real 
Missed the important hunk
 2015-04-22 09:37:23 +02:00
w-
ee109c446a increase serializer compatibility to django 1.8 
i ran into this issue when using v2.4 with django v1.8. (i didn't previously read it isn't supported)
It's not in the release notes but django.db.model.Options many_to_many() now returns an ImmutableList which is really just a tuple with a bunch of warnings and hooks on it.

if we don't make this typecast change we get the following error

TypeError: can only concatenate tuple (not "list") to tuple

I'm not sure if this change is appropriate and not sure what, if any, additional tests to include with this .

I attempted to test this but must be doing something wrong.
Every test fails when trying to use cursor. most of the errors I get are

 Failed: Database access not allowed, use the "django_db" mark to enable

i followed the instructions here.
https://github.com/tomchristie/django-rest-framework/blob/version-2.4.x/CONTRIBUTING.md
 2015-04-21 18:19:33 -07:00
Xavier Ordoquy
601b2241c9 Merge pull request #2819 from xrmx/update-2.4-docs-url 
Update 2.4 docs url
 2015-04-13 13:22:12 +02:00
Riccardo Magliocchetti
d1b883e159 Update 2.4 docs url 
Point to version 2 docs instead of the latest and greatest docs.
 2015-04-10 09:59:18 +02:00
Xavier Ordoquy
58f9603f70 Merge pull request #2755 from rouge8/tab-switching-backport 
Backport 7872d0acbf to 2.4.x
 2015-04-08 23:17:12 +02:00
Andy Freeland
2a6f25c5f9 Pin flake8 2.4.0 and pep8 1.5.7 2015-03-24 15:32:31 -04:00
Andy Freeland
f7fc754bc9 Version bump and release notes update for 2.4.5 2015-03-24 15:32:10 -04:00
Tom Christie
9401eccbfa Escape tab switching cookie 2015-03-23 12:00:49 -04:00
Tom Christie
67ae6b2552 Merge pull request #2140 from sicarrots/fix_get_component 
Fixed get_component method in Field to get working with subclassess of collections.Mapping
 2014-11-27 12:22:14 +00:00
Karol Sikora
83f446fc47 Fixed get_component method in Field to get working with subclassess of collections.Mapping 2014-11-27 13:09:59 +01:00
Tom Christie
650a91ac24 Fix URL escaping 2014-11-03 11:29:48 +00:00
Tom Christie
96bb77dc35 Version 2.4.4 2014-11-03 11:20:18 +00:00
Tom Christie
b5c98f686d Properly escape URLs when replacing query parameter 2014-11-03 11:10:24 +00:00
Tom Christie
65a0d083d6 Merge pull request #1963 from carljm/lazy-fields 
Set up serializer fields lazily on-demand.
 2014-10-31 16:40:06 +00:00
Tom Christie
5e1ed0aa95 Merge pull request #1922 from JonesChi/fix_follow 
Fix follow does not work on get of APIRequestFactory
 2014-10-31 16:05:17 +00:00
Tom Christie
0b864acd98 Merge pull request #1785 from gdoermann/master 
Frameworks throws AssertionError saying you cannot set required=True and...
 2014-10-31 15:29:06 +00:00
Xavier Ordoquy
4ce4a7c41a Merge pull request #1997 from agconti/patch-1 
docs(api-guide/authentication): updated to reflect new standards in Django 1.7
 2014-10-29 22:20:39 +01:00
Andrew Conti
f25f05dde5 Update authentication.md 
Based on the [new documentation](https://docs.djangoproject.com/en/dev/topics/auth/customizing/#django.contrib.auth.get_user_model) for Django 1.7 we should now use:

```python
@receiver(post_save, sender=settings.AUTH_USER_MODEL)
```
instead of:

```python 
@receiver(post_save, sender=get_user_model())
```
because `get_user_model()` only works once Django has imported all models. Otherwise you'll get: 

```python
django.core.exceptions.AppRegistryNotReady: Models aren't loaded yet.
```
When trying to start your sever after adding token authentication.

From the Docs, ( linked above as well ) :
>New in Django 1.7:
>When connecting to signals sent by the User model, you should specify the custom model using the AUTH_USER_MODEL setting.
 2014-10-29 16:31:36 -04:00
Carlton Gibson
c164d5b31d Merge pull request #1993 from jpadilla/master 
Use PYTHONDONTWRITEBYTECODE=1 on tox environment
 2014-10-29 11:03:39 +01:00
José Padilla
8af3d5db49 Use PYTHONDONTWRITEBYTECODE=1 on tox environment 
This fixes bad marshal data errors after running
tests with tox and later running tests manually
via runtests.py. Fixes #1957
 2014-10-28 16:58:25 -04:00
Tom Christie
4ad4fca6ce Merge pull request #1969 from erikcw/ordered 
Maintain order of views on router for api root view.
 2014-10-22 14:57:48 +01:00
Erik Wickstrom
674855a114 Used Django utils SortedDict instead of stdlib's OrderedDict for 
wider compatability.
 2014-10-20 08:47:45 -07:00
Erik Wickstrom
12b677039d Maintain order of views on router for api root view. 2014-10-19 21:03:33 -07:00
Carl Meyer
140f8620ae Set up serializer fields lazily on-demand. 
This avoids AppRegistryNotReady problems in Django 1.7 with nested serializers,
which are instantiated at import time, possibly before Django's app registry is
fully populated.
 2014-10-17 09:50:57 -06:00
Tom Christie
0951523300 Merge pull request #1967 from jpadilla/master 
Add docs regarding linking third party packages
 2014-10-17 15:20:08 +01:00
José Padilla
11edd01c34 Add docs regarding linking third party packages 2014-10-17 08:58:31 -04:00
Tom Christie
34a7a48c1d Merge pull request #1959 from konradhalas/add-djoser-to-docs 
Add djoser to authentication docs
 2014-10-16 14:48:06 +01:00
konradhalas
5e89994a10 Add to main 3rd party resources list. 2014-10-16 15:16:13 +02:00