Commit Graph

4666 Commits

Author SHA1 Message Date
Tom Christie
7fd4f7e2ff Merge pull request #2022 from brainwane/patch-1
Updated book link in HATEOAS page
2014-11-05 08:56:02 +00:00
Aron Jones
4d3831cae8 add glyphicons font files 2014-11-04 22:01:23 -05:00
Sumana Harihareswara
7352405697 Updated book link in HATEOAS page
Per http://www.crummy.com/2013/10/03/0 , the new book is *RESTful Web APIs* and the old book, *RESTful Web Services*, is obsolete.
2014-11-04 17:18:13 -05:00
Xavier Ordoquy
5ee472718a Merge pull request #2015 from tdavis/patch-1
Fix typo
2014-11-03 21:07:27 +01:00
Tom Davis
3375fecc8b Fix typo
That's all.
2014-11-03 15:05:45 -05:00
Tom Christie
1925d465ae Call out 'get_value' and 'get_attribute' 2014-11-03 16:42:00 +00:00
Tom Christie
5d7b835608 Tweaks to validation notes 2014-11-03 16:17:53 +00:00
Tom Christie
09f3eedb23 Add notes re view-level and instance-level permissions checks. Closes #1819. 2014-11-03 15:23:16 +00:00
Tom Christie
78ac332f18 Add docs on Meta inheritance. Closes #1926. 2014-11-03 15:08:19 +00:00
Tom Christie
21d06a4103 Added NON_FIELD_ERRORS_KEY to serializer docs. Closes #1971. 2014-11-03 15:03:10 +00:00
Tom Christie
0da30e6d1d Add note about 3.0 being merged to master 2014-11-03 14:43:00 +00:00
Tom Christie
b106ebd2c0 Merge pull request #1800 from tomchristie/version-3.0
Version 3.0
2014-11-03 14:36:06 +00:00
Tom Christie
8861a7dfc7 Merge branch 'version-3.0' of https://github.com/tomchristie/django-rest-framework into version-3.0 2014-11-03 14:14:25 +00:00
Tom Christie
2b535954cd Py2/3 compat for validation test 2014-11-03 14:14:12 +00:00
Tom Christie
604728a9ed Merge pull request #2011 from fusionbox/announcement_typos
Fixed some typos in 3.0 release notes
2014-11-03 14:01:48 +00:00
Tom Christie
003c42b0f5 Use invalid_data key for error message. Closes #2002. 2014-11-03 14:01:02 +00:00
Rocky Meza
9ce130d1b5 Fixed some typos in 3.0 release notes 2014-11-03 06:56:42 -07:00
Tom Christie
d27b8cc09b PUT as create docs, and move mixin out to external gist 2014-11-03 12:00:19 +00:00
Tom Christie
37845968cd Merge master 2014-11-03 11:39:54 +00: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
37b0995c8b Merge branch 'version-3.0' of https://github.com/tomchristie/django-rest-framework into version-3.0 2014-11-03 11:10:55 +00:00
Tom Christie
ddc177732c Merge branch 'master' into version-3.0 2014-11-03 11:10:47 +00:00
Tom Christie
b5c98f686d Properly escape URLs when replacing query parameter 2014-11-03 11:10:24 +00:00
Tom Christie
56d054e634 Proper escaping of URLs when replacing query parameter 2014-11-03 11:06:45 +00:00
Tom Christie
1ef4e6b7a8 Merge pull request #2006 from andybak/patch-1
typo fix
2014-11-01 10:49:37 +00:00
Andy Baker
964b3401fb typo fix 2014-11-01 10:25:59 +00:00
Tom Christie
6da3813a17 Merge master 2014-10-31 16:45:56 +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
207208fedf Lazy loading of fields and validators. Closes #1963. 2014-10-31 16:38:39 +00:00
Tom Christie
11075d3770 Merge branch 'master' into version-3.0 2014-10-31 16:05:45 +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
bacf8cfa9d Guard against malicious string inputs for numbers. Closes #1903. 2014-10-31 15:41:00 +00:00
Tom Christie
3dfb6b0e50 Merge master 2014-10-31 15:30:35 +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
Tom Christie
0e59c27e2f Merge branch 'master' into version-3.0 2014-10-31 15:19:40 +00:00
Tom Christie
159c3de9fc Merge master 2014-10-31 15:19:15 +00:00
Tom Christie
45b5f23f31 Update to bootstrap 3. Closes #1085 2014-10-31 14:56:41 +00:00
Tom Christie
254701230d Fix up validators docs 2014-10-31 13:58:40 +00:00
Tom Christie
2762205887 Validator documentation and tweaks 2014-10-31 13:47:36 +00:00
Tom Christie
cd40dcb065 Ensure json.dumps(separators=...) works on both 2.x and 3.x 2014-10-30 16:53:12 +00:00
Tom Christie
0dea509dc9 Nested serializer tests 2014-10-30 15:59:16 +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
9ebaabd6eb unique_for_date/unique_for_month/unique_for_year 2014-10-28 16:21:49 +00:00
Tom Christie
702f47700d Updated requirements 2014-10-24 12:12:01 +01:00
Tom Christie
f9c0e6ee1b unique_for_month, unique_for_year 2014-10-22 16:29:09 +01: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