Commit Graph

4178 Commits

Author SHA1 Message Date
Eleni Lixourioti
2bad27231a Do not apply fix for multichoice help text in later version of Django.
The initial fix could cause problems in Django 1.7 when serializers
get used as a field. This is due to `force_text` being applied before
full initialization of the apps registry (see #1907).

The fix doesn't seem to be required after version 1.6:
https://code.djangoproject.com/ticket/9321
2014-10-03 09:45:47 +01:00
Carlton Gibson
ad1497898b Merge pull request #1905 from ya-mouse/master
[templates/rest_framework/base.html] Separate IDs for POST and PUT forms
2014-10-02 10:38:12 +02:00
Tom Christie
a8622adcd9 Update index.md 2014-09-29 16:57:40 +01:00
Tom Christie
5734b6e202 Update README.md 2014-09-29 16:56:50 +01:00
Anton D. Kachalov
802913d5e4 [templates/rest_framework/base.html] Separate object-form' and generic-content-form' IDs for POST and PUT forms
Signed-off-by: Anton D. Kachalov <mouse@yandex-team.ru>
2014-09-26 16:07:46 +04:00
Tom Christie
411511622d Merge pull request #1900 from jpadilla/pr_1507
Correctly propagate cloned_request for OPTIONS
2014-09-24 09:03:41 +01:00
Tom Christie
4ffae7c0e9 Merge pull request #1899 from collinanderson/urls
Remove patterns and strings from urls in tutorial.
2014-09-24 09:02:53 +01:00
José Padilla
90139b3efc Remove left unicode strings 2014-09-23 21:18:56 -04:00
José Padilla
e8c01ecdab Correctly propagate cloned_request for OPTIONS
Update to fix pending changes in #1507
2014-09-23 21:12:58 -04:00
Collin Anderson
da385c9c1f remove patterns and strings from urls #1898 2014-09-23 17:10:02 -04:00
Tom Christie
8495cd898a Drop 'No major point releases are currently planned.', cos they are. 2014-09-19 14:31:28 +01:00
Tom Christie
20424251a3 Version 2.4.3 2014-09-19 14:26:28 +01:00
Tom Christie
1e9ea377e3 Merge pull request #1887 from pipermerriam/piper/decorate_as_view_response_from_viewsets
Fix missing CSRF exemption on viewsets
2014-09-18 19:13:47 +01:00
Tom Christie
ddbd3cb659 Merge pull request #1882 from mattjmorrison/patch-2
Clarify "raised inside REST framework"
2014-09-18 18:11:26 +01:00
Piper Merriam
7f758d1cf6 Fix missing CSRF exemption on viewsets 2014-09-18 10:30:13 -06:00
Matthew J Morrison
764366b2e1 Fixed code formatting 2014-09-17 11:29:15 -05:00
Tom Christie
8c8d355e76 Update routers.py 2014-09-17 15:51:17 +01:00
Tom Christie
3376c37861 Merge pull request #1865 from mskrajnowski/default-router-listless-viewset
DefaultRouter support for viewsets without an implemented default action
2014-09-17 15:50:12 +01:00
Tom Christie
543c6c8e35 Merge pull request #1883 from jpadilla/master
Update authtoken latest Django 1.7 migration
2014-09-17 15:49:27 +01:00
José Padilla
de5fbf7d63 Update initial migration to work on Python 3 2014-09-17 10:23:53 -04:00
José Padilla
a37db382c6 Update authtoken latest Django 1.7 migration 2014-09-17 09:01:49 -04:00
Matthew J Morrison
e5af0bbb35 Clarify "raised inside REST framework"
I ran into an issue today where I was not seeing the rest_framework.views.exception_handler do what I thought it should be doing. It turned out that I had imported View from rest_framework.views rather than importing APIView from rest_framework.views. The phrase "raised inside REST framework" was confusing as I was debugging this issue. I was unsure if that meant that I could raise those exceptions in my code or if it had to originate from within framework code.

I'm not sure if the proposed wording is ideal, I just wanted to point out what I found to be confusing.
2014-09-17 07:49:54 -05:00
Tom Christie
92fb08bc6d Merge pull request #1874 from sheppard/patch-3
add wq.db router and django-rest-pandas renderers
2014-09-16 09:08:07 +01:00
S. Andrew Sheppard
3725a1e77d add wq.db router and django-rest-pandas renderers 2014-09-15 14:46:09 -05:00
Tom Christie
cefeb23b25 Merge pull request #1871 from jpadilla/third-party-docs
Add Third Party Resources Topic section
2014-09-14 16:52:53 +01:00
José Padilla
915dfb9b3d Update third-party-resources.md 2014-09-14 10:19:54 -04:00
José Padilla
4871dbdc73 Add invitation to add new content 2014-09-13 16:20:37 -04:00
José Padilla
1390b6801e Include third party resources link in home page 2014-09-13 16:20:16 -04:00
José Padilla
96c21b81f5 Add Third Party Resources Topic section 2014-09-13 13:53:40 -04:00
Marek Skrajnowski
ae84438530 Added DefaultRouter support (and test) for viewsets without the default action implemented, which is usually the list action. 2014-09-11 12:42:36 +02:00
Tom Christie
2937285790 Merge pull request #1863 from jbinney/master
Fix grammar in login error message
2014-09-11 09:20:01 +01:00
Joe Binney
37d01f6088 Fix grammar in login error message 2014-09-10 20:27:52 -07:00
Tom Christie
1d4e0131c3 Merge pull request #1861 from sheppard/patch-2
add django rest pandas
2014-09-10 22:29:53 +01:00
S. Andrew Sheppard
e76f56a3d6 add django rest pandas 2014-09-10 11:55:43 -05:00
Xavier Ordoquy
015a8122c7 Merge pull request #1852 from GVRV/bugfix/apiroot_get_regression
Make sure APIRoot.get can take on args, kwargs so router can be embedded...
2014-09-09 07:19:16 +02:00
Gaurav Dadhania
1a885b9e16 Make sure APIRoot.get can take on args, kwargs so router can be embedded within any URL pattern. 2014-09-09 05:42:52 +05:30
Tom Christie
168710813c Merge pull request #1844 from adamsc64/issue_1533
Fixed #1533 - Resolved issue with integer keys on nested choices never v...
2014-09-08 10:15:26 +01:00
Tom Christie
dc279530c7 Merge pull request #1846 from barqshasbite/patch-1
Fixing quotes in filtering.md example code.
2014-09-08 09:54:29 +01:00
Tom Christie
880ec3fe97 Merge pull request #1847 from hamishcampbell/master
Stop the API Client converting empty lists/dicts to empty strings
2014-09-08 09:53:59 +01:00
Hamish Campbell
826d76a8c7 Stop the API Client converting empty lists/dicts to empty strings 2014-09-08 12:16:20 +12:00
Darren Maki
fe06d96dec Fixing quotes in filtering.md
Incorrect quotes used in examples.
2014-09-07 12:53:21 -04:00
Tom Christie
d4d7739574 Merge pull request #1842 from jpadilla/travis-tox
Try running Tox from Travis
2014-09-07 14:00:39 +01:00
Christopher Adams
613a301a36 Fixed #1533 - Resolved issue with integer keys on nested choices never validating.
- Added unit test for nested `choices` argument.
- Added unit test for non-nested `choices` argument.
2014-09-06 17:13:28 -04:00
Tom Christie
e8fac28d88 Merge pull request #1818 from tituomin/serializer-subclass-mapping
Better mapping for custom model fields to serializer fields.
2014-09-06 07:20:31 +01:00
Tom Christie
5bbfef36f4 Merge pull request #1838 from jbittel/fix-encoded-filename-rfc6266
Support RFC6266 encoded filenames
2014-09-06 07:13:12 +01:00
Tom Christie
c419fb0f9e Merge pull request #1841 from jpadilla/view-description-as-promise
Supported translated text view descriptions
2014-09-06 07:05:27 +01:00
José Padilla
6901677cbd Install tox correctly 2014-09-05 17:56:25 -07:00
José Padilla
a01176ce5f Install tox 2014-09-05 17:50:49 -07:00
José Padilla
7173e134dd Try running Tox from Travis 2014-09-05 17:47:29 -07:00
Jason Bittel
3f7fad2e5a Refactor disposition unpacking for clarity 2014-09-05 16:27:55 -07:00