Commit Graph

  • a4066c6aa5 Merge 3006e3825f into b6b686d285 Mark Shirley 2013-03-14 15:17:29 -0700
  • 3006e3825f One-to-one writable, nested serializer support Mark Aaron Shirley 2013-03-12 20:59:25 -0700
  • da76bd7047 Tweak text. Tom Christie 2013-03-13 20:56:16 +0000
  • 08bc203f90 Docs tweaks. Tom Christie 2013-03-13 20:53:39 +0000
  • acc8c1faa4 force_insert, force_update arguments. Closes #484. Tom Christie 2013-03-13 20:40:39 +0000
  • a53596ce28 Docs for TokenHasReadWriteScope Tom Christie 2013-03-13 13:13:30 +0000
  • 4b68089d44 Version 2.2.4 2.2.4 Tom Christie 2013-03-13 13:07:46 +0000
  • 76bf8db83a Merge branch 'master' of https://github.com/tomchristie/django-rest-framework Tom Christie 2013-03-13 12:48:27 +0000
  • 73ab7dc3f1 Use django-filter 0.6a1 and add database query count tests for paginated, filtered lists. Tom Christie 2013-03-13 12:45:54 +0000
  • a798a5350a Fix duplicated database queries for paginated lists. Tom Christie 2013-03-13 11:42:12 +0000
  • 126cadf27e Merge branch 'num-query-checking' of https://github.com/mjtamlyn/django-rest-framework Tom Christie 2013-03-13 11:36:55 +0000
  • 232ad85a31 Merge 332c99748f into 0cf94cbd8b Marc Tamlyn 2013-03-13 03:38:34 -0700
  • ebb47bb38f Basic implementation of etags George Hickman 2013-03-12 20:35:36 -0700
  • 0cf94cbd8b Merge pull request #723 from mjumbewu/multitable-inheritance Tom Christie 2013-03-12 13:56:34 -0700
  • 0efdc786e9 Merge bd3fe75e1a into 1aecd71eb4 Mjumbe Poe 2013-03-12 13:55:47 -0700
  • 1aecd71eb4 Added @kuhnza for work on #695. Thanks! Tom Christie 2013-03-12 20:52:04 +0000
  • 208407d569 Update release notes. Tom Christie 2013-03-12 20:49:44 +0000
  • 377dc2cda2 Only honor X-HTTP-Method-Override for POST requests. Tom Christie 2013-03-12 20:49:20 +0000
  • 716d86863f Merge pull request #695 from kuhnza/master Tom Christie 2013-03-12 13:40:48 -0700
  • a793f1ff4d Merge 2bcb8ff12c into 043d748b53 Dave Kuhn 2013-03-12 13:39:05 -0700
  • 617ddb3739 Merge bce3000727 into 043d748b53 Mark Shirley 2013-03-12 13:33:02 -0700
  • b6b686d285 Merge branch 'master' into basic-nested-serialization Tom Christie 2013-03-12 20:30:14 +0000
  • 043d748b53 Tweak Tom Christie 2013-03-12 20:12:28 +0000
  • a574dc7f85 Update release notes Tom Christie 2013-03-12 20:12:22 +0000
  • 40e3fc0eee Merge pull request #709 from tomchristie/oauth Tom Christie 2013-03-12 12:27:05 -0700
  • a1df363b30 Merge f513db714d into 2088023293 Tom Christie 2013-03-12 12:07:40 -0700
  • f513db714d Clean up TokenHasReadWriteScope slightly Tom Christie 2013-03-12 19:07:30 +0000
  • e8db504a98 Merge master Tom Christie 2013-03-12 18:49:38 +0000
  • 12ac357559 Merge pull request #721 from dulaccc/token-scope-permission Tom Christie 2013-03-12 11:47:35 -0700
  • 2f1951910f Descriptive text for NestedValidationError Tom Christie 2013-03-12 18:35:20 +0000
  • d8c5dca9ae Extra tests for nested serializers Tom Christie 2013-03-12 18:34:52 +0000
  • 6b4bb48dd4 Initial support for writable nested serialization (Not ModelSerializer) Tom Christie 2013-03-12 13:33:02 +0000
  • 2bcb8ff12c Documentation for X-HTTP-Method-Override Dave Kuhn 2013-03-12 13:48:40 +1100
  • 2e481f3318 Added test for X-HTTP-Method-Override header Dave Kuhn 2013-03-12 12:00:41 +1100
  • bd3fe75e1a Further group model inheritance tests Mjumbe Wawatu Ukweli 2013-03-11 17:32:32 -0400
  • 354fbc64ba Group the model-inheritance-related tests together Mjumbe Wawatu Ukweli 2013-03-11 17:28:44 -0400
  • bdcecf48e3 Simplify inherited child check to not use isinstance Mjumbe Wawatu Ukweli 2013-03-11 16:01:14 -0400
  • e7e470739f Use parent's primary key when model is derived via multitable inheritance Mjumbe Wawatu Ukweli 2013-03-11 03:23:44 -0400
  • 2088023293 Update release notes Tom Christie 2013-03-10 20:39:04 +0000
  • 0df008dc83 Added @bouke for bug fix #722. Thanks! Tom Christie 2013-03-10 20:37:15 +0000
  • 99b18d7485 Merge pull request #722 from Bouke/patch-1 Tom Christie 2013-03-10 13:34:02 -0700
  • 69209e26d2 Merge 126a0f739d into 239758e034 Bouke Haarsma 2013-03-10 13:04:36 -0700
  • 126a0f739d Fixed #720 Bouke Haarsma 2013-03-10 21:02:34 +0100
  • 3cd3235881 Failing test to show problem of #720 Bouke Haarsma 2013-03-10 21:01:51 +0100
  • 444502566c Merge eec8efafc3 into a34f45b06e Pierre Dulac 2013-03-10 08:16:27 -0700
  • eec8efafc3 Add the implementation for TokenHasReadWriteScope permissions w/ oauth 1 Pierre Dulac 2013-03-10 14:40:20 +0100
  • e03906a5c4 Add TokenHasReadWriteScope class for permissions based on scopes Pierre Dulac 2013-03-10 14:08:29 +0100
  • d40d2ec6e4 Merge c3854700f1 into bce3000727 Mark Shirley 2013-03-10 00:48:51 -0800
  • c3854700f1 One-to-many writable, nested serializer support Mark Aaron Shirley 2013-02-17 20:02:12 -0800
  • bce3000727 Merge pull request #719 from maspwr/writable-nested-serializers-merge Mark Shirley 2013-03-09 20:12:25 -0800
  • afe32ec624 Merge d0c1cb2c84 into ba329732b1 Mark Shirley 2013-03-09 20:05:20 -0800
  • d0c1cb2c84 Merge remote-tracking branch 'upstream/master' into writable-nested-serializers Mark Aaron Shirley 2013-03-09 19:58:09 -0800
  • cfd29875f1 include_pk as Meta option Andrea de Marco 2013-03-09 21:34:25 +0100
  • 027c574506 HyperlinkedModelSerializer PK should inherit Andrea de Marco 2013-03-09 15:49:39 +0100
  • 239758e034 Serializers support bulk create. Tom Christie 2013-03-09 10:21:53 +0000
  • a34f45b06e Docs polishing. Tom Christie 2013-03-09 00:31:19 +0000
  • 2c6c5d966e Update release notes. Tom Christie 2013-03-08 23:49:27 +0000
  • 69d169f5f6 Neater override hooks and more docs for DjangoModelPermissions. Tom Christie 2013-03-08 23:42:20 +0000
  • fd9d6c664b Fix crazy typo. Tom Christie 2013-03-08 23:08:55 +0000
  • 472b14f624 Merge 302f58d8f6 into 6c1fcc855a Diego Gaustein 2013-03-08 15:06:04 -0800
  • 5e993f3929 Merge Tom Christie 2013-03-08 23:00:23 +0000
  • 2596c12a21 Fixes for auth header checking. Tom Christie 2013-03-08 22:56:24 +0000
  • 6c1fcc855a Update release notes Tom Christie 2013-03-08 22:46:37 +0000
  • 775b4314ed Merge pull request #716 from tomchristie/list-deserialization Tom Christie 2013-03-08 14:45:25 -0800
  • 9896a6f459 Merge 28ae26466e into c5b98f0d10 Tom Christie 2013-03-08 14:44:03 -0800
  • 28ae26466e Py3k fixes. Tom Christie 2013-03-08 22:43:46 +0000
  • 0b6267d8cd Added @bitmonkey. Thanks! Tom Christie 2013-03-08 22:28:59 +0000
  • 68683b2ea2 Tweak implementation, and use FormSet style errors Tom Christie 2013-03-08 22:19:09 +0000
  • 53b58a5059 Merge branch 'master' of https://github.com/bitmonkey/django-rest-framework into list-deserialization Tom Christie 2013-03-08 21:20:52 +0000
  • 2e80d25217 Merge 66605acaf0 into c5b98f0d10 Ian Dash 2013-03-08 13:20:02 -0800
  • c5b98f0d10 authtoken abstract if not installed. Tom Christie 2013-03-08 20:56:30 +0000
  • 4d48de631b Docs on per-object filtering Tom Christie 2013-03-08 20:41:00 +0000
  • 1016c14a8a Added @dulaccc. Tom Christie 2013-03-08 20:26:10 +0000
  • bea6882112 Merge 5a56f92abf into 5fffaf89e2 Pierre Dulac 2013-03-08 12:25:44 -0800
  • 650d8e6a8e More bits of cleanup Tom Christie 2013-03-08 20:23:11 +0000
  • 332c99748f Add some simple numQueries tests. Marc Tamlyn 2013-03-08 17:36:43 +0000
  • a91dca178d Correcy typo. Marc Tamlyn 2013-03-08 17:01:43 +0000
  • 5fffaf89e2 Merge pull request #711 from toranb/master Tom Christie 2013-03-08 08:15:56 -0800
  • b53f305519 Merge 1a8f07def8 into 4e80541824 Toran Billups 2013-03-08 08:10:42 -0800
  • 1a8f07def8 GenericAPIView now applies filter_backend for list and retrieve api views toran billups 2013-03-07 15:09:59 -0600
  • 66605acaf0 Errors during deserializing lists now return a list of tuples with index of bad item in data plus usual errors dict Ian Dash 2013-03-07 17:29:25 +0000
  • e42e49852d Tweak docs Tom Christie 2013-03-07 19:49:36 +0000
  • c2eb27629c Update docs for OAuth 2.0 Tom Christie 2013-03-07 17:50:48 +0000
  • a4b33992a5 Merge OAuth2 work. Tom Christie 2013-03-07 17:43:13 +0000
  • 1d62594fa9 Clean ups. Tom Christie 2013-03-07 15:44:36 +0000
  • d0e9a74383 Fixed URLField not retrieving the max_length attribute from a ModelField Felipe Martín 2013-03-07 13:38:40 +0100
  • 44930f3091 Fix Py3k syntax errors Tom Christie 2013-03-07 09:15:05 +0000
  • 4e80541824 Version 2.2.3 2.2.3 Tom Christie 2013-03-07 09:05:13 +0000
  • ad336cc636 Fix broken None value for TimeField. Tom Christie 2013-03-07 09:03:53 +0000
  • d4e3610e71 Merge & clean OAuth support Tom Christie 2013-03-07 09:01:53 +0000
  • f5a8f172a3 Merge pull request #708 from kevinastone/master Tom Christie 2013-03-07 01:01:07 -0800
  • bbb85c409a Merge 2f8d8b499e into 751064a6fd Kevin Stone 2013-03-06 15:18:11 -0800
  • 2f8d8b499e Patched DateField and DateTimeField to check for None values before trying to perform date(time) conversion. Kevin Stone 2013-03-06 15:16:37 -0800
  • 6bea275de8 Added failing test cases for giving a DateField or DateTimeField a None value to serialize. Kevin Stone 2013-03-06 15:15:19 -0800
  • 751064a6fd Merge pull request #706 from markotibold/clean-install Tom Christie 2013-03-06 14:33:31 -0800
  • 5a56f92abf Update the package dependency url style in tox.ini Pierre Dulac 2013-03-03 01:38:03 +0100
  • 8845c0be88 Fix import errors Pierre Dulac 2013-03-03 01:09:39 +0100
  • a455bb5a23 Merge 1037888505 into ddd7125a63 Marko Tibold 2013-03-06 12:19:01 -0800
  • 1037888505 Prevent warning: no files found matching '*.txt' under directory 'rest_framework/templates' (there are only .html files in the templates directory). Marko Tibold 2013-03-06 21:16:40 +0100
  • 30e3775b8b Update the documentation Pierre Dulac 2013-03-02 20:36:53 +0100