encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-10-30 23:47:53 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,429 Commits 16 Branches 134 Tags 128 MiB
4e001dbb7a
Commit Graph

4429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
63d5634c66 Minor sponsor correction 2014-08-14 16:59:40 +01:00
Tom Christie
a8d5511a08 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-08-14 16:57:38 +01:00
Tom Christie
bdb884aceb Latest sponsor update 2014-08-14 16:57:21 +01:00
Tom Christie
f23b500fba Merge pull request #1757 from jwhitlock/error_as_list 
ModelSerializer.restore_object - wrap ValueError error in a list
 2014-08-14 14:29:28 +01:00
John Whitlock
34c1da3515 ModelSerializer.restore_object - errors as list 
When a ValueError is raised in ModelSerializer.restore_object, the error
is set to a one-element list, rather than a bare string.
 2014-08-13 15:31:25 -05:00
Tom Christie
c52075f392 Latest sponsor update 2014-08-13 14:02:09 +01:00
Tom Christie
5d674927b8 Minor docs style change 2014-08-12 14:59:17 +01:00
Tom Christie
c716f35825 Added Cantemo 2014-08-12 14:57:27 +01:00
Tom Christie
7551db23ca Added Rob Spectre 2014-08-12 13:47:34 +01:00
Tom Christie
9c56c7b130 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-08-12 13:44:17 +01:00
Tom Christie
f46b55b75f Added OpenEye as a silver sponsor 2014-08-12 13:44:00 +01:00
Tom Christie
9b16f1bf1d Merge pull request #1750 from tomchristie/json-renderer-refactor 
Refactor JSONRenderer slightly for easier overriding
 2014-08-11 17:13:51 +01:00
Tom Christie
09c53bbac9 Refactor JSONRenderer slightly for easier overriding 2014-08-11 16:20:27 +01:00
Tom Christie
c6326d0a67 Merge pull request #1745 from nemesisdesign/patch-4 
docs: add reference to gis serializer
 2014-08-09 07:41:37 +01:00
Tom Christie
8e7e09626a Merge pull request #1744 from nemesisdesign/patch-3 
docs: add reference to DRF-gis in fields
 2014-08-09 07:40:49 +01:00
Federico Capoano
c462a43a87 docs: added reference to gis serializer 
added reference to GeoFeatureModelSerializer of django-rest-framework-gis
 2014-08-08 14:39:56 +02:00
Federico Capoano
5eb901cd2a docs: added reference to DRF-gis in fields 
added django-rest-framework-gis to third party packages section in /docs/api-guide/fields.md
 2014-08-08 14:25:02 +02:00
Tom Christie
ec6f9f1518 Merge pull request #1740 from kevinlondon/patch-4 
Updated links to Bootstrap components
 2014-08-08 00:43:10 +01:00
Kevin London
bc03d2b553 Updated links to Bootstrap components 
The previous links landed on the the main page and no longer directly linked to specific areas.
 2014-08-07 16:32:40 -07:00
Kevin London
aac864a55f Updated documentation for urls.py 
I made a small change in the order of the documentation for urls.py. I feel it helps make it clear which lines you should add to the root settings.
 2014-08-07 11:02:48 -07:00
Tom Christie
31591d6cfc Merge pull request #1737 from kevinlondon/patch-2 
Include query parameter override instructions for OrderingFilter
 2014-08-07 09:11:17 +01:00
Paul Oswald
192201d584 remove dep on python_2_unicode_compatible 
python_2_unicode_compatible is not available in all Django versions
 2014-08-07 15:48:29 +09:00
Kevin London
617745eca0 Update description of OrderingFilter 
I added a brief description of how you could specify a different query parameter for the OrderingFilter.
 2014-08-06 16:26:56 -07:00
Tom Christie
4086e0562c Merge pull request #1736 from robbyt/patch-2 
minor doc fix, @api_view() needs an iterable
 2014-08-07 00:10:51 +01:00
Rob Terhaar
3217842346 minor doc fix, @api_view() needs an iterable 2014-08-06 18:55:08 -04:00
Tom Christie
5ba2962036 Merge pull request #1733 from nimiq/patch-1 
Fix style for some text
 2014-08-06 12:48:55 +01:00
nimiq
62d0d4e5d2 Fix style for some text 2014-08-06 12:45:58 +02:00
Tom Christie
0ae55902ee Merge pull request #1732 from jalan/master 
Remove duplicate class attributes
 2014-08-05 17:40:04 +01:00
Tom Christie
83597a4b0f Latest sponsor update 2014-08-05 15:31:39 +01:00
Jason Alan Palmer
2d6469348d Remove duplicate class attributes 
These duplicate attributes are ignored by at least Firefox and Chrome, so this change has no effect on the style
 2014-08-05 10:25:48 -04:00
Tom Christie
322476c386 Latest sponsor update 2014-08-04 09:20:27 +01:00
Tom Christie
7bc9954fdb Update sponsorships 2014-08-02 15:28:34 +01:00
Tom Christie
d0fdcdfdad Added pathwright 2014-08-02 15:18:03 +01:00
Tom Christie
3ac075a227 Update Nephila sponsorship 2014-08-02 15:08:14 +01:00
Tom Christie
f58dde59c4 Sponsor updated 2014-08-02 15:05:03 +01:00
Tom Christie
9af3dc0ba5 Added ProReNata AB 2014-08-01 13:54:26 +01:00
Tom Christie
5377bda942 Fix LaterPay link 2014-08-01 13:42:51 +01:00
Tom Christie
27af7a3f4f Latest sponsor updates 2014-08-01 11:36:33 +01:00
Tom Christie
f87aadb3ce Latest sponsor updates 2014-08-01 11:35:48 +01:00
Anler Hp
ebcc78d96c Leave status responsibility to parent class 
Django's `HttpResponse` class checks for the `status` param when it's
initialized, if it's `None` it uses the class attribute
`status_code` and thanks to that we can do things like:

```
class BadRequest(HttpResponse):
    status_code = 400
```

Now, that doesn't work when inheriting from rest-framework's `Response`:

```
class BadRequest(rest_framework.response.Response):
    status_code = 400  # Bad, it's always ignored
```

Because a default status of `200` is being specified in
`rest_framework.response.Response`. I think is more Django-friendly to
just leave that status default value to `None` and leave the
responsibility of choosing its value to the parent class: `HttpResponse`.
 2014-08-01 10:20:10 +02:00
Tom Christie
18f2ca4b02 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-07-31 22:33:59 +01:00
Tom Christie
6677374e9b Kickstarter sponsors 2014-07-31 22:33:45 +01:00
Xavier Ordoquy
0d2c0ef111 Merge pull request #1724 from kevinlondon/patch-1 
Updated Permissions doc link to Django docs
 2014-07-31 21:45:25 +02:00
Kevin London
c0f002b09d Updated Permissions doc link to Django docs 
The previous link went to version 1 docs so it was a dead link.
 2014-07-31 12:41:15 -07:00
Tom Christie
8044416523 Add platinum sponsors 2014-07-31 20:19:28 +01:00
Tom Christie
57d6e04ff5 Add django-rest-framework-mongoengine link. Closes #1722 Closes #1562 Closes #1545 2014-07-30 12:50:36 +01:00
Xavier Ordoquy
983400ddc4 Merge pull request #1720 from tomchristie/feature/django_guardian_cleanup 
Django & Django guardian updates
 2014-07-29 22:29:58 +02:00
Paul Oswald
66fa40c300 evaluate content at function start 2014-07-29 22:13:11 +09:00
Xavier Ordoquy
5e02f015b8 Better fix for the Django 1.3 compat 2014-07-29 10:30:08 +02:00
Xavier Ordoquy
59d0a0387d Fixed the Django 1.3 compat 2014-07-29 10:20:10 +02:00