Commit Graph

  • 6d4c6999af Merge pull request #374 from tonimichel/master Tom Christie 2012-11-06 03:03:04 -0800
  • 5d6d883542 Merge 5d69628250 into d9be6140dc Toni 2012-11-06 03:02:40 -0800
  • d9be6140dc More defensive coding. Refs: #348 Tom Christie 2012-11-06 11:01:53 +0000
  • 0d2377c148 Respect false value defaults on WritableField. Fixes #377. Tom Christie 2012-11-06 10:55:58 +0000
  • 470878a591 Allow slug_url_kwarg to be overidden by subclass. Fixes #373 Tom Christie 2012-11-06 10:47:26 +0000
  • b19c58ae17 Support for HTML error templates. Fixes #319. Tom Christie 2012-11-06 10:44:19 +0000
  • 09f39bd23b Merge branch 'master' into restframework2-filter Ben Konrath 2012-11-06 03:22:25 +0100
  • 5d69628250 Update rest_framework/serializers.py Toni 2012-11-05 20:55:03 +0100
  • 455a8cedcf Tweaks Tom Christie 2012-11-05 17:03:22 +0000
  • 9746abdf72 Version 2.1.0. Adding release notes. 2.1.0 Tom Christie 2012-11-05 16:46:33 +0000
  • 1418d104a8 Tweak related field docs now that queryset is no longer required. Tom Christie 2012-11-05 16:44:26 +0000
  • 867033e676 slug_url_kwarg should default to same as slug_field Tom Christie 2012-11-05 16:43:44 +0000
  • bf02c665f3 Merge 6ee5d86093 into 9731b95fc3 Stephan Groß 2012-11-05 08:40:11 -0800
  • 9731b95fc3 Merge pull request #347 from minddust/master Tom Christie 2012-11-05 08:36:59 -0800
  • 76716bc7fb Merge 85b176cf47 into b87f01aa54 Stephan Groß 2012-11-05 08:36:56 -0800
  • b87f01aa54 Merge pull request #371 from tomchristie/serializer-fixes Tom Christie 2012-11-05 08:35:54 -0800
  • e5b2f76a24 Merge 6d201c362f into 33217db33e Tom Christie 2012-11-05 08:32:29 -0800
  • 6d201c362f Drop unneccesarily lenient dictionary-containing-instances serialization. Tom Christie 2012-11-05 16:19:11 +0000
  • 6ee5d86093 switched to buildin status code Stephan Groß 2012-11-05 17:01:51 +0100
  • 42c0099e01 fixed typos Stephan Groß 2012-11-05 16:57:41 +0100
  • 85b176cf47 added docs Stephan Groß 2012-11-05 16:51:49 +0100
  • 0a660a531a fixed typo Stephan Groß 2012-11-05 16:43:03 +0100
  • 33217db33e Fix broken link Tom Christie 2012-11-05 15:39:03 +0000
  • 558b29e5ff Added @mjs7231 - Thanks! Tom Christie 2012-11-05 15:38:22 +0000
  • 03095f607a added testcase for custom slug field in hyperlinkedrelatedfield Stephan Groß 2012-11-05 16:37:37 +0100
  • 33be4b43b9 queryset argument is now optional on writable model fields. Tom Christie 2012-11-05 12:51:04 +0000
  • ccd5f29510 Tidy up serializer fields now we no longer use dynamic fields Tom Christie 2012-11-05 11:03:36 +0000
  • dfb8225447 Add note on * import Tom Christie 2012-11-05 10:56:30 +0000
  • b7b942c599 Swap position of instance and data keyword arguments. Tom Christie 2012-11-05 10:53:20 +0000
  • 44449fa1f5 Merge remote-tracking branch 'upstream/master' Stephan Groß 2012-11-05 11:45:49 +0100
  • 5b397e50dd Include queryset missing exception on writable SlugField Tom Christie 2012-11-05 10:16:23 +0000
  • 362c413f08 Update release notes. Tom Christie 2012-11-05 09:59:12 +0000
  • a4ab4355a6 Added @osiloke. Thanks! Tom Christie 2012-11-05 09:59:01 +0000
  • 8c8bf61c13 Merge pull request #365 from osiloke/e74772b8a6d0d9d218946a6bc8411afe8e77e0bb Tom Christie 2012-11-05 01:57:29 -0800
  • fde0c98159 Merge e74772b8a6 into b8fa379e50 Osiloke Harold Emoekpere 2012-11-05 01:57:20 -0800
  • b8fa379e50 Merge pull request #364 from mjs7231/master Tom Christie 2012-11-05 01:54:07 -0800
  • 089e264424 Merge 3d0f8b792f into 584c111aab mjs7231 2012-11-05 01:52:10 -0800
  • 584c111aab Merge pull request #366 from jmagnusson/master Tom Christie 2012-11-05 01:48:19 -0800
  • bf8e67dfc2 Add the ability to add read_only_fields in bulk in serializer model Pavel Savchenko 2012-11-05 09:48:47 +0200
  • c5dfec8513 #356 Fixes issue with blank=True in related fields if related field is defined in serializer. Does not work for those from model. Ian Strachan 2012-11-04 21:39:17 +0000
  • d81ded1157 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into related_blanks Ian Strachan 2012-11-04 21:23:45 +0000
  • a83b368b39 Merge 7df7dadccd into 3e0319389a Jacob Magnusson 2012-11-04 11:55:05 -0800
  • e74772b8a6 This accounts for none(null) values of rel.to when converting model fields from native Osiloke Emoekpere 2012-11-04 13:20:10 -0500
  • 3d0f8b792f Fix for bug #363: ChoiceField missing in renderers.py Michael Shepanski 2012-11-04 12:31:37 -0500
  • 60f846dc49 Merge 963c5fe4a7 into 3e0319389a Jacob Magnusson 2012-11-04 07:42:47 -0800
  • 7df7dadccd Remove `request' from response instance while testing caching Jacob Magnusson 2012-11-04 13:42:29 +0100
  • bd5a3ee7d5 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework Jacob Magnusson 2012-11-04 12:52:11 +0100
  • 963c5fe4a7 Remove attributes that are not needed when caching the Response object. This fixes #346 Jacob Magnusson 2012-11-04 12:48:41 +0100
  • 44f280c3ab Add tests for caching of GET/HEAD requests using Django's built in caching framework. Currently fails as some attributes on the Response object are not pickable Jacob Magnusson 2012-11-04 12:47:46 +0100
  • 3e0319389a Added @jmagnusson. Thanks! Tom Christie 2012-11-02 21:17:44 +0000
  • 746686b065 Merge pull request #360 from jmagnusson/master Tom Christie 2012-11-03 00:31:36 -0700
  • aa20751031 Merge 38af6107b5 into 59c1e0933f Jacob Magnusson 2012-11-02 16:38:06 -0700
  • 38af6107b5 Added test for ModelSerializer Meta fields returning as expected Jacob Magnusson 2012-11-03 00:32:08 +0100
  • 1b49615c00 Added test that makes sure that fields with dictionaries as data are returned as expected and not turned into string representations Jacob Magnusson 2012-11-03 00:32:02 +0100
  • 19a218f859 Bye bye star import Jacob Magnusson 2012-11-03 00:27:56 +0100
  • 59c1e0933f Update release notes Tom Christie 2012-11-02 21:13:29 +0000
  • b468dd6271 Merge pull request #359 from tomchristie/relationship_tests Tom Christie 2012-11-02 14:08:49 -0700
  • 52b49809da Merge 8ec54e6a9f into dafbbdc5bf Tom Christie 2012-11-02 14:08:37 -0700
  • dafbbdc5bf Merge pull request #358 from jmagnusson/master Tom Christie 2012-11-02 14:08:21 -0700
  • 8ec54e6a9f Tweaks Tom Christie 2012-11-02 20:56:51 +0000
  • 6eaec7a0ec foreign key tests Tom Christie 2012-11-02 20:53:33 +0000
  • db551b4181 Merge a6806f0307 into b9bff2a984 jmagnusson 2012-11-02 13:52:52 -0700
  • a6806f0307 Apply to_native on dictionary keys as well Jacob Magnusson 2012-11-02 21:48:16 +0100
  • 3de61d200c Don't convert dictionary into a string representation Jacob Magnusson 2012-11-02 20:55:58 +0100
  • e84ce60a0d Initial PK relationship tests Tom Christie 2012-11-02 19:11:40 +0000
  • b9bff2a984 Fix issues with pk related fields in the browsable API. 2.0.2 Tom Christie 2012-11-02 14:05:14 +0000
  • 2dec2b9c13 Remove accidental egg-info files Tom Christie 2012-11-01 23:50:00 +0000
  • b8648c08be gitignore *.egg-info Tom Christie 2012-11-01 23:48:25 +0000
  • 062f5caef3 Tweaks fields docs, and fix 2.0.1 version. 2.0.1 Tom Christie 2012-11-01 23:40:34 +0000
  • 09d70958bd Update release notes Tom Christie 2012-11-01 23:15:36 +0000
  • 5209cd1dda Merge pull request #357 from tomchristie/browseable-api-relationships Tom Christie 2012-11-01 16:12:42 -0700
  • 4a9aa58f94 Merge 36e21153fb into 600289a815 Tom Christie 2012-11-01 16:11:36 -0700
  • 36e21153fb Merge master Tom Christie 2012-11-01 23:11:28 +0000
  • d327c5f531 Relational field support in browseable API. Tom Christie 2012-11-01 23:04:13 +0000
  • 49da11b0bf Failing tests for RelatedFields with blank=True when blank value is supplied Ian Strachan 2012-11-01 21:31:29 +0000
  • 01564fb1e5 Revert "Add django-filter (and django) requirement to setup.py." Ben Konrath 2012-11-01 21:57:14 +0100
  • 14a29de3ff Merge 5b399a844b into 4e7805cb24 benkonrath 2012-11-01 12:28:25 -0700
  • 5b399a844b Add django-filter (and django) requirement to setup.py. Ben Konrath 2012-11-01 20:28:15 +0100
  • 40c24a5ab0 Add django-filter to tox.ini. Ben Konrath 2012-11-01 20:11:50 +0100
  • 806bb728bf Use requirements.txt in Travis 'install'. Ben Konrath 2012-11-01 20:11:15 +0100
  • dc3ecb85bb clean up 'pk' getattr, add the ability to specify which model fields are read_only in bulk Pavel Savchenko 2012-11-01 17:56:15 +0200
  • 9f1aca6a25 Change django-filter requirement to upstream version. Ben Konrath 2012-11-01 16:41:31 +0100
  • 10ed127df1 Merge branch 'add_pk_support' of https://github.com/asfaltboy/django-rest-framework into fix_trans_choices Pavel Savchenko 2012-11-01 15:32:09 +0200
  • 600289a815 Added @ottoyiu. Thanks! Tom Christie 2012-11-01 13:31:22 +0000
  • 5558c0530f Merge pull request #351 from asfaltboy/fix_trans_choices Tom Christie 2012-11-01 06:27:28 -0700
  • c1613bc592 Merge d3aedd5fb1 into aa779598aa Pavel Savchenko 2012-11-01 06:26:30 -0700
  • aa779598aa Merge pull request #352 from asfaltboy/cleanup_MultipleObjectBaseView Tom Christie 2012-11-01 06:12:16 -0700
  • bbc8cfc8dd Merge 9a0cc7c720 into 204db7bdaa Pavel Savchenko 2012-11-01 06:10:52 -0700
  • 9c82f9717e Merge branch 'master' into restframework2-filter Ben Konrath 2012-11-01 14:06:56 +0100
  • 9a0cc7c720 since MultipleObjectBaseView was renamed MultipleObjectAPIView, it stands to reason to complete the renaming in docs and comments as well. Pavel Savchenko 2012-11-01 15:06:11 +0200
  • d3aedd5fb1 return choices as unicode and not string, might as well have jsonp return unicode Pavel Savchenko 2012-11-01 15:00:22 +0200
  • 204db7bdaa Merge pull request #349 from ZestCore/master Tom Christie 2012-11-01 02:12:20 -0700
  • e01b0d9ec0 Comments Pavel Savchenko 2012-11-01 08:59:19 +0200
  • bd24d83333 actually look for the right attribute Pavel Savchenko 2012-11-01 08:53:13 +0200
  • 19bcc3c865 use getattr to choose the pk field Pavel Savchenko 2012-11-01 08:51:55 +0200
  • 7a12741524 correct value to val Pavel Savchenko 2012-11-01 08:41:37 +0200
  • b53a2f74ed Do not rely that primary_key will always be first field, Add support for specifying fields = ('pk',) to serialize the primary key field (no matter how the field is actually called) Pavel Savchenko 2012-11-01 08:36:26 +0200
  • 3da49a484e Merge 756297ad1d into 027c9079f6 Otto Yiu 2012-10-31 21:40:49 -0700
  • 756297ad1d fix 'from_native' method when rel is None Otto Yiu 2012-10-31 21:40:20 -0700
  • 96dc9ce1ad Fixing documentation on auth/throttling guides Otto Yiu 2012-10-31 21:27:21 -0700