Commit Graph

  • a3ddd9e4c9 Fix style consistency. Marko Tibold 2011-12-21 01:24:16 +0100
  • 4b3c63f155 Make sure the optional markdown functionality is also tested. Marko Tibold 2011-12-21 01:22:10 +0100
  • 8162303bc7 Merge branch 'alazaro-master' Marko Tibold 2011-12-21 01:10:10 +0100
  • 90ddec03b7 Fixes #94 Marko Tibold 2011-12-21 01:06:24 +0100
  • 199b02d718 Merge 4a60575132 into 443694ebe6 GitHub Merge Button 2011-12-20 04:20:20 -0800
  • 443694ebe6 Added Anthony Nemitz Tom Christie 2011-12-20 12:20:17 +0000
  • ebbc60a640 Merge pull request #97 from anemitz/master Tom Christie 2011-12-20 04:19:42 -0800
  • c1b6a3ce14 Merge 9f63e8dd1d into 8af629f566 GitHub Merge Button 2011-12-19 22:09:34 -0800
  • 9f63e8dd1d ADMIN_MEDIA_PREFIX is deprecated in django1.4 Anthony Nemitz 2011-12-19 22:09:09 -0800
  • 8af629f566 Fold license text to 80 chars Tom Christie 2011-12-16 10:06:02 +0000
  • 1c8b40fb5f Merge branch 'master' of https://github.com/alazaro/django-rest-framework into alazaro-master Marko Tibold 2011-12-15 23:05:30 +0100
  • c1858a2a9a Merge remote-tracking branch 'upstream/master' Marko Tibold 2011-12-15 19:39:56 +0100
  • 28ccabf165 Use coverage>=3.4, since that's what we've got in tox.ini at the moment. Refs #96 Tom Christie 2011-12-15 16:22:10 +0000
  • 83910ff7a4 Update requirements. Refs #96 Tom Christie 2011-12-15 16:20:37 +0000
  • 34b1bdeef0 JSONPRenderer with json renderer composition Juan Fabio García Solero 2011-12-15 15:20:47 +0100
  • c509c2bff2 Merge remote-tracking branch 'upstream/master' Marko Tibold 2011-12-15 14:56:47 +0100
  • beccc54d11 Update docs/howto/setup.rst Marko Tibold 2011-12-15 14:56:01 +0100
  • 59904576a2 reduced output to errors and warnings only Marko Tibold 2011-12-15 12:25:56 +0100
  • 670dbe6d75 Don't output html to a tempdir, but keep them. Marko Tibold 2011-12-15 01:16:09 +0100
  • 0f16db7614 see previous commit message. Marko Tibold 2011-12-15 00:31:57 +0100
  • e2b9359a2d Adding a docs env to the tox project. This will run the linkcheck and build the html docs, turning any warnings into errors. Also changed the theme to sphinx-doc and added version to be displayed in the docs. Marko Tibold 2011-12-15 00:27:29 +0100
  • 4a60575132 Fixed test broken by markdown update alazaro 2011-12-14 23:36:13 +0100
  • 8cabab2703 CSRF for non-dict like .DATA. Fixes #85 Tom Christie 2011-12-14 20:19:17 +0000
  • 67b13bd1bc More general requirements. Tom Christie 2011-12-14 20:11:02 +0000
  • d53f7f45b4 Use 1.4's CSRFMiddleware, so that PUT and DELETE get CSRF validation if session authentication is being used Tom Christie 2011-12-14 20:10:06 +0000
  • a6741feb3c Merge 69fdd7f33a into 050f07e7b1 GitHub Merge Button 2011-12-14 11:24:04 -0800
  • 1685b16684 Merge 3eb6fe5ad6 into 050f07e7b1 GitHub Merge Button 2011-12-14 11:24:03 -0800
  • 050f07e7b1 Ensure that external projects do not need to add 'djangorestframework.tests' to INSTALLED_APPS during testing. Tom Christie 2011-12-14 19:23:48 +0000
  • a32eb50bae De-couple request/response layer CRUD, from underlying resource CRUD. Tom Christie 2011-12-14 14:48:51 +0000
  • f84fd47825 Cleanups - line lengths, whitespace etc. Tom Christie 2011-12-14 14:48:22 +0000
  • db6df5ce61 Drop .as_tuple() Tom Christie 2011-12-14 14:45:59 +0000
  • ebbb6ac2d5 Merge branch 'master' into experimental Tom Christie 2011-12-14 10:48:24 +0000
  • e8126c3a91 Getting more resourceful - read, create, update and delete methods on ModelMixin Tom Christie 2011-12-14 10:48:19 +0000
  • 69fdd7f33a Fix unit test that requires trailing whitespace Ewoud Kohl van Wijngaarden 2011-12-13 14:58:49 +0100
  • 303a1108a7 Strip trailing whitespace Ewoud Kohl van Wijngaarden 2011-12-13 14:48:33 +0100
  • 4f38e78580 Merge pull request #92 from mwesterhof/master Marko Tibold 2011-12-13 04:06:40 -0800
  • 9610cde773 Merge 2be350293b into 8cd7ab1422 GitHub Merge Button 2011-12-13 02:23:55 -0800
  • 2be350293b fix for unhandled _SkipField exception in Serializer.serialize_model Marco Westerhof 2011-12-13 11:14:23 +0100
  • 8cd7ab1422 typo Marko Tibold 2011-12-12 22:20:09 +0100
  • ac18bea009 deleted reference to bitbucket from the docs Marko Tibold 2011-12-12 20:53:10 +0100
  • 1686419aad less is more; dropped the mention of Bitbucket repo Marko Tibold 2011-12-12 19:56:39 +0100
  • 3867438779 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework Marko Tibold 2011-12-12 09:42:27 -0600
  • 51c53a8a5c now really drop the yaml file Marko Tibold 2011-12-12 09:41:18 -0600
  • cb8931a014 Typo. Tom Christie 2011-12-12 15:33:45 +0000
  • c0bf45d82a drop yaml fixture and replace with json Marko Tibold 2011-12-12 08:51:02 -0600
  • d69581e2af 0.2.4 release. 0.2.4 Tom Christie 2011-12-12 12:27:04 +0000
  • d89b24cbe9 0.2.4 release. Tom Christie 2011-12-12 12:26:45 +0000
  • 5c6adb1cca Drop unused import Tom Christie 2011-12-12 12:09:12 +0000
  • 7b6a6caa96 fix copy-paste typo. Marko Tibold 2011-12-12 12:09:10 +0100
  • 3a4ca88a6c Add OPTIONS to auto-documenting API Tom Christie 2011-12-11 18:52:55 +0000
  • e2f3153b13 Merge pull request #90 from jakul/xmlparser6 Tom Christie 2011-12-11 10:42:37 -0800
  • 432421c623 Merge e84bf2140c into 4f42303035 GitHub Merge Button 2011-12-11 10:33:56 -0800
  • e84bf2140c fix merge Craig Blaszczyk 2011-12-11 18:30:43 +0000
  • 0632e946f9 add xml parser Craig Blaszczyk 2011-12-11 18:27:40 +0000
  • 3eb6fe5ad6 small changes from pull request feedback Craig Blaszczyk 2011-12-11 16:39:17 +0000
  • ba14a9dc13 Merge 9516b26a80 into 4f42303035 GitHub Merge Button 2011-12-09 05:40:06 -0800
  • 4f42303035 Typo. Tom Christie 2011-12-09 13:39:56 +0000
  • 5db422c9d3 Add pagination. Thanks @devioustree! Tom Christie 2011-12-09 13:37:53 +0000
  • 42cdd00591 Merge meurig's absolute_url fix. Tom Christie 2011-12-09 12:54:11 +0000
  • 325ee1e3a4 Merge pull request #62 from txels/master Tom Christie 2011-12-09 04:40:14 -0800
  • 5bccc3a708 Merge 3b413dbb40 into 20f8956c8f GitHub Merge Button 2011-12-09 04:36:02 -0800
  • b8f4f77930 Merge 86033e5504 into 20f8956c8f GitHub Merge Button 2011-12-09 04:36:02 -0800
  • d3013c9019 Merge d0cf539dd6 into 20f8956c8f GitHub Merge Button 2011-12-09 04:36:02 -0800
  • 6ba4470810 Merge e704705383 into 20f8956c8f GitHub Merge Button 2011-12-09 04:36:02 -0800
  • 20f8956c8f Merge monseiur drummond's pagination niceness Tom Christie 2011-12-09 12:35:42 +0000
  • 8fe06939f2 Merge 6261d8c02b into 59afd87cd4 GitHub Merge Button 2011-12-09 03:28:59 -0800
  • 59afd87cd4 We do not have a blog. We do not host on BitBucket. Tom Christie 2011-12-09 11:28:50 +0000
  • 34a2526fd0 Fix docstring. Tom Christie 2011-12-09 11:27:29 +0000
  • a3f483a6b1 Drop tests that are broken, because the functionality isn't implemented. Tom Christie 2011-12-09 11:27:15 +0000
  • d0cf539dd6 Added content-length to responses for chrome Jens Alm 2011-11-19 21:08:51 +0100
  • e704705383 whitespace fix Meurig Freeman 2011-10-31 04:02:40 +0000
  • 5541f0af44 make use of original prefix when generating absolute urls Meurig Freeman 2011-10-31 03:58:00 +0000
  • 9516b26a80 JSONP renderer and tests garciasolero 2011-10-14 09:29:55 +0200
  • 86033e5504 Revert "Fixed favicon issues by changing the renderer.html template." Adam Nelson 2011-10-11 16:15:21 -0400
  • b6913c516b Merge branch 'master' of git://github.com/tomchristie/django-rest-framework Jens Alm 2011-10-01 12:59:32 +0200
  • 069fee45b9 added .idea ignore Jens Alm 2011-10-01 12:53:00 +0200
  • 2caf879f22 Edited AUTHORS via GitHub Tom Christie 2011-09-30 14:16:25 +0200
  • 36b41aebb3 Edited AUTHORS via GitHub Tom Christie 2011-09-29 19:48:25 +0200
  • 249eb6f931 Make sure to check for "is not None" so that depth=0 gets assigned properly. Thanks thomasst. Tom Christie 2011-09-29 19:47:20 +0200
  • 6309f32b6b Fixed favicon issues by changing the renderer.html template. Ben Plesser 2011-09-22 12:03:12 -0400
  • 5f09c316d4 remove script prefix Ben Plesser 2011-09-21 14:59:05 -0400
  • 51ac8747d9 Resetting script prefix back to default after view processing Steve Pulec 2011-09-20 14:56:03 -0400
  • 6261d8c02b Merge remote-tracking branch 'origin/xmlparser' into autodiscover Craig Blaszczyk 2011-09-12 16:05:35 +0100
  • 335583bb11 make unit tests run again Craig Blaszczyk 2011-09-12 16:05:15 +0100
  • 36759f733e Merge branch 'autodiscover' of github.com:jakul/django-rest-framework into autodiscover Craig Blaszczyk 2011-09-02 12:01:03 +0100
  • e97cafabb6 update to pass data and files as kwargs Craig Blaszczyk 2011-09-02 11:57:48 +0100
  • 9f6d104dad initial work on autodiscover Craig Blaszczyk 2011-08-29 02:33:58 +0100
  • 8e206b604b intial work for an autodiscover feature; fixes-20 Craig Blaszczyk 2011-08-29 01:57:14 +0100
  • 7daf69ed0d Merge branch 'master' of github.com:jakul/django-rest-framework Craig Blaszczyk 2011-08-29 00:01:47 +0100
  • d42adf3454 Merge remote-tracking branch 'tomchristie/master' into autodiscover Craig Blaszczyk 2011-08-28 23:09:00 +0100
  • 8b5fd00a0f Fixed misaligned documentation on ModelResource. Added basic documentation for nested resources Jens Alm 2011-07-19 22:09:35 +0200
  • 06ac5209ac initial XML parsing checkin Craig Blaszczyk 2011-08-28 22:54:02 +0100
  • b71a24437a Merge pull request #68 from masont/master Tom Christie 2011-08-24 01:32:00 -0700
  • 5bf4197e4a Merge c50637287b into 0542382489 GitHub Merge Button 2011-08-24 01:31:46 -0700
  • c50637287b Fix in permissions, user.is_staff is a field, not a function. Mason Tang 2011-08-24 07:49:16 -0300
  • eef995a21c allow primary key to be non-numeric Craig Blaszczyk 2011-08-15 14:59:24 +0100
  • dec5ac8887 Fixed commit errors Jens Alm 2011-08-14 01:57:38 +0200
  • e7f2242cfd Merge branch 'master' of github.com:ulmus/django-rest-framework Jens Alm 2011-08-14 01:56:15 +0200
  • 2fd7cea6a3 Sending request into serialize functions Jens Alm 2011-08-14 01:08:19 +0200
  • c59a37b0a6 Sending request into serialize functions Jens Alm 2011-08-14 01:08:19 +0200