Commit Graph

  • 39f26c9eca Merge master Tom Christie 2015-01-23 14:28:59 +0000
  • 790c92d438 Update Django-Filter references in docs and requirements. Carlton Gibson 2015-01-23 15:22:20 +0100
  • bf0b331e8f Restore DF for Django 1.8 Carlton Gibson 2015-01-23 15:21:51 +0100
  • 4201c9fb01 Drop erronous check-in Tom Christie 2015-01-23 13:42:56 +0000
  • d1fe3f6548 Merge pull request #2446 from tomchristie/django-18-alpha Tom Christie 2015-01-23 13:13:05 +0000
  • 04a5f7bf0a Move 1.8-alpha out of 'expected failures' Tom Christie 2015-01-23 13:04:29 +0000
  • f3b6eedb8a More sensible response caching. Tom Christie 2015-01-23 12:56:55 +0000
  • f1ac9d3f9b More graceful handling of malformed Content-Disposition Tom Christie 2015-01-23 12:26:44 +0000
  • 4cb164b66c Add missing skipUnless(django_filters) Tom Christie 2015-01-23 11:49:57 +0000
  • e988d57853 Fix template loader monkey patching to also support 1.8 Tom Christie 2015-01-23 11:47:01 +0000
  • e307fd289c Fix test matrix Tom Christie 2015-01-23 11:38:58 +0000
  • 5eb6949e9f Drop django-filter from 1.8 Tom Christie 2015-01-23 11:32:04 +0000
  • 25a703b42c Work around meta API differences Tom Christie 2015-01-23 11:15:11 +0000
  • e56f0a928c Merge pull request #2441 from linovia/bugfix/2425 Tom Christie 2015-01-23 09:50:10 +0000
  • 37dc2520f9 Merge pull request #2428 from tomchristie/cursor-pagination Tom Christie 2015-01-22 17:44:01 +0000
  • 43d983fae8 Add paging controls Tom Christie 2015-01-22 17:25:12 +0000
  • 0822c9e558 Cursor pagination now works with OrderingFilter Tom Christie 2015-01-22 16:12:05 +0000
  • 408261ee02 Support ordering attribute either on view or on pagination class for CursorPagination Tom Christie 2015-01-22 15:15:52 +0000
  • 83a82b44a5 Support for tuple ordering in cursor pagination Tom Christie 2015-01-22 15:07:01 +0000
  • 38a2ed6f62 Python 3 fixes for cursor pagination Tom Christie 2015-01-22 14:04:25 +0000
  • ca372ef6ef Fix for python 3 Tom Christie 2015-01-22 13:50:51 +0000
  • 94b5f7a86e Tidy up cursor tests and make more comprehensive Tom Christie 2015-01-22 12:14:52 +0000
  • f1af603fb0 Tests for reverse pagination Tom Christie 2015-01-22 10:51:04 +0000
  • cae9528c54 Add support for reverse cursors Tom Christie 2015-01-22 10:28:19 +0000
  • 0b91714100 Merge pull request #2444 from duncm/patch-1 Tom Christie 2015-01-22 09:38:00 +0000
  • 6e471ad8f4 fix link to Django CSRF docs Duncan Maitland 2015-01-22 18:29:20 +1100
  • 5e52f0fd8c Merge branch 'version-3.1' into cursor-pagination Tom Christie 2015-01-21 20:29:58 +0000
  • 15f797fd3e Owned by import * Xavier Ordoquy 2015-01-21 19:46:31 +0100
  • 857185cf07 Workaround Django issue 24198. Xavier Ordoquy 2015-01-21 19:29:40 +0100
  • a7567efa8d Use compact traceback for errors reporting. Xavier Ordoquy 2015-01-21 19:26:57 +0100
  • 4cf03e30ff Do not render HTML output for hidden fields. Closes #2410. Tom Christie 2015-01-21 14:26:25 +0000
  • e59b3d1718 Make ReturnDict cachable. Closes #2360. Tom Christie 2015-01-21 14:18:13 +0000
  • 9ec08ce578 Merge master Tom Christie 2015-01-21 13:12:14 +0000
  • 9d24809a4d Merge branch 'master' of https://github.com/tomchristie/django-rest-framework Tom Christie 2015-01-21 13:03:49 +0000
  • da6ef3d0b0 Allow missing fields option for inherited serializers. Closes #2388. Tom Christie 2015-01-21 13:03:37 +0000
  • a496c523a4 to_field is rel.field_name at <1.6. love pdb and pip! Tom Jaster 2015-01-20 22:32:58 +0100
  • 64c49f8c47 From this i believe it is field_name pre django 1.6. I still don’t have django 1.5 installed so it is an educated guess by looking at ManyToOneRel and ForeignKey https://github.com/django/django/blob/stable/1.5.x/django/db/models/fields/related.py#L915 Tom Jaster 2015-01-20 22:17:28 +0100
  • 6ccc45ee47 Ups. Removed the wrong line. (optimizer) Tom Jaster 2015-01-20 21:54:16 +0100
  • 3dd5ddd77a Merge branch 'master' of https://github.com/tomchristie/django-rest-framework Tom Jaster 2015-01-20 21:49:28 +0100
  • 77eeefab74 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework into model-tofield-serializer Tom Jaster 2015-01-20 21:47:30 +0100
  • f808b6c6bc * Removed SlugRelatedField optimization * Moved compatibility check of to_fields to compat.py * Expanded the check with a way that should work on django <1.6. Need to check trevis after pushing.. Tom Jaster 2015-01-20 21:40:23 +0100
  • c0fa92e9ad Merge pull request #2438 from soooooot/patch-1 José Padilla 2015-01-20 10:33:12 -0400
  • 3ca8f85a5b correcting unclosed quote in routers.md soooooot 2015-01-20 22:24:58 +0800
  • e39d8410de Merge pull request #2437 from erictheise/patch-2 José Padilla 2015-01-19 19:08:11 -0400
  • b0bc79ed4d correcting "it's" to "its" in Tutorial 1 Eric Theise 2015-01-19 14:49:36 -0800
  • f94d1cf5a5 Merge 5e7663aa5a into d8dbd86790 Eric Theise 2015-01-19 22:03:08 +0000
  • 5e7663aa5a correcting "it's" to "its" in Tutorial 1 Eric Theise 2015-01-19 14:03:02 -0800
  • 600746353f Merge branch 'master' of https://github.com/tomchristie/django-rest-framework Tom Jaster 2015-01-19 16:59:18 +0100
  • 6369f93d04 * Removed 2 unnecessary lines Tom Jaster 2015-01-19 16:42:54 +0100
  • 49ecaa7d9e Add support for Django <1.6 where appearently no to_field existed Tom Jaster 2015-01-19 16:33:34 +0100
  • e5b94f7b7b Merge branch 'version-3.1' into cursor-pagination Tom Christie 2015-01-19 15:23:08 +0000
  • 3cc39ffbce NotImplemented -> NotImplementedError Tom Christie 2015-01-19 15:22:38 +0000
  • 6065cdbd93 Merge master Tom Christie 2015-01-19 15:16:57 +0000
  • d47f29a207 Fixed the rest of the test cases. # Some tests do not have the full QuerySet API # But we optimize SlugRelatedFields by only loading what we need Tom Jaster 2015-01-19 16:00:21 +0100
  • fdeef89ba7 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework Tom Christie 2015-01-19 14:48:42 +0000
  • 46a3eda08d NotImplemented -> NotImplementedError Tom Christie 2015-01-19 14:48:13 +0000
  • ae77ff9813 Merge pull request #2434 from alexsdutton/patch-1 Tom Christie 2015-01-19 14:47:28 +0000
  • 4f3c3a06cf Drop trailing whitespace on indented JSON output. Closes #2429. Tom Christie 2015-01-19 14:41:10 +0000
  • 040ce6ebd5 Merge d8ee1389b8 into 0dffc46cb7 William Martin Stewart 2015-01-19 14:34:08 +0000
  • 8263048af4 * many to many relationship do not have to_fields Tom Jaster 2015-01-19 15:25:35 +0100
  • af05820b1b NotImplemented is not an exception Alexander Dutton 2015-01-19 14:23:13 +0000
  • 0dffc46cb7 ReturnDict and ReturnList repr as standard dict/list. Closes #2421. Tom Christie 2015-01-19 14:21:09 +0000
  • da1db34a36 Handle UUID objects in JSONEncoder. Closes #2433. Tom Christie 2015-01-19 14:18:02 +0000
  • 067360c4ee Added support for the to_field on ForeignKey Fields. Uses the SlugRelatedField instead. Tom Jaster 2015-01-19 14:55:35 +0100
  • 214a911c97 Merge 79d906399f into b3a0a2794b José Padilla 2015-01-19 13:16:10 +0000
  • b3a0a2794b Merge pull request #2430 from Polyconseil/fbochu/timedelta-json-serialiser-python26-support Tom Christie 2015-01-19 12:15:02 +0000
  • 5484d570cb Fix timedelta JSON serialization on Python 2.6. Fabien Bochu 2015-01-19 10:57:26 +0100
  • 39a963848b Add test case with trailing whitespace William Stewart 2015-01-19 13:32:07 +0200
  • d8ee1389b8 Add custom separators support to JSONRenderer William Stewart 2015-01-19 11:43:58 +0200
  • dbb684117f Add offset support for cursor pagination Tom Christie 2015-01-19 09:24:42 +0000
  • 4f27b966a5 Merge pull request #2427 from DavidMuller/pytest_version_bumps Xavier Ordoquy 2015-01-19 02:40:15 +0100
  • b5128ca574 Save objects before assigning them in InheritedModelSerializationTests; Django 1.8 now throws an error when assigning unsaved objects to Foreign Key, GenericForeignKey, and OneToOneFields David Muller 2015-01-18 15:19:11 -0800
  • a82a4d0a09 Add Django 1.8 alpha to test matrix David Muller 2015-01-18 15:04:50 -0800
  • 1421b057f7 Bump pytest version in tox.ini to 2.6.4 David Muller 2015-01-18 14:48:23 -0800
  • eb91076886 Bump pytest-django version in tox.ini to 2.8.0 David Muller 2015-01-18 14:45:01 -0800
  • 00449dc42c Bump pytest version to 2.6.4 David Muller 2015-01-18 13:56:52 -0800
  • 7c0d14a6d5 Bump pytest-django version to 2.8.0 David Muller 2015-01-18 13:55:53 -0800
  • 492f3c410d Cleaning up cursor implementation Tom Christie 2015-01-17 00:59:02 +0000
  • 4919492582 First pass at cursor pagination Tom Christie 2015-01-17 00:10:43 +0000
  • dc18040ba4 Merge pull request #2419 from tomchristie/include-pagination-in-browsable-api Tom Christie 2015-01-16 20:36:09 +0000
  • 86d2774cf3 Fix compat issues Tom Christie 2015-01-16 20:30:46 +0000
  • 8b0f25aa0a More pagination tests & cleanup Tom Christie 2015-01-16 16:55:46 +0000
  • 50db8c092a Minor test cleanup Tom Christie 2015-01-16 16:55:28 +0000
  • 93a006886d enabled OPTIONS and meta data of AuthToken Han Rui 2015-01-17 00:43:34 +0800
  • 53edd37df5 Tests for LimitOffsetPagination Tom Christie 2015-01-15 21:07:05 +0000
  • b4ee2c8662 Merge 8eff850b09 into 4ce4132e08 Greg Taylor 2015-01-15 17:37:02 +0000
  • 8eff850b09 Remove assertions for redundant SerializerMethodField source args. Greg Taylor 2015-01-15 12:21:06 -0500
  • 68dfa369b5 Flake 8 fixes Tom Christie 2015-01-15 16:55:04 +0000
  • d76e83dd78 Tweaks, and add pagination controls for offset/limit. Tom Christie 2015-01-15 16:52:07 +0000
  • 313aa727e3 Tweaks Tom Christie 2015-01-14 17:46:41 +0000
  • 3833a5bb8a Include pagination control in browsable API Tom Christie 2015-01-14 16:51:26 +0000
  • f13fcba9a9 Include paragraph around view description in browable API Tom Christie 2015-01-14 13:20:02 +0000
  • 4d287c7aef Include paragraph around view description in browable API Tom Christie 2015-01-14 13:19:56 +0000
  • 4ce4132e08 Preserve ordering on relationship drop-down choices. Closes #2408. Tom Christie 2015-01-14 12:56:03 +0000
  • 79d906399f Merge remote-tracking branch 'upstream/master' José Padilla 2015-01-13 21:54:57 -0400
  • 58c0645b37 Remove HiddenField fields from HTML renderers José Padilla 2015-01-13 21:54:10 -0400
  • 12de43fc0c Merge pull request #2395 from tomchristie/pagination-api Tom Christie 2015-01-13 17:22:03 +0000
  • 1bcec3a0ac API tweaks and pagination documentation Tom Christie 2015-01-13 17:14:13 +0000
  • 564f845e21 Lower header font weights for nicer docs style Tom Christie 2015-01-13 12:21:03 +0000
  • 8e2dc6b26d Update internationalization docs Tom Christie 2015-01-13 12:07:25 +0000