encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-25 19:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,276 Commits 18 Branches 132 Tags 105 MiB
7b4afdc737
Commit Graph

7276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tom Christie
60dbe72a62 Merge pull request #4437 from dfavato/master 
Set self.count before self.limit in LimitOffsetPagination
 2017-05-02 10:21:36 +01:00
Tom Christie
dea601dc86 Merge pull request #4222 from NewVadim/master 
Fix partial update for the ListSerializer.
 2017-05-02 10:17:12 +01:00
Tom Christie
d2d0a06faf Merge pull request #5084 from Nerlin/fix-render-required-nested-serializer-error 
Fixed render error of required nested serializer.
 2017-05-02 10:05:25 +01:00
Tom Christie
e1fdb895b5 Included Python 3.6 in the requirements 
Refs #5108
 2017-05-02 09:54:45 +01:00
Tom Christie
007e86ab27 Included Python 3.6 in the requirements 
Refs #5108.
 2017-05-02 09:54:01 +01:00
Tom Christie
e7483133ea Update browsable-api.md 2017-05-01 11:49:42 +01:00
Tom Christie
a857dab79c Merge pull request #5103 from folz/patch-1 
Improve grammar in .force_authenticate() docs
 2017-04-30 17:56:33 +01:00
Xavier Ordoquy
0e0404ecb1 Merge pull request #5105 from Afrowave/master 
Updating the Django version "runserver" output and enforcing code block styling
 2017-04-28 15:30:31 +00:00
Jimmy Gitonga
6e7c9594fe Updating the Django version "runserver" output and enforcing code block styling 
CHANGED the Django version run server output to “1.11”
ADDED “```” to a code block on line 44 of
“/tutorial/7-schemas-and-client-libraries/“ to enforce code wrap.
Perhaps, we might need to do this to all code blocks. I would be happy
to do that.
 2017-04-28 18:08:54 +03:00
Rodney Folz
971bc066c5 Improve grammar in .force_authenticate() docs 
* Remove unnecessary comma
* Remove the "and simple" copied from the line above.
* Add "entirely" to emphasize that this function bypasses the authentication step.
 2017-04-27 15:44:06 -07:00
Tom Christie
80d0ee563a Merge pull request #5042 from boxingwizards/i4999 
PoC Add JSONBoundField to serializers (Fixes #4999)
 2017-04-27 20:26:40 +01:00
Tom Christie
5ba2368ff9 Merge pull request #4987 from halfstrik/master 
Added test for DateTimeField validation when server has timezone with…
 2017-04-27 17:22:27 +01:00
Tom Christie
aafd0a644f Merge pull request #4979 from linovia/feature/improve_schema_shortcut 
Restrict doc & schema shortcuts to a subset of urls
 2017-04-27 16:58:01 +01:00
Tom Christie
5e5fd67899 Merge pull request #5086 from valohai/limit-offset-pagination-schema 
SchemaGenerator: Avoid crashing with pagesizeless paginators
 2017-04-27 16:57:28 +01:00
Tom Christie
ee1a9fcef6 Merge pull request #5078 from rooterkyberian/issue-4748 
add URL path unquote to HyperlinkedRelatedField.to_internal_value
 2017-04-27 16:27:04 +01:00
Dave Allan
f56b117064 Pass non-JSON serializable values through unmodified 2017-04-26 14:10:47 -04:00
Dave Allan
7a0bd1c4d1 Use text area for JSON fields and indent JSON 2017-04-26 14:10:47 -04:00
Dave Allan
11d8e4df88 PoC Add JSONBoundField to serializers (Fixes #4999) 
Per issue #4999, JSONFields are not rendered properly in the DRF
browsable API HTML forms.  This patch attempts to fix that behavior by
introducing a JSONBoundField helper similar to the NestedBoundField
helper.
 2017-04-26 14:10:47 -04:00
Tom Christie
66e015c5ec Merge pull request #5099 from jpadilla/books 
Improve books section
 2017-04-26 14:28:31 +01:00
José Padilla
d45c12ff8c
Improve books section 2017-04-26 09:16:45 -04:00
José Padilla
fff9837195 Merge pull request #5098 from pydanny/fix-book-order 
Corrected order of books. Apologies to @limedaring
 2017-04-25 21:31:39 -04:00
Daniel Roy Greenfeld
dfb0e6ff2d Corrected order of books. Apologies to @limedaring 2017-04-25 17:42:14 -07:00
Xavier Ordoquy
10c22af81e Merge pull request #5097 from pydanny/add-tsd111-to-resources 
add Two Scoops of Django 1.11 to tutorials and resources
 2017-04-25 21:40:43 +00:00
Daniel Roy Greenfeld
4be21cf854 add Two Scoops of Django 1.11 to tutorials and resources 2017-04-25 14:36:36 -07:00
Tom Christie
a0602bce4c Merge pull request #5088 from mlissner/patch-1 
Updates the core json media type in the docs
 2017-04-24 20:14:17 +01:00
Mike Lissner
b8520a1f2e Updates the core json media type in the docs 
Per: http://www.django-rest-framework.org/topics/3.5-announcement/#corejson-media-type

(I was *wondering* why this didn't seem to work!)
 2017-04-20 11:37:46 -07:00
Aarni Koskela
72da73310d SchemaGenerator: Avoid crashing with pagesizeless paginators 2017-04-19 09:43:28 +03:00