Tom Christie
16ffdedd14
Merge master
2013-08-21 21:31:59 +01:00
Tom Christie
44ceef8415
Updating 2.4.0 release notes
2013-08-21 21:30:25 +01:00
Tom Christie
2bcad32dcb
If page size query param <= 0, just use default page size.
...
Closes #1028 .
2013-08-21 21:22:12 +01:00
Tom Christie
815ef50735
If page size query param <= 0, just use default page size.
...
Closes #1028
2013-08-21 21:18:46 +01:00
Tom Christie
db25aaff3a
Merge branch 'static-routes' into 0.4.0
2013-08-21 20:36:07 +01:00
Tom Christie
7cc1d38d22
Merge branch 'boolean-field-required-1004' of git://github.com/willkg/django-rest-framework
2013-08-19 21:44:52 +01:00
Tom Christie
28ff6fb1ec
Only HTML forms should have implicit default False for boolean fields
2013-08-19 21:44:47 +01:00
Tom Christie
8acee2e626
Commenting link/action decorators as pending deprecation
2013-08-19 21:02:22 +01:00
Tom Christie
28e44efe25
Merge branch 'master' into 2.4.0
2013-08-19 20:58:28 +01:00
Tom Christie
c607414f16
Merge
2013-08-19 20:36:18 +01:00
Tom Christie
5120670624
Document customizable view names/descriptions
2013-08-19 08:45:53 +01:00
Tom Christie
89b0a539c3
Move view name/description functions into public space
2013-08-19 08:24:27 +01:00
Tom Christie
a8aabe23c9
Merge branch 'master' of git://github.com/chrispaolini/django-rest-framework into chrispaolini-master
2013-08-19 07:40:30 +01:00
Christopher Paolini
5a374955b1
Updated tests for view name and description
...
Updated the tests to use the default view_name and view_description
functions in the formatter through the default in settings.
2013-08-18 00:29:05 -04:00
Christopher Paolini
11d7c1838a
Updated default view name/description functions
...
Forgot to update the default view name/description functions to the new
setup.
2013-08-17 17:52:08 -04:00
Christopher Paolini
e6662d434f
Improved view/description function setting
...
Now supports each View having its own name and description function and
overriding the global default.
2013-08-17 17:44:51 -04:00
Christopher Paolini
a95984e4d4
Settings now have default functions
...
Updated the setting to have a default function.
2013-08-16 13:23:04 -04:00
Will Kahn-Greene
430f00847a
Add test for BooleanField and required
...
This tests setting required=True on a BooleanField.
Test for issue #1004 .
2013-08-16 09:20:49 -04:00
Tom Christie
f6f69dc71d
Version 2.3.7
2013-08-16 14:03:20 +01:00
Tom Christie
7b27997a01
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-08-15 21:36:54 +01:00
Tom Christie
f34b9ff049
AnonRateThrottle should always allow authenticated users. Closes #994
2013-08-15 21:36:45 +01:00
Christopher Paolini
d07dae6e79
Ability to override name/description of view
...
Added settings and additions to formatting.py
2013-08-15 12:41:52 -04:00
Chad Barrington
99083baf25
Update filters.py
...
Fixed cut n pasted get_ordering docstring for ya bro.
2013-08-14 16:01:25 -05:00
Chad Barrington
486f4c8047
Update filters.py
...
Here's a little cleanup for ya, brah!
2013-08-14 15:18:44 -05:00
Tom Christie
44401273f7
Merge pull request #1038 from jsatt/nontime_throttling
...
don't set X-Throttle-Wait-Second header if throttle wait is None
2013-08-14 05:15:57 -07:00
JT
2f03870ae1
Fix for "No module named compat"
2013-08-13 18:48:49 -05:00
Jeremy Satterfield
1d8a80f5cc
don't set X-Throttle-Wait-Second header if throttle wait is None
2013-08-13 15:31:58 -05:00
Yuri Prezument
cd5f1bb229
Fix PATCH button title in template
2013-08-12 15:44:00 +03:00
Tom Christie
fbd4c4ee8f
Merge pull request #1030 from etos/patch-2
...
Spelling correction on read_only_fields err msg
2013-08-12 01:25:36 -07:00
Dan Stephenson
bbdcbe9452
Spelling correction on read_only_fields err msg
...
just spotted extras
2013-08-10 01:22:47 +01:00
Dan Stephenson
edd696292c
Spelling correction on read_only_fields err msg
2013-08-10 01:12:36 +01:00
Kevin Brown
103fed9667
Fixed reversed arguments in assertion
2013-07-26 10:59:51 -04:00
Pavel Zinovkin
b6d6feaa02
Fixed test
2013-07-21 22:43:19 +04:00
Pavel Zinovkin
2e18fbe373
Updated EmailField error message. This one already available in django translations.
...
https://github.com/django/django/blob/master/django/conf/locale/ru/LC_MESSAGES/django.po#L343
2013-07-21 17:03:58 +04:00
Alex Burgel
eaae8fb2d9
Combined link_* and action_* decorators into detail_route and list_route, marked the originals as deprecated.
2013-07-15 18:35:13 -04:00
Alex Burgel
ca7ba07b4e
Introduce DynamicDetailRoute and DynamicListRoute to distinguish between different route types
2013-07-15 17:59:37 -04:00
Alex Burgel
e14cbaf696
Changed collection_* decorators to list_*
2013-07-15 17:59:36 -04:00
Alex Burgel
f022743078
Rename router collection test case
2013-07-15 17:59:36 -04:00
Alex Burgel
8d521c068a
Revert route name change and add key to Route object to identify different route types
2013-07-15 17:59:36 -04:00
Alex Burgel
d72603bc6a
Add support for collection routes to SimpleRouter
2013-07-15 17:59:03 -04:00
Tom Christie
82145e2b06
Only include APISimpleTestCase and APILiveServerTestCase from django 1.4 onwards
2013-07-15 21:54:13 +01:00
Tom Christie
ae63c49777
Added test case classes
2013-07-15 11:38:38 +01:00
Tom Christie
3032a06c9b
Use absolute import style
2013-07-09 13:12:28 +01:00
Gertjan Oude Lohuis
db863be10c
Add an ModelAdmin for easy management of Tokens
2013-07-09 12:19:13 +02:00
Tom Christie
8f79caf9d1
Use 'force_text', not 'unicode', for compat across python version
2013-07-05 09:07:18 +01:00
Tom Christie
676ab4971c
Merge branch 'remove-hold-down-control-messages' of git://github.com/rouge8/django-rest-framework into rouge8-remove-hold-down-control-messages
2013-07-05 08:55:24 +01:00
Tom Christie
9e4e2c60f7
Merge branch 'master' into 2.4.0
2013-07-04 20:31:26 +01:00
Tom Christie
99794773cf
Merge pull request #962 from tomchristie/test-client
...
APIClient and APIRequestFactory
2013-07-04 05:50:04 -07:00
Tom Christie
5fa100245c
Update parser docstrings. Closes #968 .
2013-07-04 12:47:35 +01:00
Andy Freeland
7d43f41e4a
Remove 'Hold down "Control" ...' message from help_text
...
When getting the help_text from a field where `many=True`, Django
appends 'Hold down "Control", or "Command" on a Mac, to select more than
one.' to the help_text. This makes some sense in Django's ModelForms,
but no sense in the API.
2013-07-04 01:51:24 -04:00