Piotr Jakimiak
6022b9ddd4
Fix comment
2014-09-05 12:00:17 +02:00
Piotr Jakimiak
e39422e35f
Check object in tests
2014-09-05 11:27:36 +02:00
Piotr Jakimiak
d9633c6817
Fix returning None when allow_none is True in CharField
2014-09-05 11:08:34 +02:00
Tom Christie
2e632e5af2
Merge pull request #1820 from carltongibson/login-dropdown
...
Hide login link in browsable API if the login view is not registered.
2014-09-05 09:07:14 +01:00
Xavier Ordoquy
29bcce7013
Merge pull request #1833 from dpanesso/master
...
Using user.get_username() instead of user.username.
2014-09-04 22:59:37 +02:00
Carlton Gibson
ef1fb3d8df
Prefer format and use named blocks
2014-09-04 08:54:50 +02:00
dpanesso
1ab782a430
Using user.get_username() instead of user.username.
...
This solves an error when using a auth model that does not have a username field.
2014-09-03 23:38:03 -05:00
Tom Christie
840fe7b05c
Merge pull request #1706 from pipermerriam/piper/use_decorator_mixin_class
...
Alter CSRF exemption implementation
2014-09-03 18:49:34 +01:00
Tom Christie
415b33b49f
Merge pull request #1827 from jpadilla/master
...
Test with released Django 1.7
2014-09-03 18:48:51 +01:00
José Padilla
fc250bf74b
Test with released Django 1.7
2014-09-03 09:58:21 -07:00
Piper Merriam
fc9be55d43
Alter CSRF exemption implementation
...
The previous implementation of decorating `APIView.dispach` with the
`csrf_exempt` decorator allowed for an easy-to-make mistake where
someone could override the `dispatch` method on a view and inadvertantly
remove the csrf exemption of their api view.
By moving the decoration of the view into the `as_view` logic, it
becomes much more difficult to make this mistake.
2014-09-03 09:50:31 -06:00
Tom Christie
f08afe162c
Version 2.4.2
2014-09-03 16:35:17 +01:00
Tom Christie
560f428e24
Merge pull request #1826 from swistakm/fix/explicit-many-in-pagination-serializer-results
...
Use explicit `many=True` in PaginationSerializer on `object_serializer` instantiation
2014-09-03 16:33:42 +01:00
Michał Jaworski
afe9b37f60
remove rogue print
2014-09-03 17:21:56 +02:00
Michał Jaworski
9195ccb97f
Use explicit many=True for object_serializer instantiation in PaginationSerializer and add catch dummy 'many' kwarg on DefaultObjectSerializer
2014-09-03 16:52:41 +02:00
Michał Jaworski
deb19272b7
Add custom pagination test that covers case with custom object serializer class
2014-09-03 16:49:32 +02:00
Carlton Gibson
4947303f20
Moved li tags inside optional_login
...
as per https://github.com/tomchristie/django-rest-framework/pull/1820#discussion_r16987993
2014-09-03 09:54:36 +02:00
Carlton Gibson
1e491c82e6
Fix imports
2014-09-02 15:29:21 +02:00
Carlton Gibson
4836afa89f
Fix docstring
2014-09-02 15:11:23 +02:00
Carlton Gibson
1967f525aa
Merge branch 'master' of github.com:tomchristie/django-rest-framework into login-dropdown
2014-09-02 14:54:15 +02:00
Carlton Gibson
fa0ef17737
Remove Login Dropdown when Auth Views are not registered.
...
Fixes #1738
2014-09-02 14:53:37 +02:00
Tom Christie
b40525d8e6
Merge pull request #1817 from tituomin/testing-requirements-documentation
...
Correct testing documentation details.
2014-09-01 12:23:02 +01:00
Timo Tuominen
278df84a7c
Correct testing documentation details.
2014-09-01 12:14:26 +03:00
Carlton Gibson
14877464f6
Merge pull request #1816 from carltongibson/regression-login-template
...
Regression for #1810 : Test login view renders
2014-09-01 10:31:07 +02:00
Carlton Gibson
0e51dab8f4
Comform to flake8
2014-09-01 10:09:46 +02:00
Tom Christie
55e779c856
Version 2.4.1
2014-09-01 09:07:55 +01:00
Carlton Gibson
1c9c5d5c32
Regression for #1810 : Test login view renders
2014-09-01 10:07:05 +02:00
Tom Christie
f777a73bc7
Merge pull request #1810 from danielroseman/restore-body-block
...
Restore body block to base template.
2014-09-01 08:54:58 +01:00
Xavier Ordoquy
bbc2749ee6
Merge pull request #1812 from linovia/bugfix/1804
...
Fix #1804
2014-08-31 03:44:10 +02:00
Xavier Ordoquy
4dd4538069
Exclude the pyc, pyo files and __pycache__ directories from packaging (thanks to Kevin Brown).
2014-08-31 03:39:34 +02:00
Daniel Roseman
b554c67d14
Restore body block to base template.
2014-08-30 13:28:12 +01:00
Tom Christie
efaa37376c
Update README.md
2014-08-29 14:01:54 +01:00
Tom Christie
5490fc2700
Fix links in 2.4 release
2014-08-29 13:29:51 +01:00
Jamie Matthews
baceb528cb
Fix typos in 2.4 release notes
2014-08-29 11:11:18 +01:00
Tom Christie
572107281f
Typo in 2.4 announcement name
2014-08-29 10:15:55 +01:00
Tom Christie
2a61ed8bac
2.4 Release notes
2014-08-29 10:10:17 +01:00
Tom Christie
8f4ae06b3b
Merge pull request #1784 from tomchristie/remove-model-attribute
...
Deprecate `.model` attribute on views
2014-08-29 10:03:07 +01:00
Tom Christie
bb1604674f
Minor docs update
2014-08-29 09:21:10 +01:00
Tom Christie
95093a982e
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2014-08-29 09:20:51 +01:00
Carlton Gibson
b88046eb64
Merge pull request #1788 from cezar77/fix-1719
...
Browsable API cleanups. Fixes #1719
2014-08-29 10:05:30 +02:00
Tom Christie
e7e3d29de4
Sponsor fix
2014-08-28 17:35:45 +01:00
Tom Christie
2536b93c03
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2014-08-28 17:02:37 +01:00
Tom Christie
73bd408f78
Latest sponsor update
2014-08-28 17:01:58 +01:00
Carlton Gibson
960fa425bf
Merge pull request #1795 from lnhubbell/patch-2
...
Update generic-views.md
2014-08-28 14:12:24 +02:00
Cezar Pendarovski
5380889275
Validation errors in the rendered HTML fixed
2014-08-28 10:39:01 +02:00
Nathan Hubbell
be21cafd2b
Update generic-views.md
...
Small grammar changes.
2014-08-27 17:57:40 -07:00
Cezar Pendarovski
e5d88a80a9
Put all TextNodes (method names) back to same line with parent element
2014-08-27 09:41:33 +02:00
Carlton Gibson
0724c557b1
Merge pull request #1792 from lnhubbell/patch-1
...
Update generic-views.md
2014-08-27 09:29:14 +02:00
Cezar Pendarovski
8c9b795296
Merge remote-tracking branch 'upstream/master' into fix-1719
2014-08-27 08:43:36 +02:00
Nathan Hubbell
19076510f4
Update generic-views.md
2014-08-26 17:31:08 -07:00
