Commit Graph

2918 Commits

Author SHA1 Message Date
Tom Christie
9fd061a0b6 Merge branch 'restframework2-filter' of git://github.com/onepercentclub/django-rest-framework into filtering 2012-11-07 20:13:27 +00:00
Tom Christie
066d51faa1 Merge pull request #382 from minddust/master
fixed typo
2012-11-07 12:01:38 -08:00
Stephan Groß
f3c94acc4a fixed typo 2012-11-07 17:19:13 +01:00
Tom Christie
3debd7b1a2 Version 2.1.1 2012-11-07 11:43:47 +00:00
Tom Christie
0356c5dca4 Update release notes 2012-11-07 11:34:31 +00:00
Tom Christie
b3bf887c67 Make textareas in browseable API same width as everything else 2012-11-07 11:32:52 +00:00
Tom Christie
5e5c8899e2 Fix repeated breadcrumbs when optional trailing slash is used 2012-11-07 11:32:51 +00:00
Tom Christie
4546b01f9b Update release notes 2012-11-07 11:32:34 +00:00
Tom Christie
2529207bba Make textareas in browseable API same width as everything else 2012-11-07 10:13:14 +00:00
Tom Christie
296b737fb6 Fix repeated breadcrumbs when optional trailing slash is used 2012-11-07 10:03:51 +00:00
Tom Christie
02b7196ad4 Merge pull request #381 from minddust/master
fixed typo in html status code
2012-11-06 12:41:22 -08:00
Stephan Groß
e02a8470e8 fixed typo 2012-11-06 21:18:49 +01:00
Stephan Groß
4136b7e44b fixed typo in html status code 2012-11-06 21:11:05 +01:00
Tom Christie
a49285fe9a Merge pull request #379 from minddust/master
added changelog entry and fixed old one
2012-11-06 12:01:31 -08:00
Stephan Groß
62fc5b80ef fixed field name 2012-11-06 20:54:48 +01:00
Stephan Groß
1f67b9ba9c added changelog entry and fixed old one 2012-11-06 20:53:09 +01:00
Tom Christie
6d3bb67aa6 Add pk_url_kwarg to hyperlinked fields 2012-11-06 17:11:52 +00:00
Tom Christie
cedb3860f4 Use saner get_serializer signature 2012-11-06 17:05:15 +00:00
Tom Christie
12b86cb5e3 Update release notes 2012-11-06 17:05:15 +00:00
Tom Christie
8ca6569a06 Merge pull request #378 from minddust/master
slug support for HyperlinkedIdentityField
2012-11-06 09:02:37 -08:00
Stephan Groß
2c52a2581f added slug support for HyperlinkedIdentityField 2012-11-06 17:02:34 +01:00
Tom Christie
4f5a6fca64 Added @tonimichel. Thanks! 2012-11-06 11:04:27 +00:00
Tom Christie
6d4c6999af Merge pull request #374 from tonimichel/master
Fixed AttributeError in ModelSerializer.save when ModelSerializer.restore_object is overwritten
2012-11-06 03:03:04 -08:00
Tom Christie
d9be6140dc More defensive coding. Refs: #348 2012-11-06 11:01:53 +00:00
Tom Christie
0d2377c148 Respect false value defaults on WritableField. Fixes #377. 2012-11-06 10:55:58 +00:00
Tom Christie
470878a591 Allow slug_url_kwarg to be overidden by subclass. Fixes #373 2012-11-06 10:47:26 +00:00
Tom Christie
b19c58ae17 Support for HTML error templates. Fixes #319. 2012-11-06 10:44:19 +00:00
Ben Konrath
09f39bd23b Merge branch 'master' into restframework2-filter 2012-11-06 03:22:25 +01:00
Toni
5d69628250 Update rest_framework/serializers.py
fixed AttributeError in case restore_object is overwritten without explicitly setting self.m2m_data
2012-11-05 20:55:03 +01:00
Tom Christie
455a8cedcf Tweaks 2012-11-05 17:03:22 +00:00
Tom Christie
9746abdf72 Version 2.1.0. Adding release notes. 2012-11-05 16:46:33 +00:00
Tom Christie
1418d104a8 Tweak related field docs now that queryset is no longer required. 2012-11-05 16:44:26 +00:00
Tom Christie
867033e676 slug_url_kwarg should default to same as slug_field 2012-11-05 16:43:44 +00:00
Tom Christie
9731b95fc3 Merge pull request #347 from minddust/master
support for passing custom slug options to HyperlinkedRelatedField
2012-11-05 08:36:59 -08:00
Tom Christie
b87f01aa54 Merge pull request #371 from tomchristie/serializer-fixes
Serializer fixes
2012-11-05 08:35:54 -08:00
Tom Christie
6d201c362f Drop unneccesarily lenient dictionary-containing-instances serialization. 2012-11-05 16:19:11 +00:00
Stephan Groß
85b176cf47 added docs 2012-11-05 16:51:49 +01:00
Stephan Groß
0a660a531a fixed typo 2012-11-05 16:43:03 +01:00
Tom Christie
33217db33e Fix broken link 2012-11-05 15:39:03 +00:00
Tom Christie
558b29e5ff Added @mjs7231 - Thanks! 2012-11-05 15:38:22 +00:00
Stephan Groß
03095f607a added testcase for custom slug field in hyperlinkedrelatedfield 2012-11-05 16:37:37 +01:00
Tom Christie
33be4b43b9 queryset argument is now optional on writable model fields. 2012-11-05 12:51:04 +00:00
Tom Christie
ccd5f29510 Tidy up serializer fields now we no longer use dynamic fields 2012-11-05 11:03:36 +00:00
Tom Christie
dfb8225447 Add note on * import 2012-11-05 10:56:30 +00:00
Tom Christie
b7b942c599 Swap position of instance and data keyword arguments. 2012-11-05 10:53:20 +00:00
Stephan Groß
44449fa1f5 Merge remote-tracking branch 'upstream/master' 2012-11-05 11:45:49 +01:00
Tom Christie
5b397e50dd Include queryset missing exception on writable SlugField 2012-11-05 10:16:23 +00:00
Tom Christie
362c413f08 Update release notes. 2012-11-05 09:59:35 +00:00
Tom Christie
a4ab4355a6 Added @osiloke. Thanks! 2012-11-05 09:59:35 +00:00
Tom Christie
8c8bf61c13 Merge pull request #365 from osiloke/e74772b8a6d0d9d218946a6bc8411afe8e77e0bb
Rare case where rel attribute of model field is None and DRF tries to return rel.to
2012-11-05 01:57:29 -08:00