encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-17 23:27:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,663 Commits 18 Branches 132 Tags 105 MiB
2fa04caf7c
Commit Graph

7663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
tanwanirahul
6a095e9110 Merge remote-tracking branch 'rahul/master' 2014-11-03 14:45:49 +01:00
tanwanirahul
ea8c405201 Tests for validating custom_method_name router attribute 2014-11-03 14:44:47 +01:00
tanwanirahul
d972df7c9c Ability to override default method names by customizing it 2014-11-03 14:43:53 +01: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
Carlton Gibson
ba52c0c627 Revert "Added Note on tox & .pyc files. Fixes #1957" 
This reverts commit d6ccdfc53d.
 2014-10-22 17:08:44 +02:00
Carlton Gibson
d6ccdfc53d Added Note on tox & .pyc files. Fixes #1957 2014-10-22 16:43:37 +02: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
Tom Christie
ae53fdff9c First pass at unique_for_date, unique_for_month, unique_for_year 2014-10-22 13:30:28 +01:00
Tom Christie
c5d1be8eac .validate() can raise field errors or non-field errors 2014-10-22 10:32:32 +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