Commit Graph

6911 Commits

Author SHA1 Message Date
Tom Christie
a9a097496e extra_kwargs takes precedence over uniqueness kwargs (#4349) 2016-08-02 14:33:15 +01:00
Tom Christie
5500b265bc Test cases for DictField with allow_null options (#4348) 2016-08-02 14:14:36 +01:00
Tom Christie
bda16a518a Dedent tabs. (#4347) 2016-08-02 13:33:14 +01:00
René Fleschenberg
9f5e841daf Change template context generation in TemplateHTMLRenderer (#4236)
- Change the name of ``resolve_context()`` to ``get_template_context()``.
- Pass the renderer context to this method, to give subclasses more flexibility
  when overriding.
2016-08-02 13:11:41 +01:00
Tom Christie
e37619f741 Serializer defaults should not be included in partial updates. (#4346)
Serializer default values should not be included in partial updates
2016-08-02 13:05:12 +01:00
Tom Christie
296e47a9f8 Update from Django 1.10 beta to Django 1.10 (#4344) 2016-08-02 10:23:56 +01:00
Tom Christie
3ef3fee926 Descriptive error from FileUploadParser when filename not included. (#4340)
* Descriptive error from FileUploadParser when filename not included.
* Consistent handling of upload filenames
2016-08-01 18:44:58 +01:00
Tom Christie
46a44e52aa Quantize incoming digitals (#4339) 2016-08-01 17:15:41 +01:00
Tom Christie
aa349fe767 Handle non-string input for IP fields (#4338) 2016-08-01 16:14:26 +01:00
jsurloppe
e997713313 urljoin with leading slash remove part of path (#4332) 2016-08-01 14:14:55 +01:00
Jaap Roes
5b071ab35e Remove note about Django 1.3 (#4334)
Remove note about Django 1.3
2016-08-01 12:05:47 +01:00
Tom Christie
48a2f084aa Minor docs tweak [ci skip] 2016-07-28 13:38:05 +01:00
Tom Christie
449ec1d724 Version 3.4.1 [ci skip] (#4326) 2016-07-28 13:34:35 +01:00
Tom Christie
e407dc7f01 Added root_renderers argument (#4323) 2016-07-28 12:50:51 +01:00
Tom Christie
306726d9e8 Improve datetime format docs (#4322) 2016-07-28 12:25:21 +01:00
Tom Christie
061e0ed084 Added url and schema_url arguments (#4321) 2016-07-28 12:08:34 +01:00
Tom Christie
6a7d34ec34 Unique together checks should apply to fields that are read only, but have a default. (#4316) 2016-07-27 15:40:04 +01:00
Tom Christie
1acbc29d58 Minor style tweak. [ci skip] 2016-07-27 15:39:46 +01:00
Alexander Gaevsky
46a870c002 Fix schema generation for APIView, since it does not have get_serializer_class method. (#4285) 2016-07-27 15:36:36 +01:00
Tom Christie
3586c8a61a Set view.format_kwarg in schema generator (#4315) 2016-07-27 14:43:45 +01:00
Tom Christie
8ebf81b150 Schema support should function when 'pagination_class = None' (#4314) 2016-07-27 13:02:48 +01:00
Tom Christie
351e0a4a99 Fix json indent parameter. Closes #4281 (#4313) 2016-07-27 11:49:01 +01:00
Tom Christie
f9df0dc965 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2016-07-26 16:45:37 +01:00
Tom Christie
19b415ec25 Improve pagination docs. Refs #4304 [ci skip] 2016-07-26 16:45:27 +01:00
Tom Christie
5d3b56f957 Test case for #4272 (#4310)
* Test case for #4272
2016-07-26 16:28:10 +01:00
Sassan Haradji
f0f61aa077 use verbose_name instead of object_name in field_mapping (#4299)
* use verbose_name instead of object_name in error messages
2016-07-26 15:12:51 +01:00
Asif Saifuddin Auvi
b63099084f twitter bootstrap minor update (#4307)
* updated bootstrap min css to 3.3.7
* updated bootstrap min javascript to 3.3.7
2016-07-26 14:09:04 +01:00
Gustavo Pantuza
da2ff1bc4a Adding support for RFC 4918 status codes (#4291)
* Added HTTP status codes from RFC 4918

* Updated documentation about status codes

* Added reference to RFC 4918
2016-07-26 11:09:12 +01:00
Andi Albrecht
3ca0b15b17 Restore meta information for each search field. (#4298)
The meta information stored in opts needs to be restored for
each search field. Otherwise it references the wrong model
when an attribute of a related model comes before an attribute
of the original model in search fields. This doesn't apply to
m2m relations since must_call_distinct returns True in that
case.
2016-07-26 11:07:03 +01:00
Hendra
48465a667a Remove outdated resources (#4295)
Removed links to Youtube videos that are no longer available and updated a link to a tutorial that has moved.
2016-07-26 11:03:05 +01:00
Xavier Ordoquy
0f61c9ec29 Merge pull request #4286 from osantana/patch-1
Fix SwaggerRenderer implementation example
2016-07-19 19:39:48 +02:00
Osvaldo Santana Neto
02a81d3362 Fix SwaggerRenderer implementation example 2016-07-19 14:15:49 -03:00
Xavier Ordoquy
6d4ada05ec Merge pull request #4283 from auvipy/up
updated minor django versions
2016-07-19 10:46:52 +02:00
Asif Saifuddin Auvi
71cdda9399 updated minor django versions 2016-07-19 11:31:29 +06:00
Philippe Ombredanne
e476c222f9 Add LICENSE.md to the built wheel (#4270)
The wheel released on Pypi does not include the license file .
The way to do this is by updating the setup.cfg accordingly
2016-07-18 16:08:44 +01:00
Marc Gibbons
d80b0eaead Update schema generator example (#4267)
1. The returns from the views needs to be a Response
2. I found that instantiating the generator at the module level caused an import error when starting Django, likely because it is executing before all the app load magic happened. Moving it into the view method solved this.
2016-07-18 16:04:23 +01:00
Xavier Ordoquy
bea243a0ca Fix coreapi param arguments. (#4274) 2016-07-18 15:56:36 +01:00
Xavier Ordoquy
6b713207d2 Merge pull request #4273 from aaugustin/issue-4272
Add missing return statement.
2016-07-17 13:54:18 +02:00
José Padilla
ad9c96ebe2 Merge pull request #4269 from glarrain/patch-1
docs.settings: fix name of `VERSION_PARAM`
2016-07-16 18:27:15 -04:00
Aymeric Augustin
a436515196 Add missing return statement.
Fix #4272.
2016-07-16 22:44:49 +02:00
Germán Larraín
1a65f72f71 docs.settings: fix name of VERSION_PARAM 2016-07-15 14:34:27 -04:00
Xavier Ordoquy
91aad9299b Merge pull request #4263 from anoopmalav/master
Fix Typo in index.md
2016-07-14 20:01:09 +02:00
anoopmalav
faf6f226cd Fix Typo in index.md
Currently generating invalid URL at index page.
http://www.django-rest-framework.org/'api-guide/schemas.md'

Though it is correct in navigation.
2016-07-14 22:57:38 +05:30
Tom Christie
70e4a43ae3 Update coreapi requirement 2016-07-14 12:56:57 +01:00
Tom Christie
a9218e460f Minor tutorial updates 2016-07-14 12:44:13 +01:00
Tom Christie
aa40c58381 Note 'coreapi dump' command 2016-07-14 12:33:54 +01:00
Tom Christie
28820449f0 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2016-07-14 12:29:46 +01:00
Tom Christie
5dd3d1b5d9 Update coreapi version in docs 2016-07-14 12:29:37 +01:00
Rashid Al Abri
df33035a3c Change incorrect example URL (#4261)
Changed http://example.com/api/items/4/.json to http://example.com/api/items/4.json
2016-07-14 12:28:28 +01:00
Tom Christie
06751f8548 Minor docs tweaks 2016-07-13 16:59:15 +01:00