Commit Graph

7361 Commits

Author SHA1 Message Date
imdark
cdeab1c490 fixed to pass isort linting 2017-05-24 18:12:38 -07:00
imdark
9a22811671 modified to use a reader
modified to use a reader since direct decoding is not supported
2017-05-24 17:56:49 -07: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
Aleksey Zhukov
28f7c547b6
Fix a spacing issue, making flake8 happy again. 2017-05-23 20:27:57 +03:00
Aleksey Zhukov
da2fb5a7f6
Docs: add a test that there are sidebar links 2017-05-23 20:02:33 +03:00
Aleksey Zhukov
699a5eec68
Docs: slugify HTML IDs so they're restricted to alphanumerics and dashes
This is a precaution to avoid JS breaking if some routes would
contain something that doesn't fit well into CSS `#some-id` selectors,
e.g. semicolons or parens.
2017-05-23 18:27:18 +03:00
Aleksey Zhukov
f0e65d2637
Nested docs: use lists for paths instead of strings
This way we don't need to do any string manipulation (split_keys is gone),
and snippet code generation should be more flexible.
2017-05-23 18:22:02 +03:00
Aleksey Zhukov
3960328a29
Add tests for documentation code snippets
We check for Python and JS code (they have the same syntax
for the action list), and shell code snippets, ensuring that
the action is correct for the nested routes.
2017-05-23 17:18:13 +03:00
Aleksey Zhukov
dca59af6f0
Docs: always consider section sub-documents
If the section has both links and sub-documents (nested routes),
then both should be displayed.
2017-05-23 17:11:19 +03:00
Aleksey Zhukov
ba091db98c
Use items templatetag in recursive templates.
This essentially continues the changes from 0173e9bd.
2017-05-23 16:12:02 +03:00
Emmanuelle Delescolle
f98c88c498 templates adjustments 2017-05-23 16:10:33 +03:00
Emmanuelle Delescolle
0ccbe4aca9 css for multi-level menu on large screens 2017-05-23 16:10:33 +03:00
Emmanuelle Delescolle
9c18c38da6 fix #4965 2017-05-23 16:10:33 +03:00
Emmanuelle Delescolle
7b0689a67f add tests for #4965 2017-05-23 16:06:08 +03: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
Carlton Gibson
53b3b83b04 Add generator_class parameter to docs.
`get_schema_view` accepts `generator_class` parameter
2017-05-22 11:55:19 +02: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
imdark
3a2ad8e68c in order to solve the memory leak at #5146
Large encoded string take a very long time to to release from memory, but if we just pass the stream directly into json.load we get much better memory performance.
2017-05-17 11:49:30 -07: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