Commit Graph

5003 Commits

Author SHA1 Message Date
Tom Christie
761f264f59 Merge pull request #2473 from tomchristie/reload-settings
Reload api_settings when using Django's 'override_settings'
2015-01-28 09:05:51 +00:00
Xavier Ordoquy
0daf160946 Fix #2476 2015-01-28 00:06:34 +01:00
Xavier Ordoquy
cf8a09993f Merge pull request #2474 from linovia/release/3.0.4
Release notes for 3.0.4
2015-01-27 23:07:37 +01:00
Xavier Ordoquy
5b369bf5fe Bumped the version. 2015-01-27 19:45:37 +01:00
Xavier Ordoquy
925ea4bdc6 Release notes for 3.0.4 2015-01-27 19:43:38 +01:00
Tom Christie
65bca59ea5 Reload api_settings when using Django's 'override_settings' 2015-01-27 13:51:30 +00:00
Tom Christie
fc70c0862f Galileo Press -> Rheinwerk Verlag 2015-01-26 14:07:21 +00:00
José Padilla
221a28ff92 Merge pull request #2458 from jfw/patch-3
typo in fields.md
2015-01-25 09:42:41 -04:00
Jeff Fein-Worton
0a65913fea typo in fields.md 2015-01-24 18:34:16 -08:00
Kevin Brown
9687f4ffae Merge pull request #2457 from jfw/patch-3
minor typo in viewsets docs
2015-01-24 16:30:53 -05:00
Jeff Fein-Worton
39da9c7c86 minor typo in viewsets docs 2015-01-24 12:53:21 -08:00
Tom Christie
0cb5acee75 Merge pull request #2453 from alexsdutton/data-and-files-none-data
Pass {} as data to DataAndFiles, as it ends up in a MergeDict
2015-01-23 18:03:40 +00:00
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
8f6d7f4a5a Merge pull request #2451 from tomchristie/dict-field
Added DictField and support for HStoreField.
2015-01-23 16:33:37 +00:00
Tom Christie
35f6a82462 Added DictField and support for HStoreField. 2015-01-23 16:27:23 +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