encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-27 03:54:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,028 Commits 18 Branches 132 Tags 105 MiB
f676569661
Commit Graph

5028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
f3b6eedb8a More sensible response caching. 2015-01-23 12:56:55 +00:00
Tom Christie
f1ac9d3f9b More graceful handling of malformed Content-Disposition 2015-01-23 12:26:44 +00:00
Tom Christie
4cb164b66c Add missing skipUnless(django_filters) 2015-01-23 11:49:57 +00:00
Tom Christie
e988d57853 Fix template loader monkey patching to also support 1.8 2015-01-23 11:47:01 +00:00
Tom Christie
e307fd289c Fix test matrix 2015-01-23 11:38:58 +00:00
Tom Christie
5eb6949e9f Drop django-filter from 1.8 2015-01-23 11:32:04 +00:00
Tom Christie
25a703b42c Work around meta API differences 2015-01-23 11:15:11 +00:00
Tom Christie
e56f0a928c Merge pull request #2441 from linovia/bugfix/2425 
Support for Django 1.8a1
 2015-01-23 09:50:10 +00:00
Tom Christie
0b91714100 Merge pull request #2444 from duncm/patch-1 
fix link to Django CSRF docs
 2015-01-22 09:38:00 +00:00
Duncan Maitland
6e471ad8f4 fix link to Django CSRF docs 2015-01-22 18:29:20 +11:00
Xavier Ordoquy
15f797fd3e Owned by import * 2015-01-21 19:46:31 +01:00
Xavier Ordoquy
857185cf07 Workaround Django issue 24198. 2015-01-21 19:29:40 +01:00
Xavier Ordoquy
a7567efa8d Use compact traceback for errors reporting. 2015-01-21 19:26:57 +01:00
Tom Christie
4cf03e30ff Do not render HTML output for hidden fields. Closes #2410. 2015-01-21 14:27:51 +00:00
Tom Christie
e59b3d1718 Make ReturnDict cachable. Closes #2360. 2015-01-21 14:18:13 +00:00
Tom Christie
9d24809a4d Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2015-01-21 13:03:49 +00:00
Tom Christie
da6ef3d0b0 Allow missing fields option for inherited serializers. Closes #2388. 2015-01-21 13:03:37 +00:00
José Padilla
c0fa92e9ad Merge pull request #2438 from soooooot/patch-1 
correcting unclosed quote in docs routers.md
 2015-01-20 10:33:12 -04:00
soooooot
3ca8f85a5b correcting unclosed quote in routers.md 
correcting unclosed quote in routers.md
 2015-01-20 22:24:58 +08:00
José Padilla
e39d8410de Merge pull request #2437 from erictheise/patch-2 
correcting "it's" to "its" in Tutorial 1
 2015-01-19 19:08:11 -04:00
Eric Theise
b0bc79ed4d correcting "it's" to "its" in Tutorial 1 2015-01-19 14:49:36 -08:00
Tom Christie
fdeef89ba7 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2015-01-19 14:48:42 +00:00
Tom Christie
46a3eda08d NotImplemented -> NotImplementedError 2015-01-19 14:48:13 +00:00
Tom Christie
ae77ff9813 Merge pull request #2434 from alexsdutton/patch-1 
NotImplemented is not an exception
 2015-01-19 14:47:28 +00:00
Alexander Dutton
af05820b1b NotImplemented is not an exception 
`NotImplemented` is a singleton object, not an exception. You should be raising `NotImplementedError` here instead.
 2015-01-19 14:23:13 +00:00
Tom Christie
0dffc46cb7 ReturnDict and ReturnList repr as standard dict/list. Closes #2421. 2015-01-19 14:21:09 +00:00
Tom Christie
da1db34a36 Handle UUID objects in JSONEncoder. Closes #2433. 2015-01-19 14:19:01 +00:00
Tom Christie
b3a0a2794b Merge pull request #2430 from Polyconseil/fbochu/timedelta-json-serialiser-python26-support 
Fix timedelta JSON serialization on Python 2.6.
 2015-01-19 12:15:02 +00:00
Fabien Bochu
5484d570cb Fix timedelta JSON serialization on Python 2.6. 2015-01-19 13:09:08 +01:00
Xavier Ordoquy
4f27b966a5 Merge pull request #2427 from DavidMuller/pytest_version_bumps 
Preliminary Support For Django 1.8 Alpha
 2015-01-19 02:40:15 +01:00
David Muller
b5128ca574 Save objects before assigning them in InheritedModelSerializationTests; Django 1.8 now throws an error when assigning unsaved objects to Foreign Key, GenericForeignKey, and OneToOneFields 2015-01-18 15:19:11 -08:00
David Muller
a82a4d0a09 Add Django 1.8 alpha to test matrix 2015-01-18 15:04:50 -08:00
David Muller
1421b057f7 Bump pytest version in tox.ini to 2.6.4 2015-01-18 14:48:23 -08:00
David Muller
eb91076886 Bump pytest-django version in tox.ini to 2.8.0 2015-01-18 14:47:37 -08:00
David Muller
00449dc42c Bump pytest version to 2.6.4 2015-01-18 13:56:52 -08:00
David Muller
7c0d14a6d5 Bump pytest-django version to 2.8.0 2015-01-18 13:55:53 -08:00
Tom Christie
4ce4132e08 Preserve ordering on relationship drop-down choices. Closes #2408. 2015-01-14 12:56:03 +00:00
Carlton Gibson
41e13d73fa Merge pull request #2407 from philipn/filters_link_fix 
Fix link to `django-rest-framework-filters`
 2015-01-13 09:04:33 +01:00
Philip Neustrom
7f9a62a5bf Fix link to django-rest-framework-filters (formerly 
`django-rest-framework-chain`)
 2015-01-13 15:22:08 +08:00
Tom Christie
fb0a434f9b Merge pull request #2399 from askholme/master 
Fix for FileUploadParser with 3.x
 2015-01-12 12:21:35 +00:00
Tom Christie
69fea56245 Merge pull request #2401 from jpadilla/master 
Fix ident format when using HTTP_X_FORWARDED_FOR
 2015-01-12 12:20:47 +00:00
José Padilla
cc13ee0577 Fix error when NUM_PROXIES is greater than one 2015-01-12 08:12:24 -04:00
José Padilla
d6d08db0dd Fix ident format when using HTTP_X_FORWARDED_FOR 
If NUM_PROXIES setting is set to None,
HTTP_X_FORWARDED_FOR might be used as is, which
might contain spaces and cause errors on
cache backends like memcached.
 2015-01-11 10:58:08 -04:00
José Padilla
e9ac1bb78a Merge pull request #2398 from sloria/readme-links 
Fix broken links in README
 2015-01-10 13:46:11 -04:00
Ask Holme
d6bff10f98 Make FileUploadParser work with standard django API 
Output from parsers ends up in a Django MergeDict and they exists elements to be dicts - not None
 2015-01-10 18:15:21 +01:00
Steven Loria
50b206d373 Fix broken links in README 2015-01-10 10:17:37 -06:00
Tom Christie
605c1fa0a8 Merge pull request #2397 from travelton/TweakTutorialDocs 
Tweaked a few issues in the tutorial documentation.
 2015-01-10 14:07:13 +00:00
Xavier Ordoquy
7e921caf4b Merge pull request #2385 from linovia/release/3.0.3 
Release 3.0.3
 2015-01-10 10:36:19 +01:00
Travis Swientek
8ccf5bcc0b Tweaked a few issues in the tutorial documentation. 2015-01-09 11:36:21 -08:00
Xavier Ordoquy
ef16c546d7 Update the release note with latest fixes. 
Add the link to the 3.0.3 milestone.
 2015-01-08 23:29:51 +01:00