Carlton Gibson
c29c75da28
Merge pull request #1789 from nemesisdesign/patch-5
...
docs: added drf-hstore to third party fields
2014-08-26 11:19:48 +02:00
Carlton Gibson
65fda642f9
Merge pull request #1790 from nemesisdesign/patch-6
...
docs: added HStoreSerializer to third party serializers
2014-08-26 11:19:30 +02:00
Federico Capoano
eb81c55d16
docs: added HStoreSerializer to third party serializers
...
added a reference to django-rest-framework-hstore in docs/api-guide/serializers.md
2014-08-25 12:32:44 +02:00
Federico Capoano
8e3f7700f6
docs: added drf-hstore to third party fields
...
added a reference to django-rest-framework-hstore in docs/api-guide/fields.md
2014-08-25 12:29:10 +02:00
Tom Christie
21a0a826bb
Add Retry-After to release notes. Refs #1508 .
2014-08-20 17:34:51 +01:00
Tom Christie
3de09f1df0
Merge pull request #1508 from uploadcare/set-retry-after
...
set Retry-After header when throttled
2014-08-20 17:29:43 +01:00
Tom Christie
6953a5ecec
Typo
2014-08-20 17:16:47 +01:00
Dmitry Mukhin
3b07d0c997
Merge branch 'master' into set-retry-after
...
Conflicts:
tests/test_throttling.py
2014-08-20 20:04:48 +04:00
Tom Christie
59b47eac14
Fix cache_throttle typo
2014-08-20 12:32:24 +01:00
Tom Christie
6ffc97c808
Merge pull request #1770 from tomchristie/2.4.0
...
2.4.0 Release.
2014-08-20 12:06:29 +01:00
Tom Christie
f7b3e1e62b
Latest sponsor update
2014-08-20 11:09:04 +01:00
Tom Christie
874d2be83c
Release notes
2014-08-20 00:19:03 +01:00
Tom Christie
0c65e028b6
Release notes
2014-08-19 23:25:12 +01:00
Tom Christie
63d02dbea8
Drop six from compat. 1.4.2 is now the lowest supported version.
2014-08-19 17:06:55 +01:00
Tom Christie
00c0dfc66f
Documentation on runtests.py
2014-08-19 16:29:05 +01:00
Tom Christie
5358243ca5
Merge pull request #1778 from linovia/bugfix/1398
...
Bugfix/1398
2014-08-19 16:16:02 +01:00
Tom Christie
390061bed0
Merge pull request #1780 from tomchristie/pytest-tweaks
...
Added `runtests.py` and `flake8` code linting.
2014-08-19 16:15:48 +01:00
Xavier Ordoquy
06b6b96f93
Remove duplicated model declaration.
2014-08-19 16:32:30 +02:00
Tom Christie
2d2737f367
Resolve python3 linting issue
2014-08-19 14:11:26 +01:00
Tom Christie
d2795dd26d
Resolve linting issues
2014-08-19 13:54:52 +01:00
Tom Christie
19f3134062
Add flake8 to requirements
2014-08-19 13:42:01 +01:00
Tom Christie
bf09c32de8
Code linting and added runtests.py
2014-08-19 13:28:07 +01:00
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
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
