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
a890116ab3
Minor docs addition
2013-07-04 13:49:28 +01:00
Tom Christie
b88bdfb9a5
Add section on dynamically modifying fields. Refs #958
2013-07-04 13:30:56 +01:00
Philip Douglas
bf8e71c455
Merge pull request #1 from tomchristie/master
...
Update from main
2013-07-04 05:29:42 -07:00
Tom Christie
5fa100245c
Update parser docstrings. Closes #968 .
2013-07-04 12:47:35 +01:00
Tom Christie
0950d3e0ef
Tweak docs
2013-07-04 08:02:08 +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
Tom Christie
7c0019854b
Horizontal rule for nicer formatting
2013-07-03 13:19:07 +01:00
Tom Christie
7398464b39
Tweak docs
2013-07-03 13:08:43 +01:00
Tom Christie
a55a293450
Improve browsable API docs including theme screenshots
2013-07-03 13:02:32 +01:00
Tom Christie
6d1c474618
Minor tidying
2013-07-02 22:29:38 +01:00
Tom Christie
2c477a9ca1
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-07-02 22:16:24 +01:00
Tom Christie
03e0ce35fe
Added 'Documenting your API' section. Closes #616
2013-07-02 22:15:46 +01:00
Tom Christie
e969c96aa0
Added @omouse for work on #955 - thanks! :)
2013-07-02 22:08:40 +01:00
Tom Christie
efafa617a8
Merge pull request #956 from omouse/update-router-docs
...
#955 updated documentation for overriding `routes` attribute in Router sub-classes
2013-07-02 14:06:22 -07:00
Rudolf Olah
e460180a4d
#955 updated router docs with more information on the Route
named tuple and its parameters.
2013-07-02 13:20:25 -04:00
Tom Christie
e7529b4072
Fix broken link by hacking around md->html translating
2013-07-02 16:22:22 +01:00
Tom Christie
8d410c4671
Tweak text
2013-07-01 17:32:06 +01:00
Tom Christie
8274ff7d9c
Capitalization on OAuth
2013-07-01 17:27:23 +01:00
Tom Christie
53dc98eefb
Added Django OAuth2 Consumer package
2013-07-01 17:22:42 +01:00
Tom Christie
5427d90fa4
Remove console style from code blocks
2013-07-01 17:22:11 +01:00
Tom Christie
0a722de171
Complete testing docs
2013-07-01 13:59:05 +01:00
Tom Christie
d31d7c1867
First pass at testing docs
2013-06-29 22:53:27 +01:00
Tom Christie
c9485c783a
Rename to force_authenticate
2013-06-29 22:53:15 +01:00
Tom Christie
ab799ccc3e
Simplify APIClient implementation
2013-06-29 21:34:47 +01:00
Tom Christie
664f8c6365
Added APIClient.authenticate()
2013-06-29 21:02:58 +01:00
Tom Christie
35022ca921
Refactor SessionAuthentication slightly
2013-06-29 08:14:05 +01:00
Tom Christie
f7db06953b
Remove unneeded tests.utils, superseeded by APIRequestFactory, APIClient
2013-06-29 08:06:11 +01:00
Tom Christie
90bc07f3f1
Addeded 'APITestClient.credentials()'
2013-06-29 08:05:08 +01:00
Tom Christie
f585480ee1
Added APIClient
2013-06-28 17:50:30 +01:00
Tom Christie
7224b20d58
Added APIRequestFactory
2013-06-28 17:17:39 +01:00
Tom Christie
05d8a90e94
Merge branch 'master' into writable-nested-modelserializer
2013-06-28 09:36:17 +01:00
Tom Christie
4ee9cdc7af
Fix compat datetime import when oauth2 provide does not support timezone aware datetimes
2013-06-28 09:35:52 +01:00
Tom Christie
b36ece7f70
Merge branch 'writable-nested-modelserializer' of https://github.com/tomchristie/django-rest-framework into writable-nested-modelserializer
2013-06-28 09:07:51 +01:00
Tom Christie
58d38d694e
Merge branch 'master' into writable-nested-modelserializer
2013-06-28 09:07:09 +01:00
Rudolf Olah
f5f23793e3
#955 updated documentation for overriding routes
attribute in Router sub-classes
2013-06-27 16:30:24 -04:00
Tom Christie
379ad8a824
pending deprecations -> deprecated
2013-06-27 20:36:14 +01:00
Tom Christie
3fcc01273c
Remove deprecated code
2013-06-27 20:29:52 +01:00
Tom Christie
1f6a59d76d
Moar hyperlinks
2013-06-27 13:41:42 +01:00
Tom Christie
7ba2f44a0f
Version 2.3.6
2013-06-27 13:00:05 +01:00
Tom Christie
124ae8c2c8
Tweak styling for max-height of sidenav
2013-06-27 12:58:38 +01:00
Tom Christie
e0dddbc5de
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-06-27 12:32:46 +01:00
Tom Christie
96f41fd12d
Use imported views to expose python 2.6 bug. Refs #943
2013-06-27 11:58:34 +01:00
Tom Christie
7e67ad666b
Merge pull request #953 from j4mie/prevent-duplicate-routing
...
Prevent dynamically routing to a method that is already routed to.
2013-06-26 15:37:42 -07:00
Tom Christie
4d22a65e78
Fix sidebar styling when browser window is too small
2013-06-26 23:26:35 +01:00
Jamie Matthews
c127e63c32
Raise exception when attempting to dynamically route to a method that is already routed to. Fixes #940
2013-06-26 23:00:42 +01:00
Tom Christie
af2fdc03a6
Update release notes
2013-06-26 22:45:39 +01:00