Commit Graph

  • 579f77ceaa Move function to compat. Ryan Kaskel 2013-05-18 17:04:17 +0100
  • 6d5cf527c3 Merge pull request #864 from minddust/fix_missing_min_values Tom Christie 2013-05-18 08:56:24 -0700
  • b2701b1049 Merge 025c40e7d5 into c7fd243533 Stephan Groß 2013-05-18 08:56:15 -0700
  • c7fd243533 Merge pull request #863 from pyriku/787-unicodejsonrenderer Tom Christie 2013-05-18 08:55:59 -0700
  • 19ced3cf43 Merge 99848b0321 into 3f47eb7a77 Markus Törnqvist 2013-05-18 08:38:49 -0700
  • 5ab7cc6e6b HEAD and OPTIONS should not be exposed as actions as discussed in a42afa04c3 (commitcomment-3241476) Nikolaus Schlemm 2013-05-18 17:38:47 +0200
  • 99848b0321 Drop another case of u'', this time from #530 code Markus Törnqvist 2013-05-18 18:38:37 +0300
  • 1fd66fe8c6 Drop u'', it was used inconsistently and breaks for nothing with Python 3.2 Markus Törnqvist 2013-05-18 18:27:36 +0300
  • 33f702d306 Merge latest changes from master. Ryan Kaskel 2013-05-18 16:26:17 +0100
  • 10e451a85a Handle Python 3 strings and lazy strings. Ryan Kaskel 2013-05-18 16:21:18 +0100
  • 025c40e7d5 Fix order for applying min_value to fields Stephan Groß 2013-05-18 17:16:29 +0200
  • b225b1d5c9 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options Nikolaus Schlemm 2013-05-18 17:13:59 +0200
  • 48c1b2233b Merge branch 'master' into mjtorn-master Markus Törnqvist 2013-05-18 18:13:31 +0300
  • a42afa04c3 draft for fields' metadata via OPTIONS - needs review and decision Nikolaus Schlemm 2013-05-18 17:13:23 +0200
  • b4dbfa9832 only catch relevant exceptions ;) Nikolaus Schlemm 2013-05-18 17:10:13 +0200
  • 9a8cf246cb Merge b9b2297612 into 3f47eb7a77 Pablo Recio 2013-05-18 08:07:49 -0700
  • b9b2297612 Tests proper encoding in JSONRenderer and UnicodeJSONRenderer Pablo Recio 2013-05-18 17:06:25 +0200
  • 71e29644a2 Adds new renderer into the documentation Pablo Recio 2013-05-18 16:50:09 +0200
  • 6dbbbc16da Better checking if the content can be printable in the BrowsableAPI Pablo Recio 2013-05-18 16:32:53 +0200
  • 97f034e3d6 Adds UnicodeJSONRenderer which doesn't ensure ascii Pablo Recio 2013-05-18 16:31:12 +0200
  • c69f960066 Adding a class attribute into JSONRenderer for ensuring ascii, and using it consistently Pablo Recio 2013-05-18 16:30:40 +0200
  • 0c81d04170 Add min_value=0 to autogenerated Pos..IntFields Stephan Groß 2013-05-18 17:04:20 +0200
  • 13e2d68484 Merge 5bebd29f11 into 3f47eb7a77 lolek09 2013-05-18 07:56:53 -0700
  • 5bebd29f11 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework Karol Majta 2013-05-18 16:56:38 +0200
  • ebe959b52a charset param gets now appended to response's Content-Type. Closes #807 Karol Majta 2013-05-18 16:45:05 +0200
  • 2795e842d6 Two test cases for html rendering of API with labelized model Markus Törnqvist 2013-05-18 17:44:40 +0300
  • e68ea16d7a Update FieldLabelTest to use new BasicModel.verbose_name Markus Törnqvist 2013-05-18 17:43:47 +0300
  • e2a5ec0350 Change BasicModel.verbose_name Markus Törnqvist 2013-05-18 17:42:54 +0300
  • 891119f2f6 Merge 8f4f7c3ed2 into 3f47eb7a77 benlapid 2013-05-18 07:38:15 -0700
  • 3f47eb7a77 Merge pull request #861 from minddust/fix_missing_field_values Tom Christie 2013-05-18 07:32:50 -0700
  • b041ce9c8f Merge 6714b755f4 into 5f8d353f0b Stephan Groß 2013-05-18 07:32:39 -0700
  • 6714b755f4 Fix missing para.. Stephan Groß 2013-05-18 16:32:31 +0200
  • 29739f78ba Merge branch 'issue-192-expose-fields-for-options' of github.com:nschlemm/django-rest-framework into http_debug_error_page_doc Oscar Vilaplana 2013-05-18 16:30:21 +0200
  • aeea32030b Add newline Stephan Groß 2013-05-18 16:27:11 +0200
  • 5f8d353f0b Rename has_user_through_model -> has_through_model Tom Christie 2013-05-18 15:25:49 +0100
  • 9f9cb97d65 Add TestCases for default field values Stephan Groß 2013-05-18 16:24:54 +0200
  • e1a3cab400 Merge pull request #854 from ryankask/issue-775 Tom Christie 2013-05-18 07:22:22 -0700
  • fb8df93f44 Merge 0b84c5a0ac into cc39b9c925 Ryan Kaskel 2013-05-18 07:21:59 -0700
  • f8c1481d4b expose the fields metadata via OPTIONS as described in https://github.com/tomchristie/django-rest-framework/issues/192 Nikolaus Schlemm 2013-05-18 16:21:25 +0200
  • ba70da5753 Merge d0e9a74383 into cc39b9c925 Felipe 2013-05-18 07:19:59 -0700
  • cc39b9c925 Merge pull request #858 from minddust/fix_710 Tom Christie 2013-05-18 07:19:52 -0700
  • 65ad61c168 Merge b7176065a9 into 3ba43b960e Stephan Groß 2013-05-18 07:19:32 -0700
  • 3ba43b960e Added @andymckay for refactoring #860 Tom Christie 2013-05-18 16:19:05 +0200
  • e32a6e4211 Merge pull request #860 from andymckay/master Tom Christie 2013-05-18 07:17:13 -0700
  • e6eb5fe750 Merge aeba5bed05 into a2e2b0abda Andy McKay 2013-05-18 07:16:44 -0700
  • a2e2b0abda Merge pull request #857 from pyriku/675-empty-label-related-field Tom Christie 2013-05-18 07:16:12 -0700
  • ff81f2a958 Merge 7dca0e6859 into ea9a3d88bc Pablo Recio 2013-05-18 07:12:59 -0700
  • 7dca0e6859 Removed unicode literals Pablo Recio 2013-05-18 16:12:48 +0200
  • 50ba26822d Merge branch 'master' into 675-empty-label-related-field Pablo Recio 2013-05-18 16:11:06 +0200
  • aeba5bed05 startswith can take a tuple Andy McKay 2013-05-18 07:09:24 -0700
  • b7176065a9 Update getattr Stephan Groß 2013-05-18 16:06:30 +0200
  • ea9a3d88bc Merge pull request #859 from craigds/master Tom Christie 2013-05-18 07:06:21 -0700
  • 04e49a7c37 Merge 208bd991da into 80a2600891 Craig de Stigter 2013-05-18 06:59:34 -0700
  • e2d3aa65d7 Move and rename LabelModelSerializer for further reuse Markus Törnqvist 2013-05-18 16:56:26 +0300
  • 80a2600891 Styling tweaks Tom Christie 2013-05-18 14:55:48 +0100
  • e7ddaf5472 Turns out label and help_text are not always there Markus Törnqvist 2013-05-18 16:50:59 +0300
  • 794413734f Merge branch 'master' of https://github.com/mmcardle/django-rest-framework into styling-fixes Tom Christie 2013-05-18 14:50:49 +0100
  • eb9fdd04fc Remove unused var Stephan Groß 2013-05-18 15:50:12 +0200
  • e6409bbc83 Temp commit for branch change ;-) Stephan Groß 2013-05-18 15:48:36 +0200
  • 2e8ff4473b Tweak docs Tom Christie 2013-05-18 14:47:39 +0100
  • c8dc5b691b Merge pull request #856 from grimborg/http_debug_error_page_doc Tom Christie 2013-05-18 06:45:59 -0700
  • f55825445d Merge 4dbf2d907f into 304c07681d Òscar Vilaplana 2013-05-18 06:45:34 -0700
  • 304c07681d Merge Tom Christie 2013-05-18 14:45:06 +0100
  • ef383d969c Clean up test case. Ryan Kaskel 2013-05-18 14:31:29 +0100
  • 208bd991da when source='*' on a nested serializer, expand fields into outer serializer when writing. fixes #765 Craig de Stigter 2013-05-18 15:23:43 +0200
  • 22874e441d Merge latest changes from master. Ryan Kaskel 2013-05-18 14:17:50 +0100
  • a71acc76d8 Fix for #710 Stephan Groß 2013-05-18 15:12:54 +0200
  • 0b84c5a0ac Merge latest changes from master. Ryan Kaskel 2013-05-18 14:04:27 +0100
  • 275bfa2320 Added @grimborg and @ryankask. Go Team. :) Tom Christie 2013-05-18 14:03:08 +0100
  • 392c8556ae Display an empty label into related fields if it isn't required Pablo Recio 2013-05-18 15:01:58 +0200
  • 4dbf2d907f added comment about error behavior with DEBUG=True Oscar Vilaplana 2013-05-18 14:55:55 +0200
  • 707cb36554 Merge 72bc5a3556 into a0e3c44c99 mmcardle 2013-05-18 05:48:11 -0700
  • 72bc5a3556 documentation for https://github.com/tomchristie/django-rest-framework/issues/775 Mark McArdle 2013-05-18 13:19:13 +0100
  • 1343398868 Renderer uses form field's label and help, not attribute name Markus Törnqvist 2013-05-18 15:15:02 +0300
  • 50a8f114fc Merge branch 'master' of git://github.com/tomchristie/django-rest-framework Mark McArdle 2013-05-18 13:12:30 +0100
  • 770ed3de2e ToMany fields default to read-only if targeting ManyToManyField. Ryan Kaskel 2013-05-18 13:11:40 +0100
  • 611919aa0a Initial commit of fix for https://github.com/tomchristie/django-rest-framework/issues/775 Mark McArdle 2013-05-18 13:10:05 +0100
  • a0e3c44c99 Added @craigds, @pyriku, @brianz - Yay for sprints! Tom Christie 2013-05-18 13:40:20 +0200
  • 6d425aa3be Merge pull request #831 from brianz/master Tom Christie 2013-05-18 04:36:00 -0700
  • bfeb5e7edc Merge 24c9c455fe into 0c95405ea7 Brian Zambrano 2013-05-18 04:32:08 -0700
  • 0c95405ea7 Merge pull request #853 from pyriku/725-blank-choice-dash Tom Christie 2013-05-18 04:24:16 -0700
  • 3bf3cd7df5 Merge 8fe43236a2 into 2a3056d038 Pablo Recio 2013-05-18 04:23:56 -0700
  • 8fe43236a2 Moved test model into closer to the testcase Pablo Recio 2013-05-18 13:23:38 +0200
  • 53a8004401 Merge branch 'master' into 725-blank-choice-dash Pablo Recio 2013-05-18 12:51:40 +0200
  • ab8bd566f9 Adding BLANK_CHOICE_DASH as a choice if the model's field isn't required Pablo Recio 2013-05-18 12:40:25 +0200
  • 2a3056d038 Merge pull request #851 from linovia/master Tom Christie 2013-05-18 03:40:38 -0700
  • de5cc8de42 A model's field is required if is null or blank Pablo Recio 2013-05-18 12:40:25 +0200
  • 2aaee7c92c Merge ed0bd195f5 into 9fe6a103ec Xavier Ordoquy 2013-05-18 03:40:17 -0700
  • 9fe6a103ec Merge pull request #694 from craigds/master Tom Christie 2013-05-18 03:38:36 -0700
  • d76d9f98de Merge c992b600f7 into a73c16b85f Craig de Stigter 2013-05-18 03:33:14 -0700
  • c992b600f7 add tests for dotted lookup in RelatedField, PrimaryKeyRelatedField, and HyperlinkedRelatedField. #694 Craig de Stigter 2013-05-18 12:32:48 +0200
  • 764299843c ManyHyperlinkedRelatedField comes form rest_framework.relations now Markus Törnqvist 2013-05-18 13:30:39 +0300
  • a73c16b85f serializers.Field respects ordering on dicts if it exists. Closes #832 Tom Christie 2013-05-18 11:27:48 +0100
  • 3691cd2ffd Use smart_text() instead of nonexistant smart_unicode() Markus Törnqvist 2013-05-18 13:26:59 +0300
  • 85faebbb75 Merge branch 'mikee2185-master' into mjtorn-master Markus Törnqvist 2013-05-18 13:19:52 +0300
  • 930bd4d0e1 add tests for related field source for HyperlinkedRelatedField. #694 Craig de Stigter 2013-05-18 12:23:12 +0200
  • 0cd7c80e6e add tests for related field source for RelatedField and PrimaryKeyRelatedField. #694 Craig de Stigter 2013-05-18 12:16:30 +0200
  • ed0bd195f5 Updated the dependencies version and added the ALLOWED_HOSTS for tests. Xavier Ordoquy 2013-05-18 12:07:44 +0200
  • 6e2d06bfc4 Merge 2d49567e88 into b950b025bc shauns 2013-05-18 01:49:46 -0700
  • b950b025bc Merge pull request #850 from tomchristie/dynamic-forms Tom Christie 2013-05-18 01:49:38 -0700