Commit Graph

  • b5fd2226d1 Merge aea040161a into 34776da924 Tom Christie 2013-05-18 01:41:35 -0700
  • aea040161a Forms in Broseable API support dynamic serializers based on request method Tom Christie 2013-05-18 09:36:09 +0100
  • c56d5f8f63 Merge remote-tracking branch 'upstream/master' Craig de Stigter 2013-05-18 10:23:26 +0200
  • 34776da924 Minor mixin refactoring Tom Christie 2013-05-17 22:09:23 +0100
  • b6fb377c2b Fix PendingDeprecation warnings in tests Tom Christie 2013-05-17 21:57:11 +0100
  • 14ded26167 PendingDeprecation warning to allow_empty Tom Christie 2013-05-17 21:28:33 +0100
  • 3fe6544ab3 Merge b5640bb778 into 2dd48fbb05 Matteo Suppo 2013-05-17 08:07:05 -0700
  • 2dd48fbb05 Merge pull request #847 from johtso/patch-1 Tom Christie 2013-05-17 07:08:58 -0700
  • 852f9e92bf Merge df11198c6c into 646b3b266d Johannes 2013-05-17 03:28:13 -0700
  • df11198c6c Fix typo + grammar in viewsets docs Johannes 2013-05-17 12:27:48 +0200
  • ffa3c5aace Another small typo in the ViewSet quick start. Xavier Ordoquy 2013-05-17 10:28:59 +0200
  • 646b3b266d Updated README.md Michael Elovskikh 2013-05-16 22:32:32 -0700
  • f1fb434e6d Update release-notes.md Tom Christie 2013-05-16 19:59:33 +0200
  • bc3dfca5e3 Added @rouge8 for bugfix #844. Thank you! Tom Christie 2013-05-16 19:58:17 +0200
  • 4ade7fb82c Merge pull request #844 from rouge8/hyperlinkedidentityfield-lookup_field Tom Christie 2013-05-16 10:56:12 -0700
  • cd46ee874d Merge abe207b869 into 0e81ffced2 Andy Freeland 2013-05-16 08:49:08 -0700
  • abe207b869 HyperlinkedIdentityField uses lookup_field kwarg. Andy Freeland 2013-05-16 11:24:11 -0400
  • 0e81ffced2 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2.3.3 Tom Christie 2013-05-16 15:25:04 +0100
  • aff88d15f7 Version 2.3.3 Tom Christie 2013-05-16 15:08:12 +0100
  • 1a4e99e892 Merge pull request #843 from linovia/master Tom Christie 2013-05-16 01:12:18 -0700
  • 9b071336db Merge 66aa2f7a16 into 092d5223eb Xavier Ordoquy 2013-05-16 00:49:15 -0700
  • 66aa2f7a16 Small typo in the ViewSet example. Xavier Ordoquy 2013-05-16 09:47:22 +0200
  • 350807d9bb Merge 60c85b3d42 into 0f00da848d Benjamin Toueg 2013-05-15 14:01:11 -0700
  • 60c85b3d42 typo Benjamin Toueg 2013-05-16 00:00:18 +0300
  • af88a5b175 Test and fix which closes #652. Tom Christie 2013-05-15 14:25:25 +0100
  • 092d5223eb Fix searchfilter issues Tom Christie 2013-05-15 10:29:51 +0100
  • 2f54decd3e Merge branch 'master' of https://github.com/tomchristie/django-rest-framework Tom Christie 2013-05-14 21:41:39 +0100
  • e939e1755a Base automatic filterset model on the queryset model. Fixes #834. Tom Christie 2013-05-14 21:40:55 +0100
  • dd2b5e1b14 Merge af48db8258 into 599c0eb0db Jacob Magnusson 2013-05-14 13:33:26 -0700
  • 599c0eb0db Added @jsummerfield for cleanups in #824. Thanks! Tom Christie 2013-05-14 19:38:41 +0200
  • dd3c434f6c Merge pull request #824 from jsummerfield/patch-1 Tom Christie 2013-05-14 10:36:31 -0700
  • 5bf20a9a9c Merge 5074bbe4b2 into d62414147f James Summerfield 2013-05-14 10:35:08 -0700
  • 442f3436e0 Edited the first tutorial to include information about the widget parameter in the code variable definition. Lucas Simon 2013-05-14 11:10:10 -0600
  • d62414147f Fix assert messaging on fields/exclude checking. Closes #833 Tom Christie 2013-05-14 17:53:37 +0100
  • 2d49567e88 get_serializer can now be told the specific request it's building it for Shaun Stanworth 2013-05-14 15:05:39 +0100
  • af48db8258 get_queryset with django-filter wasn't working DjangoFilterBackend didn't work when only specifying serializer_class and get_queryset Jacob Magnusson 2013-05-14 15:55:59 +0200
  • 25417c14c6 Merge 8595d9dfc8 into d199a89c18 young 2013-05-14 03:43:33 -0700
  • d199a89c18 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework Tom Christie 2013-05-14 11:40:43 +0100
  • 6487fa535b Added @avinash240 for bugfix #822 Tom Christie 2013-05-14 11:39:30 +0100
  • 727a64f3b9 Updated release notes Tom Christie 2013-05-14 11:38:55 +0100
  • a303d0f38c Fix filter test renaming Tom Christie 2013-05-14 11:37:59 +0100
  • ce1a04a603 Merge branch 'master' of https://github.com/avinash240/django-rest-framework Tom Christie 2013-05-14 11:34:47 +0100
  • 2cff6e69db Added OrderingFilter Tom Christie 2013-05-14 11:27:08 +0100
  • 6a037f63ed Added OrderingFilter Tom Christie 2013-05-14 11:27:03 +0100
  • 08bc976269 Rename filter tests Tom Christie 2013-05-14 10:16:46 +0100
  • aa0dcd2e4a More docs on SearchFilter Tom Christie 2013-05-14 10:16:00 +0100
  • b2bf5f1f88 SearchFilter may be comma and/or whitespace seperated Tom Christie 2013-05-14 10:10:44 +0100
  • 752c01420f Fix Django 1.3 compat with routers Tom Christie 2013-05-14 10:01:05 +0100
  • f9aeb68383 Updated release notes Tom Christie 2013-05-14 09:59:29 +0100
  • 741f31b8ff Merge 5e2d8052d4 into 1154d873e9 Marlon Bailey 2013-05-14 01:56:45 -0700
  • 24c9c455fe Allow for missing non-required nested objects. Brian Zambrano 2013-05-13 10:51:51 -0700
  • 4179982dc9 show_form_for_method expects request object with appropriate method pre-attached Shaun Stanworth 2013-05-13 17:55:45 +0100
  • 5a430ae738 Merge 5f243ae657 into 1154d873e9 James Summerfield 2013-05-13 08:36:32 -0700
  • 1154d873e9 Added django-viewsets to credits. Refs #738. Tom Christie 2013-05-13 13:35:16 +0200
  • ec04013776 Adding User URL names for consistency (referenced later in part 5) James Summerfield 2013-05-13 08:57:29 +0200
  • e819a9b99b Adding URL name for consistency James Summerfield 2013-05-13 08:56:27 +0200
  • 5f243ae657 Section 5 requires URLs in section 4 to be named. James Summerfield 2013-05-13 08:54:04 +0200
  • 0a6b115f6d Section 5 requires URLs in section 4 to be named. James Summerfield 2013-05-13 08:52:59 +0200
  • 5074bbe4b2 Remove trailing unmatched </div> in login_base.html template. Reformat indentation and label all closing tags for consistency. James Summerfield 2013-05-13 07:51:23 +0200
  • 5e2d8052d4 fix test case to work with Python 3 and make it more explicit Marlon Bailey 2013-05-12 09:22:14 -0400
  • 8595d9dfc8 support create multiple model instances yangchun wu 2013-05-12 20:37:59 +0800
  • 9d2580dccf added support for multiple @action and @link decorators on a viewset, along with a router testcase illustrating the failure against the master code base Marlon Bailey 2013-05-11 22:26:34 -0400
  • fd4a66cfc7 Fix py3k compat with functools.reduce Tom Christie 2013-05-10 23:06:42 +0100
  • dd51d369c8 Unicode string fix Tom Christie 2013-05-10 23:02:24 +0100
  • 260a8125c5 Improve custom filtering example Tom Christie 2013-05-10 22:56:23 +0100
  • 293dc3e6d8 Added SearchFilter Tom Christie 2013-05-10 22:33:11 +0100
  • 8ce36d2bf1 SearchFilter and tests Tom Christie 2013-05-10 21:57:20 +0100
  • 773a92eab3 Move models into test modules, out of models module Tom Christie 2013-05-10 21:57:05 +0100
  • fd84cf7f10 Docs tweaks Tom Christie 2013-05-10 21:56:33 +0100
  • 2e3032ff8c Added @hamishcampbell for docs fix #818. Thanks! Tom Christie 2013-05-10 14:14:42 +0200
  • 6aed4381c0 Merge pull request #818 from hamishcampbell/master Tom Christie 2013-05-10 05:13:28 -0700
  • fc74d6cb54 Merge 5c8356d51d into 0176a5391b Hamish Campbell 2013-05-09 18:29:59 -0700
  • 5c8356d51d Fix minor code error in Generic Views documentation - missing if statement. Hamish Campbell 2013-05-10 13:28:50 +1200
  • 0176a5391b Fix HyperlinkedModelSerializer not respecting lookup_fields Tom Christie 2013-05-09 17:09:40 +0100
  • 939cc5adba Tweak inheritance Tom Christie 2013-05-09 13:35:01 +0100
  • 31f94ab409 Added GenericViewSet and docs tweaking Tom Christie 2013-05-09 13:31:42 +0100
  • f2466418dd Tweak doc text slightly Tom Christie 2013-05-09 13:14:20 +0100
  • 3737e17d7c Added 'Customizing the generic views' section. Closes #816 Tom Christie 2013-05-09 13:10:45 +0100
  • 9428d6ddb5 Merge pull request #817 from maspwr/writable-nested-modelserializer Tom Christie 2013-05-09 00:57:27 -0700
  • 9cb9d470ef Merge 14482a9661 into 0080bf8a00 Mark Shirley 2013-05-08 22:53:50 -0700
  • 14482a9661 Fix deprecation warnings in relations_nested tests Mark Aaron Shirley 2013-05-08 22:44:23 -0700
  • e550740b3d Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer Mark Aaron Shirley 2013-05-08 22:39:48 -0700
  • 4ab7b8f257 Version 2.3.2 2.3.2 Tom Christie 2013-05-08 20:49:49 +0100
  • b443560080 Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings. Closes #798 Tom Christie 2013-05-08 20:38:50 +0100
  • de69a28b9e Test and fix for #814. Tom Christie 2013-05-08 20:18:01 +0100
  • 9d59e55cec Merge branch 'master' of https://github.com/tomchristie/django-rest-framework Tom Christie 2013-05-08 20:09:03 +0100
  • 2379014f15 Add rails in credits section Tom Christie 2013-05-08 20:08:35 +0100
  • 429e078eee Allow None filename on uploaded files Tom Christie 2013-05-08 20:07:51 +0100
  • 673a7a496f Update generic-views.md Tom Christie 2013-05-08 10:17:27 +0200
  • 42ba5b425b Added @dhepper for typo fixes in #812. Tom Christie 2013-05-08 10:02:52 +0200
  • 9b4bf66245 Merge pull request #812 from dhepper/master Tom Christie 2013-05-08 01:01:25 -0700
  • 795016d944 Merge 70b8e5b759 into dabe119af5 Daniel Hepper 2013-05-07 11:37:05 -0700
  • dabe119af5 Typo Tom Christie 2013-05-07 20:35:33 +0200
  • 70b8e5b759 Fixed typos in tutorial Daniel Hepper 2013-05-07 19:16:03 +0200
  • 246a376dcf Merge branch 'master' of https://github.com/tomchristie/django-rest-framework Tom Christie 2013-05-07 17:26:17 +0100
  • a758066c03 Added @eyepulp for fix #810 Tom Christie 2013-05-07 17:25:51 +0100
  • 71df55148c Merge pull request #810 from EyePulp/patch-1 Tom Christie 2013-05-07 09:17:54 -0700
  • 91d1a403a1 Merge ea91298101 into a8e090df04 EyePulp 2013-05-07 09:17:15 -0700
  • a8e090df04 Remove accidental conflict diff Tom Christie 2013-05-07 17:14:25 +0100
  • ea91298101 Updated the README.md example to fix a class reference EyePulp 2013-05-07 11:01:54 -0500