Commit Graph

1828 Commits

Author SHA1 Message Date
Juan Riaza
268f60999c unused imports 2013-01-10 15:48:22 +01:00
Tom Christie
cb235977f6 Include CSRF note in SessionAuthentication docs. 2013-01-09 09:22:23 +00:00
Mark Shirley
394a26f833 Merge pull request #553 from maspwr/null-one-to-one
Handle ObjectDoesNotExist exceptions when serializing null reverse one-to-one
2013-01-08 08:40:00 -08:00
Mark Aaron Shirley
b298bf53f3 Update release notes 2013-01-08 08:35:41 -08:00
Mark Aaron Shirley
81691ff900 Merge remote-tracking branch 'upstream/master' into null-one-to-one 2013-01-08 08:33:01 -08:00
Tom Christie
431ced66e4 Merge pull request #566 from mjtamlyn/patch-1
ObtainAuthToken pluggable Serializer.
2013-01-08 07:38:18 -08:00
Tom Christie
37a8458687 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-01-08 15:05:34 +00:00
Tom Christie
c1f194b0a5 Fix inconsistent view_name logic. Fixes #567. 2013-01-08 15:03:14 +00:00
Marc Tamlyn
49cd5e59a8 ObtainAuthToken pluggable Serializer.
It should have serializer_class in the same way as any other API view.
2013-01-08 12:20:01 +00:00
Stephan Groß
ae139cb06f Merge pull request #565 from mjtamlyn/patch-1
Fix reference to BasicAuthentication in settings.
2013-01-08 03:58:06 -08:00
Marc Tamlyn
4df1172665 Fix reference to BasicAuthentication in settings. 2013-01-08 11:45:55 +00:00
Mark Aaron Shirley
a897eb5480 Create separate *NullableOneToOneTests TestCase 2013-01-07 16:27:31 -08:00
Tom Christie
4e8f55887d Clean up test slightly. Refs #552 2013-01-07 21:37:44 +00:00
Tom Christie
31b585f26a Note paginate_by=None usage. Fixes #555. 2013-01-07 21:13:10 +00:00
Tom Christie
4bb504732d Respect blank=True on relational fields. Fixes #537 2013-01-07 21:08:55 +00:00
Tom Christie
e429f702e0 Fix PAGINATE_BY_PARAM docs. Refs #551 2013-01-07 20:17:52 +00:00
Tom Christie
d9df15f321 Added @juanriaza's djangorestframework-msgpack package to the docs. 2013-01-07 17:36:31 +00:00
Tom Christie
de00d3720e Added @mjtamlyn. Thanks! 2013-01-07 17:36:31 +00:00
Tom Christie
47f0d17f4d Merge pull request #562 from mjtamlyn/view-name
Support URL namespaces.
2013-01-07 06:55:33 -08:00
Marc Tamlyn
5bded1ecf0 Use ResolveMatch.view_name so namespaces work. 2013-01-07 14:34:45 +00:00
Tom Christie
55584928ca Merge pull request #561 from mjtamlyn/import-errors
When importing settings, don't suppress any old error which happens
2013-01-07 05:01:39 -08:00
Marc Tamlyn
c736b80290 Be more informative when reporting import errors. 2013-01-07 12:52:20 +00:00
Tom Christie
152e6d5c0a Added @michaelmior. Thanks! 2013-01-07 08:57:43 +00:00
Tom Christie
2034009b59 Merge pull request #559 from michaelmior/django1.5-static
{% static %} template tag for Django 1.5
2013-01-07 00:52:23 -08:00
Michael Mior
9b67a33b92 Use the correct static template tag in Django 1.5 2013-01-06 15:49:12 -05:00
Yuri Prezument
12bb25b372 Added @juanriaza. Thanks 2013-01-05 18:02:26 +02:00
Yuri Prezument
d7f3c86ad1 Updated release notes 2013-01-05 18:01:57 +02:00
Yuri Prezument
e65f407164 Merge pull request #554 from juanriaza/master
Deprecate django.utils.simplejson in favor of Python 2.6's built-in json module
2013-01-05 07:57:42 -08:00
Juan Riaza
a061e3d9e2 deprecate simplejson 2013-01-05 13:40:02 +01:00
Stephan Groß
8a4e2c1725 removed duplicate entry in 2.1.15 2013-01-05 11:20:36 +01:00
Mark Aaron Shirley
213981cef3 Handle ObjectDoesNotExist exceptions when serializing null reverse one-to-one 2013-01-04 21:11:03 +01:00
Tom Christie
26f9acb45a Validation errors instead of exceptions when serializers receive incorrect types. Fixes #402. 2013-01-04 14:11:05 +00:00
Tom Christie
eb14278a3b Add proper validation for updating relational fields with incorrect types. Fixes #446. 2013-01-04 13:50:40 +00:00
Tom Christie
4c86fd46d7 Rename module for basic relational field tests 2013-01-04 13:05:31 +00:00
Tom Christie
6e9865cb71 Fix for #446. Note: Also needs applying to other relational types. 2013-01-03 23:17:31 +00:00
Tom Christie
9b1532b1ea Merge pull request #548 from maspwr/master
Remove duplicate release notes line
2013-01-03 14:22:35 -08:00
Mark Shirley
466d4584ae Remove duplicate release notes line 2013-01-03 23:18:58 +01:00
Tom Christie
ad671022e1 Version 2.1.15 2013-01-03 22:14:11 +00:00
Tom Christie
4223786ddc Tweak release notes. 2013-01-03 22:11:50 +00:00
Tom Christie
7ed81c3c66 Tweak comment. 2013-01-03 22:06:55 +00:00
Tom Christie
6da21fa796 Merge pull request #541 from yprez/default_and_partial_serializers2
Fix "default" values and partial serializers.  Fixes #532.
2013-01-03 14:05:36 -08:00
Tom Christie
a122856d46 Tweak behavior of hyperlinked fields with an explicit format suffix. 2013-01-03 21:50:28 +00:00
Tom Christie
bfea7f64ee Tweak behavior of hyperlinked fields that include an explicit format suffix. 2013-01-03 21:49:29 +00:00
Tom Christie
92ae08207a Drop unused private save_m2m flag 2013-01-03 21:49:01 +00:00
Tom Christie
05c72a5d30 Fix copyright notice and travis badge 2013-01-03 21:46:39 +00:00
Mark Shirley
610508a5bc Merge pull request #546 from maspwr/refactor-relation-models
Move relation tests models into models.py
2013-01-03 04:44:28 -08:00
Mark Aaron Shirley
8fd1f09dad Move relation tests models into models.py 2013-01-03 10:23:13 +01:00
Yuri Prezument
ed9f20823b Merge pull request #545 from yprez/filefield-no-files_issue542
FileField validation with files=None
2013-01-03 01:11:16 -08:00
Yuri Prezument
097f4c6962 Updated release-notes 2013-01-03 09:40:49 +02:00
Yuri Prezument
3f5e938247 Some cleanup 2013-01-03 08:28:17 +02:00