encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-09-22 03:49:06 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,989 Commits 18 Branches 132 Tags 120 MiB
a1fa7218eb
Commit Graph

4989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Dutton
a1fa7218eb Pass {} as data to DataAndFiles, as it ends up in a MergeDict 
In the same vein as #2399.
 2015-01-23 16:52:24 +00:00
Tom Christie
b07d931261 Merge pull request #2448 from tomchristie/uuid-field 
Added UUIDField.
 2015-01-23 15:43:21 +00:00
Tom Christie
47ddbc09d9 Merge pull request #2447 from carltongibson/update-df-references 
Update Django-Filter references
 2015-01-23 15:33:48 +00:00
Tom Christie
889a07f556 Support assignment in ClassLookupDict 2015-01-23 15:32:21 +00:00
Tom Christie
5bb348605e UUIDField docs 2015-01-23 15:31:08 +00:00
Tom Christie
e8db1834d3 Added UUIDField. 2015-01-23 15:24:06 +00:00
Carlton Gibson
790c92d438 Update Django-Filter references in docs and requirements. 2015-01-23 15:22:20 +01:00
Carlton Gibson
bf0b331e8f Restore DF for Django 1.8 2015-01-23 15:21:51 +01:00
Tom Christie
4201c9fb01 Drop erronous check-in 2015-01-23 13:42:56 +00:00
Tom Christie
d1fe3f6548 Merge pull request #2446 from tomchristie/django-18-alpha 
Support 1.8-alpha.
 2015-01-23 13:13:05 +00:00
Tom Christie
04a5f7bf0a Move 1.8-alpha out of 'expected failures' 2015-01-23 13:04:29 +00:00
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