Commit Graph

4207 Commits

Author SHA1 Message Date
kakulukia
134035b91e Merge 246cd5455f into 65a0d083d6 2014-10-31 19:02:43 +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
kakulukia
246cd5455f use error messages instead of a fixed string 2014-10-31 09:35:26 +01:00
kakulukia
809e17d487 add invalid data to default error messages 2014-10-31 09:34:19 +01: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
Andy Grabow
cc254f8873 fix init method for image fields 2014-10-20 15:41:24 +02:00
Andy Grabow
74ac2d2489 Merge branch 'master' of github.com:kakulukia/django-rest-framework
# By kakulukia
# Via kakulukia
* 'master' of github.com:kakulukia/django-rest-framework:
  allow to work like in django admin which also tries to call the given methon on the object itself
  Update fields.py

Conflicts:
	rest_framework/fields.py
2014-10-20 11:04:47 +02:00
Andy Grabow
a832ae11e9 allow show_url for all file fields 2014-10-20 11:03:47 +02: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
konradhalas
113a28ed8a Add djoser to authentication docs. 2014-10-16 13:48:18 +02:00
kakulukia
553cf5540e allow to work like in django admin which also tries to call the given methon on the object itself
try to call the given serializer method on the serializer itself and on the model in that order
2014-10-13 16:09:45 +02:00
Jones Chi
2dfe75c23a Fix follow does not work on APIClient
Handle follow just like Django's Client.
2014-10-06 15:10:35 +08:00
Tom Christie
b3af4d9fe7 Merge pull request #1925 from kevinlondon/patch-5
Update links in 2.4-announcement.md
2014-10-05 09:07:20 +01:00
Kevin London
0803716ed0 Update links in 2.4-announcement.md
The links to Django Rest Framework pages were 404ing because the URLs include a slash.
2014-10-04 17:34:27 -07:00
Carlton Gibson
ad1497898b Merge pull request #1905 from ya-mouse/master
[templates/rest_framework/base.html] Separate IDs for POST and PUT forms
2014-10-02 10:38:12 +02:00
kakulukia
4b4f1bfd4a Update fields.py 2014-10-01 14:58:37 +02:00
Tom Christie
a8622adcd9 Update index.md 2014-09-29 16:57:40 +01:00
Tom Christie
5734b6e202 Update README.md 2014-09-29 16:56:50 +01:00
Anton D. Kachalov
802913d5e4 [templates/rest_framework/base.html] Separate object-form' and generic-content-form' IDs for POST and PUT forms
Signed-off-by: Anton D. Kachalov <mouse@yandex-team.ru>
2014-09-26 16:07:46 +04:00
Tom Christie
411511622d Merge pull request #1900 from jpadilla/pr_1507
Correctly propagate cloned_request for OPTIONS
2014-09-24 09:03:41 +01:00
Tom Christie
4ffae7c0e9 Merge pull request #1899 from collinanderson/urls
Remove patterns and strings from urls in tutorial.
2014-09-24 09:02:53 +01:00
José Padilla
90139b3efc Remove left unicode strings 2014-09-23 21:18:56 -04:00
José Padilla
e8c01ecdab Correctly propagate cloned_request for OPTIONS
Update to fix pending changes in #1507
2014-09-23 21:12:58 -04:00
Collin Anderson
da385c9c1f remove patterns and strings from urls #1898 2014-09-23 17:10:02 -04:00
Tom Christie
8495cd898a Drop 'No major point releases are currently planned.', cos they are. 2014-09-19 14:31:28 +01:00
Tom Christie
20424251a3 Version 2.4.3 2014-09-19 14:26:28 +01:00
kakulukia
81d84fc897 Update fields.py
fix whitespace bug ..
2014-09-19 14:18:51 +02:00
kakulukia
aa5809d1b7 Update fields.py
ImageFields can show_urls=True instead of file names
2014-09-19 14:06:33 +02:00
Tom Christie
1e9ea377e3 Merge pull request #1887 from pipermerriam/piper/decorate_as_view_response_from_viewsets
Fix missing CSRF exemption on viewsets
2014-09-18 19:13:47 +01:00
Tom Christie
ddbd3cb659 Merge pull request #1882 from mattjmorrison/patch-2
Clarify "raised inside REST framework"
2014-09-18 18:11:26 +01:00
Piper Merriam
7f758d1cf6 Fix missing CSRF exemption on viewsets 2014-09-18 10:30:13 -06:00
Matthew J Morrison
764366b2e1 Fixed code formatting 2014-09-17 11:29:15 -05:00
Tom Christie
8c8d355e76 Update routers.py 2014-09-17 15:51:17 +01:00
Tom Christie
3376c37861 Merge pull request #1865 from mskrajnowski/default-router-listless-viewset
DefaultRouter support for viewsets without an implemented default action
2014-09-17 15:50:12 +01:00
Tom Christie
543c6c8e35 Merge pull request #1883 from jpadilla/master
Update authtoken latest Django 1.7 migration
2014-09-17 15:49:27 +01:00
José Padilla
de5fbf7d63 Update initial migration to work on Python 3 2014-09-17 10:23:53 -04:00
José Padilla
a37db382c6 Update authtoken latest Django 1.7 migration 2014-09-17 09:01:49 -04:00
Matthew J Morrison
e5af0bbb35 Clarify "raised inside REST framework"
I ran into an issue today where I was not seeing the rest_framework.views.exception_handler do what I thought it should be doing. It turned out that I had imported View from rest_framework.views rather than importing APIView from rest_framework.views. The phrase "raised inside REST framework" was confusing as I was debugging this issue. I was unsure if that meant that I could raise those exceptions in my code or if it had to originate from within framework code.

I'm not sure if the proposed wording is ideal, I just wanted to point out what I found to be confusing.
2014-09-17 07:49:54 -05:00