Commit Graph

7303 Commits

Author SHA1 Message Date
Tom Christie
7de34cf187 Merge pull request #5163 from khakulov/patch-2
Added documentation from where to import get_schema_view
2017-05-29 11:55:02 +01:00
Tom Christie
e2157fbf7c Merge pull request #5174 from tadhg-ohiggins/html_cutoff_none
Fix exception when HTML_CUTOFF is set to None
2017-05-29 11:54:03 +01:00
Xavier Ordoquy
6c7a7ccb1c Merge pull request #5186 from dryice/max_length_for_file_field
make sure max_length is in FileField kwargs
2017-05-29 07:54:13 +00:00
Dryice Liu
836328594b add test 2017-05-29 08:27:07 +08:00
Dryice Liu
04adfb9c94 make sure max_length is in FileField kwargs 2017-05-28 04:14:56 +08:00
Carlton Gibson
26623436f3 Merge pull request #5179 from felixxm/issue-uri-to-iri
Fixed test_hyperlinked_related_lookup_url_encoded_exists.
2017-05-26 10:12:31 +02:00
Mariusz Felisiak
a002bb5c67
Fixed test_hyperlinked_related_lookup_url_encoded_exists.
Space character ' ' is prohibited in IRIs, therefore we shouldn't
rely on encoding '%20' to ' ' in the HyperlinkedRelatedField tests.
2017-05-26 09:56:26 +02:00
Tadhg O'Higgins
99782c2160 Add tests for HTML_CUTOFF setting and fix issue where setting it to None would raise an exception. 2017-05-24 16:46:18 -07:00
Azim Khakulov
d1093b5326 Added documentation from where to import get_schema_view 2017-05-23 02:08:20 +02:00
Tom Christie
871ce34983 Merge pull request #5161 from matteius/master
If pagination class, include the schema generation
2017-05-22 16:46:34 -07:00
Matt Davis
99569190ab If pagination class, include the schema generation
https://github.com/encode/django-rest-framework/issues/5144
2017-05-22 19:10:54 -04:00
Xavier Ordoquy
6831472a62 Remove ambiguous reference to former DjangoFilterBackend. 2017-05-19 23:50:13 +02:00
Xavier Ordoquy
703655bc65 Non model Viewset requires base_name when registering to router. 2017-05-19 23:35:25 +02:00
Xavier Ordoquy
8ee706a69e Merge pull request #5155 from encode/carltongibson-patch-1
Update Django-Filter requirement
2017-05-19 10:13:30 +00:00
Carlton Gibson
167fd05857 Update Django-Filter requirement
A quick fix. Latest is 1.0.4
2017-05-19 09:00:56 +02:00
Xavier Ordoquy
1e9e1a5bfe Merge pull request #5149 from tomchuk/master
Don't trim whitespace from authtoken passwords
2017-05-18 09:12:47 +00:00
Thomas Achtemichuk
70205cc64e
Lint 2017-05-17 15:17:55 -04:00
Thomas Achtemichuk
c9c383dfad
Don't trim whitespace from authtoken passwords
* Fixes #5148
2017-05-17 14:52:39 -04:00
José Padilla
1ca5a9d042 Merge pull request #5143 from carltongibson/update-django-filter
Update Django Filter requirement
2017-05-16 15:44:31 -04:00
Carlton Gibson
1d72b8f758 Update Django Filter requirement
Latest is v1.0.3 — improving support for schema generation
2017-05-16 21:16:19 +02:00
Tom Christie
25f65ab96b Merge pull request #5139 from blueyed/flake8-config
Move flake8 config to setup.cfg
2017-05-16 11:39:31 +01:00
Tom Christie
a8e527a462 Merge pull request #5138 from blueyed/fix-star-source-with-HyperlinkedModelSerializer
Fix source="*" with HyperlinkedModelSerializer
2017-05-16 11:38:22 +01:00
Daniel Hahler
89276e6cfc Move flake8 config to setup.cfg
This allows for flake8 to pick it up when running it by itself.
2017-05-16 12:18:33 +02:00
Daniel Hahler
17bf312408 fixup! Add failing test
[ci skip]
2017-05-16 12:10:45 +02:00
Daniel Hahler
09f62e11a0 Possible fix 2017-05-16 12:07:04 +02:00
Daniel Hahler
2b199f7588 Add failing test 2017-05-16 12:02:23 +02:00
Tom Christie
003c304115 Merge pull request #5131 from vimarshc/issue4989
Ignore any invalidly formed query parameters for OrderingFilter.
2017-05-15 09:45:48 +01:00
Vimarsh Chaturvedi
7b4afdc737 Merge branch 'master' into issue4989 2017-05-13 19:10:47 +05:30
vimarshc
b2d6149301 importing regex constant to remove invalid parameters. 2017-05-13 05:14:32 +05:30
Tom Christie
996e587398 Remove broken bit of merge commit 2017-05-12 18:25:06 +01:00
Tom Christie
cdd15f3769 Remove broken bit of merge commit 2017-05-12 18:23:35 +01:00
Tom Christie
5f386f5839 Merge pull request #5133 from encode/version-3-6-3
Version 3.6.3
2017-05-12 17:13:41 +01:00
Tom Christie
a99f12f1c6 Merge branch 'master' into version-3-6-3 2017-05-12 17:03:32 +01:00
Tom Christie
42f80c65a9 Version 3.6.3 2017-05-12 16:52:27 +01:00
Tom Christie
e8ff5e268b Javascript fixes for API docs 2017-05-12 16:48:53 +01:00
Xavier Ordoquy
a251b93792 Merge pull request #5126 from njamaleddine/get_object_or_404_fix
Add ValidationError to except in get_object_or_404 for django 1.11
2017-05-11 08:16:17 +00:00
vimarshc
ed70f5636a Added failing test case for multiple hyphens in orderingfilter paramter 2017-05-11 12:56:41 +05:30
Nabil Jamaleddine
cdb8a3c3c8 Add ValidationError to except in get_object_or_404 for django 1.11 2017-05-05 21:17:12 -04:00
Tom Christie
69b0ac52c2 Merge pull request #5117 from rpkilby/fix-filter-backend
Fix DjangoFilterBackend mro
2017-05-04 12:32:03 +01:00
Xavier Ordoquy
36aea309fd Merge pull request #5119 from yunmanger1/yunmanger1-comment-typo-fix
Fix a typo in a comment
2017-05-04 05:37:26 +00:00
German Ilyin
5246a5a44e Fix a typo in a comment 2017-05-04 10:13:58 +06:00
Ryan P Kilby
01ffb8961d Fix DjangoFilterBackend mro 2017-05-03 12:51:44 -04:00
Ryan P Kilby
53b100d03d Add failing test for filter backend mro 2017-05-03 12:50:40 -04:00
Tom Christie
c22e61d3c3 Merge pull request #5113 from rpkilby/update-filter-docs
Simplify django-filter docs, add drf integration link
2017-05-03 16:57:21 +01:00
Ryan P Kilby
7322aa6b68 Simplify django-filter docs, add drf integration link 2017-05-03 11:03:11 -04:00
Tom Christie
67f382394b Update third-party-packages.md 2017-05-03 09:25:40 +01:00
Tom Christie
97312699f5 Merge pull request #5085 from hurturk/schema-method-limited
Generate schema with respect to http_method_names provided by CBV
2017-05-03 09:16:01 +01:00
hurturk
518bb44a9e Remove excessive class instance while getting http_method_names 2017-05-03 03:49:04 -04:00
Xavier Ordoquy
a1e6d83533 Add missing pk keyword argument to the detail_route. 2017-05-03 02:19:30 +02:00
hurturk
6075f8051a Refactor CBV schema method limitation for set operations 2017-05-02 17:34:53 -04:00