Philip Forget
5239362951
pass oauth_timestamp to oauth_provider
2013-11-14 18:02:07 -05:00
Tom Christie
134ffd96a1
Merge pull request #1226 from alexjg/master
...
Add Alex Good to credits (Whoop!)
2013-11-13 06:40:05 -08:00
Alex
72d72e4d3e
Add Alex Good to credits (Whoop!)
2013-11-13 14:32:37 +00:00
Tom Christie
fc1047e9b4
Merge pull request #1224 from alexjg/allow-aggregate-ordering
...
Allow aggregate ordering
2013-11-13 04:04:50 -08:00
Alex
e29942948f
Undo version bump
2013-11-13 12:06:59 +00:00
Alex
f4e610248b
Bump version
2013-11-12 23:46:01 +00:00
Alex
5136798a04
Merge branch 'master' into allow-aggregate-ordering
2013-11-12 23:40:24 +00:00
Alex
d1dc68d755
Add queryset aggregates to allowed fields in OrderingFilter
2013-11-12 23:40:07 +00:00
Tom Christie
8552e79d7b
Merge pull request #1220 from hzy/patch-1
...
Added drf-ujson-renderer to renderers docs
2013-11-11 03:29:00 -08:00
Jacob Haslehurst
52ac2199a8
Added drf-ujson-renderer to renderers docs
...
drf-ujson-renderer is a third party renderer that implements JSON renderering using UltraJSON
2013-11-11 22:24:37 +11:00
Tom Christie
b65b43c732
Merge pull request #1219 from sepeth/fix-documentation-typo
...
Typo on api-guide/fields.md and serializers.py
2013-11-11 01:58:43 -08:00
Doğan Çeçen
fd2c291c4d
Typo on api-guide/fields.md and serializers.py
2013-11-11 11:54:30 +02:00
Tom Christie
470134ae9b
Merge pull request #1217 from benpbenp/master
...
Fix object creation with reverse M2M when related_name unspecified
2013-11-08 07:15:40 -08:00
Tom Christie
209f238f42
Merge pull request #1215 from brutasse/versions
...
Updated versions in tox and travis config
2013-11-08 07:14:05 -08:00
Bruno Renié
f2ea5780d2
Exclude 1.4 on python 3
2013-11-08 14:58:36 +01:00
Bruno Renié
88b37d0f22
Merge remote-tracking branch 'upstream/master' into versions
2013-11-08 14:51:09 +01:00
Tom Christie
541871feca
Merge pull request #1216 from linovia/master
...
Fixed a regression with ValidationError under Django 1.6
2013-11-08 05:22:33 -08:00
Ben Pietravalle
b7b57adee2
Fix object creation with reverse M2M when related_name unspecified
...
It seems that field.related_query_name() does not return the related_name
for reverse M2M relations when related_name is not explicitly set in the M2M field
definition.
So, change to use obj.get_accessor_name(), where obj is an instance of
RelatedObject, as are returned by a model's
_meta.get_all_related_many_to_many_objects(), or as in the tuples returned by
_meta.get_all_m2m_objects_with_model().
2013-11-08 13:19:40 +00:00
Xavier Ordoquy
d4a50429b0
Fixed a regression with ValidationError under Django 1.6
2013-11-08 13:12:40 +01:00
Bruno Renié
1296753b5c
Updated versions in tox and travis config
2013-11-08 11:58:14 +01:00
Tom Christie
97430c0d9c
Merge pull request #1214 from diox/choicefield-typed
...
Improve handling of 'empty' values for ChoiceField
2013-11-06 04:24:59 -08:00
Mathieu Pillard
5829eb7a5b
Drop u'' prefix for python 3.x compatibility
2013-11-06 12:51:40 +01:00
Mathieu Pillard
5325890821
Improve handling of 'empty' values for ChoiceField
...
The empty value defaults back to '' (for backwards-compatibility) but
is changed automatically to None for ModelSerializers if the `null`
property is set on the db field.
2013-11-05 17:21:18 +01:00
Tom Christie
003b9dda34
Merge pull request #1207 from erkarl/master
...
Updated OAuth2 authentication docs.
2013-11-02 02:24:08 -07:00
Tom Christie
5e0538fcda
Added @robhudson for work on #1211 . Thanks!
2013-11-02 09:15:35 +00:00
Tom Christie
3d999e4be3
Merge pull request #1211 from robhudson/fix-six
...
Fixed exception handling with YAML and XML parsers.
2013-11-02 02:14:12 -07:00
Rob Hudson
e33435d0da
Fixed exception handling with YAML and XML parsers.
2013-10-31 15:03:50 -07:00
erkarl
f72488d609
Updated OAuth2 authentication docs.
2013-10-31 03:47:23 +02:00
Carlton Gibson
7ef83cf020
Merge pull request #1206 from sheppard/patch-1
...
Great. Thanks!
2013-10-29 13:31:13 -07:00
S. Andrew Sheppard
458af921f3
minor typo
2013-10-29 15:10:06 -05:00
Carlton Gibson
57c41b949d
Merge pull request #1203 from squidsoup/doc/testing-example
...
Docs: Fix for API test client example
2013-10-25 00:16:23 -07:00
Kit Randel
7d5499bcac
In the API test client example 'data' was not defined. There's also no
...
need to define 'expected' as we can just test against the dict.
2013-10-25 11:45:33 +13:00
Tom Christie
3c86e25b76
Merge pull request #1202 from jkbr/patch-1
...
Removed commented-out credits from footer so that django-debug-toolbar works
2013-10-24 09:20:05 -07:00
Jakub Roztočil
be55a3c5c7
Removed commented-out credits from footer to make django-debug-toolbar work.
...
The comment, although valid, caused that the Django debug toolbar's injected HTML was partially commented-out and thus the toolbar didn't work as expected.
2013-10-24 17:53:02 +02:00
Tom Christie
2ddf7869e3
Added @yamila-moreno for work on #1199 . Thanks!
2013-10-24 15:29:40 +01:00
Tom Christie
d1edef410d
Merge pull request #1199 from yamila-moreno/get-filter-backends
...
Added get_filter_backends method
2013-10-24 07:29:21 -07:00
Yamila Moreno
82e9ddcf7a
Added get_filter_backends method
2013-10-24 16:16:01 +02:00
Tom Christie
73716c8b89
Merge pull request #1200 from yamila-moreno/patch-1
...
Typo on generic-views.md
2013-10-24 06:57:58 -07:00
Yamila
c92af2b1dd
Typo on generic-views.md
2013-10-24 15:56:53 +02:00
Tom Christie
4d894fd39e
Added @alexanderlukanin13 for fix #1198 . Thanks!
2013-10-24 13:50:05 +01:00
Tom Christie
0fc9d5fed9
Merge pull request #1198 from alexanderlukanin13/form-post-unicode
...
Fixed UnicodeEncodeError when POST JSON via web interface; added test
2013-10-24 05:45:55 -07:00
Tom Christie
6302307885
Update comment in get_parser_context.
2013-10-24 13:45:16 +01:00
alexanderlukanin13
6b3500b684
Fixed UnicodeEncodeError when POST JSON via web interface; added test
2013-10-24 17:52:52 +06:00
Tom Christie
f92d8bd972
Added @jbzdak, for the nice docs improvements in #1191 . Thanks!
2013-10-22 12:21:26 +01:00
Tom Christie
0454956be5
Merge pull request #1191 from jbzdak/master
...
Filter documentation explanation
2013-10-22 04:20:02 -07:00
Jacek Bzdak
cc9c7cd8a4
Small documentation fix
2013-10-22 13:15:48 +02:00
Jacek Bzdak
8fffc346c1
Merge remote-tracking branch 'origin/master'
2013-10-22 13:13:01 +02:00
Jacek Bzdak
25c9d552c0
Explained a bit more about django-filter implementation.
...
Well, I spent some time trying to gues how djang-filter works, and
if this changes would be introduced, I would have saved this time.
2013-10-22 13:11:14 +02:00
Tom Christie
fa87fac61b
Added @ross for work on #1187 . Thanks!
2013-10-22 10:21:06 +01:00
Tom Christie
f2648fefff
Merge pull request #1187 from ross/paginator_def_val
...
paginator should validate page and provide default
2013-10-22 02:19:36 -07:00
