Commit Graph

3042 Commits

Author SHA1 Message Date
Tom Christie
3a99b0af50 Added @chrispaolini.
For customizable view names/descriptions in #1043.  Thanks! :)
2013-08-19 08:47:52 +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
Tom Christie
c1ccd8b5b5 Update docs to include testing. 2013-08-16 14:12:24 +01:00
Tom Christie
f6f69dc71d Version 2.3.7 2013-08-16 14:03:20 +01:00
Tom Christie
13ca305b06 Tweak docs. 2013-08-16 13:27:21 +01:00
Tom Christie
d5b56310b0 Update release notes 2013-08-16 13:23:27 +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
Tom Christie
c245fc6cde Merge pull request #1040 from crushingithard/patch-1
Update filters.py
2013-08-15 01:28:28 -07: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
7bc63fbb11 Added @jsatt.
For fix & tests in #1037.
2013-08-14 13:17:30 +01: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
Tom Christie
5311f781ff Merge pull request #1039 from rotajota/master
Fix for "No module named compat"
2013-08-14 05:14:22 -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
Stephan Groß
999056cde1 Add @martync for #1033 thanks! 2013-08-13 10:43:07 +02:00
Stephan Groß
8da18fbbc4 Merge pull request #1033 from martync/patch-1
Fix typo
2013-08-13 01:14:20 -07:00
martync
770d496307 Small typo 2013-08-13 09:19:40 +02:00
Tom Christie
5a03e2c318 Merge pull request #1031 from yprez/template-fix-patch-label
Fix PATCH button title in the template
2013-08-12 05:50:38 -07:00
Yuri Prezument
cd5f1bb229 Fix PATCH button title in template 2013-08-12 15:44:00 +03:00
Tom Christie
54b7b6760c Added @etos.
For fixes in #1029, #1030 - Thanks!
2013-08-12 09:27:34 +01: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
Tom Christie
e8288445a7 Merge pull request #1029 from etos/patch-1
Spelling correction on read_only_fields err msg
2013-08-12 01:25:10 -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
Tom Christie
2761d6a472 Added @kolvia.
For multiple documentation fixes in #1026.  Thank you! :)
2013-08-07 20:27:41 +01:00
Tom Christie
9ac43f133b Merge pull request #1026 from kolvia/fix-typos
Fixed typos in a bunch of docs
2013-08-07 12:25:22 -07:00
Veronica Lynn
4d8d2340be Fixed typos in a bunch of docs 2013-08-07 14:00:06 -04:00
Stephan Groß
b52beb0734 Merge pull request #1023 from jsummerfield/patch-5
Fix typos in routers.md
2013-08-03 02:38:25 -07:00
James Summerfield
4ff1dc6a11 Fixing typos in routers.md 2013-08-03 10:23:39 +01:00
Stephan Groß
e4144b5b67 Add @rlr for #1022 thanks! 2013-08-02 08:59:18 +02:00
Stephan Groß
f2c3a88fc5 Merge pull request #1022 from rlr/missing-comma
Add missing comma to generic view example.
2013-08-01 23:57:48 -07:00
Ricky Rosario
3802442c89 Add missing comma to generic view example. 2013-08-01 17:02:16 -04:00
Stephan Groß
9e9233f87f Merge pull request #1017 from minddust/third_party_docs
Add drf-any-permission docs entry #1014
2013-07-31 11:26:22 -07:00
Stephan Groß
e612103991 Fix typo 2013-07-31 20:25:28 +02:00
Stephan Groß
294d957361 Add drf-any-permission docs entry 2013-07-31 20:14:49 +02:00
Tom Christie
43a5f8183c Merge pull request #1015 from leandersikma/patch-1
Renamed wrong filename in the browsable API documentation.
2013-07-31 05:32:26 -07:00
leandersikma
56d19dcc1c Wrong name of the login_base html file.
Changed rest_framework/base_login.html to rest_framework/login_base.html (which is the correct name the user should extends in their templates).
2013-07-30 11:26:17 +02:00
Stephan Groß
205c626d6e Add @jimr for #1013 thanks! 2013-07-29 15:53:26 +02:00
Tom Christie
02ef6d3bd7 Merge pull request #1013 from Maplecroft/doc_fixes
Clarification to authtoken docs
2013-07-29 02:27:05 -07:00
James Rutherford
195b1af7ba Minor typo fix 2013-07-29 10:16:51 +01:00
James Rutherford
1a4ff1567e Updated authtoken docs to mention south migrations 2013-07-29 10:16:15 +01:00