Xavier Ordoquy
c9535c036b
Merged #1398 against 2.4 branch.
2014-08-19 11:12:36 +02:00
Tom Christie
e385a7b8eb
Merge master
2014-08-19 10:11:10 +01:00
Paul Oswald
3e93c96ece
replace unicode call with force_text
2014-08-19 10:09:48 +09:00
Tom Christie
48b66ec2a2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2014-08-18 20:56:49 +01:00
Tom Christie
97d8f037cc
Only set .action attribute in override_method if it already existed on the view
2014-08-18 20:56:17 +01:00
Tom Christie
1effc983b0
Update README.md
2014-08-18 20:51:08 +01:00
Tom Christie
01986fc80e
Merge pull request #1763 from fongandrew/patch-1
...
override_method should substitute action
2014-08-18 20:39:09 +01:00
Tom Christie
1d0c169e94
Merge pull request #1505 from ticosax/test.client.logout
...
reset stored credentials when call client.logout()
2014-08-18 20:37:25 +01:00
Tom Christie
c092b4df78
Merge pull request #1641 from javins/login-title
...
Refactor login template to extend base.
2014-08-18 20:28:34 +01:00
Tom Christie
3b899c9d57
Merge pull request #1726 from ikame/master
...
Leave status responsibility to parent class
2014-08-18 19:59:23 +01:00
Tom Christie
2aad8e4b35
Merge pull request #1654 from carltongibson/1559-take-2
...
Allow use of native migrations in 1.7 — Take 2
2014-08-18 18:54:43 +01:00
Tom Christie
e85ef3b479
Merge pull request #1772 from tomchristie/fix-1583
...
Copy filter_backends class attribute before returning it.
2014-08-18 16:14:45 +01:00
Tom Christie
d34dfc3fac
Merge pull request #1771 from tomchristie/fix-1718
...
Always uppercase X-Http-Method-Override methods.
2014-08-18 15:46:07 +01:00
Tom Christie
9f3c7e8930
Copy filter_backends class attribute before returning it.
2014-08-18 15:34:23 +01:00
Tom Christie
33af92e019
Always uppercase X-Http-Method-Override methods. Closes #1718 .
2014-08-18 15:14:30 +01:00
Carlton Gibson
556948661a
Improve wording.
2014-08-18 13:54:46 +02:00
Carlton Gibson
db4426fc35
Alter other reference to migrations.
2014-08-18 13:52:57 +02:00
Carlton Gibson
ae2ab496c2
Updated docs for South v1.0
2014-08-18 13:48:46 +02:00
Tom Christie
8244c7cc33
Merge pull request #1711 from kdazzle/ModelViewSet-queryset-static-property
...
Issue #1707 : Add documentation to api-docs.viewsets
2014-08-18 12:25:03 +01:00
Tom Christie
0e918055c7
Merge pull request #1739 from kevinlondon/patch-3
...
Updated documentation for urls.py
2014-08-18 12:15:32 +01:00
Tom Christie
61a1eaa485
tabs -> spaces
2014-08-18 11:55:22 +01:00
Tom Christie
92d51c813f
Merge pull request #1688 from ekonstantinidis/quick-start-order
...
Updated quick start project set up order
2014-08-18 11:54:14 +01:00
Tom Christie
dce30207da
Remove kickstarter links from homepage and README
2014-08-18 11:09:53 +01:00
Tom Christie
6edbabe0e1
Link to Django docs on widgets. Closes #1760 .
2014-08-18 10:58:00 +01:00
Tom Christie
b9cb9929b9
Merge pull request #1761 from sshquack/minor-doc-updates
...
Trivial doc updates
2014-08-18 10:53:11 +01:00
Tom Christie
3bb0a7e45d
Merge pull request #1762 from aymericderbois/feature/AddTestSerializerMethodField
...
Add test for SerializerMethodField
2014-08-18 10:49:26 +01:00
Andrew Fong
21cbf3484e
Fixed action_map being pulled from wrong object
2014-08-16 23:22:18 +00:00
Andrew Fong
5f63d31b00
override_method should substitute action
...
A view's action is dependent on the request method. When overriding the method (e.g. to generate a form for a POST request on a GET call to the browseable API), the action should be updated as well. Otherwise, viewset functions may be in a weird limbo state where a 'list' action has a POST method.
2014-08-16 15:05:46 -07:00
Aymeric Derbois
a6901ea36d
Add test for SerializerMethodField
2014-08-16 15:53:00 +02:00
Tom Christie
38a0e3e627
Sponsor update
2014-08-16 14:02:44 +01:00
sshquack
867e441ec0
Strip trailing spaces in tutorial
2014-08-15 20:45:28 -06:00
sshquack
14867705e9
Specify file names using standard format
...
+ Explicitly specify module names in the standard format similar to all
the other tutorials
+ Remove the extra quote around module name
2014-08-15 20:41:21 -06:00
Tom Christie
172b9c74f9
Latest sponsor update
2014-08-15 17:48:43 +01:00
Tom Christie
967798e832
Added compile to the sponsors
2014-08-15 17:39:51 +01:00
Tom Christie
4c60639595
Added Holvi
2014-08-15 16:19:13 +01:00
Tom Christie
e624871a68
Latest backer update
2014-08-15 15:46:26 +01:00
Tom Christie
a5561954d7
Latest sponsor updates
2014-08-15 15:36:49 +01:00
Tom Christie
b2fdc9fa0f
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2014-08-15 12:05:36 +01:00
Tom Christie
4dd7b5f376
Replace docs title. Easy is a sucky word choice.
2014-08-15 12:05:19 +01:00
Tom Christie
522f31ea6e
Merge pull request #1758 from catherinedodge/doc-fixes
...
Fixed small typo in docs
2014-08-15 05:38:42 +01:00
catherinedodge
bfd0b261db
Fixed small typo
2014-08-14 13:39:21 -04:00
Tom Christie
63d5634c66
Minor sponsor correction
2014-08-14 16:59:40 +01:00
Tom Christie
a8d5511a08
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2014-08-14 16:57:38 +01:00
Tom Christie
bdb884aceb
Latest sponsor update
2014-08-14 16:57:21 +01:00
Tom Christie
f23b500fba
Merge pull request #1757 from jwhitlock/error_as_list
...
ModelSerializer.restore_object - wrap ValueError error in a list
2014-08-14 14:29:28 +01:00
John Whitlock
34c1da3515
ModelSerializer.restore_object - errors as list
...
When a ValueError is raised in ModelSerializer.restore_object, the error
is set to a one-element list, rather than a bare string.
2014-08-13 15:31:25 -05:00
Tom Christie
c52075f392
Latest sponsor update
2014-08-13 14:02:09 +01:00
Tom Christie
5d674927b8
Minor docs style change
2014-08-12 14:59:17 +01:00
Tom Christie
c716f35825
Added Cantemo
2014-08-12 14:57:27 +01:00
Tom Christie
7551db23ca
Added Rob Spectre
2014-08-12 13:47:34 +01:00
