Commit Graph

5001 Commits

Author SHA1 Message Date
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
Xavier Ordoquy
02ee3871ae Merge remote-tracking branch 'origin/master' into release/3.0.3 2015-01-08 23:24:19 +01:00
Tom Christie
4d9e7a5356 Ammend docstring to use python2/3 compatible example. 2015-01-08 15:38:27 +00:00
Tom Christie
0800866988 Fix broken 1.7.3. It's 1.7.2 - 1.7.3 is documented but not yet on PyPI. 2015-01-08 14:54:54 +00:00
Tom Christie
42c913334b Minimum 1.6.x version is 1.6.3 2015-01-08 14:51:08 +00:00
Tom Christie
f529f83d3c Minimum Django 1.5 version issue 1.5.6 2015-01-08 14:38:23 +00:00
Tom Christie
b33a6cbff1 Ensure urlparse is not publically exposed in compat.py - less chance of accidental conflict. 2015-01-08 14:16:58 +00:00
Tom Christie
3dbcefb3c7 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2015-01-08 11:07:52 +00:00
Tom Christie
e61ef3d39f Minor docs updates 2015-01-08 11:07:47 +00:00
Tom Christie
c3814123d7 Merge pull request #2386 from linovia/bugfix/drop_egg_support
Mark Django REST Framework as incompatible with eggs
2015-01-07 21:12:53 +00:00
Tom Christie
18cefad3ab Update project-management.md 2015-01-07 21:03:50 +00:00
Tom Christie
1102e22cb4 Update project-management.md 2015-01-07 21:02:42 +00:00
Xavier Ordoquy
60f5b5d9f3 Make Django REST Framework as zip unsafe. 2015-01-07 19:19:33 +01:00
Xavier Ordoquy
b7015ea898 Bumped the version to 3.0.3. 2015-01-07 19:11:17 +01:00
Xavier Ordoquy
42f1932b52 Release notes for 3.0.3 2015-01-07 19:10:22 +01:00
Tom Christie
ff726aa44c Merge pull request #2382 from JocelynDelalande/patch-1
fixed doc : DEFAULT_AUTHENTICATION_CLASSES -> DEFAULT_AUTHENTICATION
2015-01-07 09:55:18 +00:00
JocelynDelalande
fe92a2cfee fixed doc : DEFAULT_AUTHENTICATION_CLASSES -> DEFAULT_AUTHENTICATION
+ It is consistent with docs about DEFAULT_PERMISSION_CLASSES
2015-01-07 10:42:11 +01:00
Tom Christie
e6002099ca Merge pull request #2379 from Gaffney/fix-compat-comment
Fix compatibility comment regarding OrderedDict
2015-01-07 09:17:11 +00:00
Ryan Gaffney
07ad0474c0 Fix compatibility comment regarding OrderedDict 2015-01-06 14:34:36 -08:00
Tom Christie
271b638df1 Update exception docs. Closes #2378. 2015-01-06 11:21:58 +00:00
Tom Christie
d3b2302588 Minor docs update. Refs #2375. 2015-01-05 16:31:52 +00:00
Tom Christie
26ac2656e5 Pass init arguments through to serializer from pagination serializer.
Closes #2355.

Normally a serializer won't need these arguments on __init__, but
if a user has customized __init__ they may expect them to be available.
2015-01-05 16:20:15 +00:00
Tom Christie
6fd33ddea9 Udpate docstring 2015-01-05 15:04:01 +00:00
Tom Christie
b6ca7248eb required=False allows omission of value for output. Closes #2342 2015-01-05 14:32:12 +00:00
Tom Christie
8cf3744971 Ensure no invalid min_length/min_value/max_value arguments. Closes #2369. 2015-01-05 10:52:18 +00:00
Tom Christie
f8e310fdbb Merge pull request #2371 from robbyt/patch-4
fix the serializer widget style formatting documentation
2015-01-02 10:38:36 +00:00
Rob Terhaar
336faf5a86 fix widget style formatting 2015-01-01 21:01:16 -05:00
Tom Christie
4bca062df6 Merge pull request #2363 from kdazzle/models_meta-cleanup
First pass at refactoring get_field_info in utils.model_meta
2014-12-30 10:36:17 +00:00