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
José Padilla
97ebd68f68
Remove unicode strings
2014-09-05 16:01:17 -07:00
José Padilla
c9d4497d81
Use force_text from compat
2014-09-05 15:58:53 -07:00
José Padilla
3e20b0110c
Fix linting issues
2014-09-05 15:58:42 -07:00
José Padilla
d44a8f24ff
Merge remote-tracking branch 'poswald/view-description-as-promise' into view-description-as-promise
2014-09-05 15:34:16 -07:00
Jason Bittel
959e234260
Move parser tests to correct directory
2014-09-05 15:33:47 -07:00
Jason Bittel
c8e475023c
Fix encoded filename parsing to allow for lang
2014-09-05 15:22:43 -07:00
Jason Bittel
bcd8a24db1
Refactor encoded filename feature per #1531
2014-09-05 14:56:54 -07:00
Vladislav Vlastovskiy
bcca9ed0fd
Removed use encoding available only in py3
2014-09-05 14:52:01 -07:00
Vladislav Vlastovskiy
644f9b5421
Removed assert for wrong charset
2014-09-05 14:51:31 -07:00
Vladislav Vlastovskiy
6e90dad8e3
Added test for encoded filename
2014-09-05 14:51:07 -07:00
Vladislav Vlastovskiy
8a9f34b838
Added get filename as encoded
...
This filename described in RFC 6266
2014-09-05 14:50:16 -07:00
Tom Christie
f4e02446f9
Merge pull request #1836 from jpadilla/filter-ordering
...
Preserve default ordering when using filtering
2014-09-05 20:34:43 +01:00
José Padilla
ab213cbc41
Remove order_by from AutoFilterSet
2014-09-05 11:43:49 -07:00
José Padilla
5add55abc8
Failing test case for #1432
2014-09-05 11:33:54 -07:00
Tom Christie
2b47c6b700
Merge pull request #1834 from piotrjakimiak/master
...
Fix returning None when allow_none is True in CharField
2014-09-05 13:57:34 +01:00
Piotr Jakimiak
cb3cc00edd
Delete useless assert
2014-09-05 14:36:35 +02:00
Tom Christie
4207d44531
Update requirements.txt
2014-09-05 13:19:47 +01:00