Commit Graph

3606 Commits

Author SHA1 Message Date
Tom Christie
31f94ab409 Added GenericViewSet and docs tweaking 2013-05-09 13:31:42 +01:00
Tom Christie
f2466418dd Tweak doc text slightly 2013-05-09 13:14:20 +01:00
Tom Christie
3737e17d7c Added 'Customizing the generic views' section. Closes #816 2013-05-09 13:10:45 +01:00
Tom Christie
9428d6ddb5 Merge pull request #817 from maspwr/writable-nested-modelserializer
Merge master into writable-nested-modelserializer
2013-05-09 00:57:27 -07:00
Mark Aaron Shirley
14482a9661 Fix deprecation warnings in relations_nested tests 2013-05-08 22:44:23 -07:00
Mark Aaron Shirley
e550740b3d Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer
Conflicts:
	rest_framework/tests/relations_nested.py
2013-05-08 22:39:48 -07:00
Tom Christie
4ab7b8f257 Version 2.3.2 2013-05-08 20:49:49 +01:00
Tom Christie
b443560080 Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings. Closes #798 2013-05-08 20:38:50 +01:00
Tom Christie
de69a28b9e Test and fix for #814. 2013-05-08 20:18:01 +01:00
Tom Christie
9d59e55cec Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-05-08 20:09:03 +01:00
Tom Christie
2379014f15 Add rails in credits section 2013-05-08 20:08:35 +01:00
Tom Christie
429e078eee Allow None filename on uploaded files 2013-05-08 20:07:51 +01:00
Tom Christie
673a7a496f Update generic-views.md 2013-05-08 10:17:27 +02:00
Tom Christie
42ba5b425b Added @dhepper for typo fixes in #812. 2013-05-08 10:02:52 +02:00
Tom Christie
9b4bf66245 Merge pull request #812 from dhepper/master
Fixed typos in tutorial
2013-05-08 01:01:25 -07:00
Tom Christie
dabe119af5 Typo 2013-05-07 20:35:33 +02:00
Daniel Hepper
70b8e5b759 Fixed typos in tutorial 2013-05-07 19:16:03 +02:00
Tom Christie
246a376dcf Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-05-07 17:26:17 +01:00
Tom Christie
a758066c03 Added @eyepulp for fix #810 2013-05-07 17:25:51 +01:00
Tom Christie
71df55148c Merge pull request #810 from EyePulp/patch-1
Updated the README.md example to fix a class reference
2013-05-07 09:17:54 -07:00
Tom Christie
a8e090df04 Remove accidental conflict diff 2013-05-07 17:14:25 +01:00
EyePulp
ea91298101 Updated the README.md example to fix a class reference
Two classnames in the example had "views." prepended to them, which appeared unnecessary.
2013-05-07 11:01:54 -05:00
Tom Christie
d7c08222f1 Fix breadcrumb rendering issue 2013-05-07 14:11:48 +01:00
Tom Christie
ed2cf180c9 Version 2.3.0 2013-05-07 13:29:38 +01:00
Tom Christie
3353889ae8 Docs for FileUploadParser 2013-05-07 13:27:27 +01:00
Tom Christie
642970a1b8 Merge pull request #806 from wronglink/master
Added FileUploadParser
2013-05-07 05:09:09 -07:00
Tom Christie
5356af8651 Merge pull request #808 from tomchristie/2.3
2.3
2013-05-07 05:08:28 -07:00
Tom Christie
0f00da848d Tweak 2.3 release notes 2013-05-07 13:07:42 +01:00
Tom Christie
3c2bb06660 Support for multiple filter classes 2013-05-07 13:00:44 +01:00
Tom Christie
d71a5533f9 allow_empty -> pending deprecation in preference of overridden get_queryset. 2013-05-07 12:25:41 +01:00
Tom Christie
b70c9cc107 Merge master 2013-05-05 18:12:35 +01:00
Tom Christie
287ff43cdd Merge pull request #805 from vshih/master
Example and spelling fixes.
2013-05-05 08:51:52 -07:00
Tom Christie
75b2afcb23 Merge branch 'master' into 2.3 2013-05-05 16:48:46 +01:00
Tom Christie
2dfd8c9697 docs, docs, docs 2013-05-05 16:48:12 +01:00
Tom Christie
660d240517 .action attribute on viewsets 2013-05-05 16:48:00 +01:00
Tom Christie
538d2e35e7 lookup_field on hyperlink serializers 2013-05-05 16:47:45 +01:00
Michael Elovskikh
5faaba9c69 Docs for FileUploadParser 2013-05-04 18:04:48 +06:00
Michael Elovskikh
a514232815 Raise ParseError if can't handle the uploaded file 2013-05-04 17:18:41 +06:00
Michael Elovskikh
e36e4f48ad Codebase improvements on FileUploadParser
* Added docstrings.
* Added `FileUploadParser.get_filename` to make it easier to override.
* Added url kwargs filename detection step.
* Updated tests corresponding to these changes.
2013-05-04 14:58:21 +06:00
Michael Elovskikh
318fdaabe5 Tests for FileUploadParser 2013-05-03 01:39:08 +06:00
Michael Elovskikh
0c85768435 Added FileUploadParser refs #7 2013-05-03 01:37:25 +06:00
Tom Christie
2d44dc3f54 Update release notes 2013-05-02 12:46:10 +01:00
Tom Christie
74beaefd12 Simplifying bits of docs 2013-05-02 12:08:05 +01:00
Tom Christie
387250bee4 Automagically determine base_name in router class 2013-05-02 12:07:37 +01:00
Tom Christie
e4067bfb75 introduce lookup_field and add pendingdeprecationwarnings 2013-05-02 12:07:18 +01:00
Victor Shih
8cabae22c5 Example and spelling fixes. Change "browseable" to "browsable" for consistency. 2013-05-01 21:26:40 -07:00
Tom Christie
198b679e02 Merge pull request #804 from dbrgn/iss803
Catch ImproperlyConfigured exception in compat.py
2013-05-01 09:54:07 -07:00
Tom Christie
ddbbe7844b Document lookup_field in release notes 2013-05-01 09:10:49 +01:00
Tom Christie
35f99cddc4 lookup_field on hyperlinked fields, and overriddable hyperlinked fields. Closes #688 2013-05-01 09:03:09 +01:00
Danilo Bargen
e5040fbf94 Catch ImproperlyConfigured exception in compat.py (fixes #803) 2013-04-30 23:24:33 +02:00