Kyle Hornberg
399e1c1dcf
Typo fix ( #4094 )
2016-05-03 15:53:55 +01:00
Xavier Ordoquy
6c6e5c7fba
Merge pull request #4093 from auvipy/up
...
added python 3.5 checks for django 1.8
2016-05-03 12:23:04 +02:00
Asif Saifuddin Auvi
37ad407e64
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework into up
2016-05-03 16:01:40 +06:00
Asif Saifuddin Auvi
5f52c4ff3e
added python3.5 for django 1.8 checks
2016-05-03 15:52:05 +06:00
Asif Saifuddin Auvi
28c6d96af8
upgraded minor django version n tox ( #4091 )
2016-05-03 09:25:27 +01:00
Germán Larraín
e19b21ecc5
Handle incorrectly padded HTTP basic auth header ( #4090 )
2016-05-03 09:24:55 +01:00
Asif Saifuddin Auvi
04ebb1ef04
upgraded minor django version n tox
2016-05-03 09:50:52 +06:00
Xavier Ordoquy
a9bbb502cb
Remove references to South as we don't need it any longer. ( #4085 )
...
* Remove references to South as we don't need it any longer.
* Add a note about auth_token including Django migrations.
2016-04-29 14:16:03 +01:00
Daniele Varrazzo
88c80fe2e9
Fixed DecimalField arbitrary precision support ( #4075 )
2016-04-27 17:04:01 +01:00
José Padilla
4f16c54428
Merge pull request #4049 from clintonb/csrf-cookie-fix
...
Added support for custom CSRF cookie names
2016-04-26 11:43:23 -03:00
Xavier Ordoquy
1823662e1e
Merge pull request #4044 from linovia/merge/3.3.x_to_master
...
Merge the changes in 3.3.x back to master.
2016-04-21 11:31:15 +02:00
Puneet Aggarwal
888e5c78bd
Update README.md ( #4055 )
2016-04-19 15:09:16 +01:00
Clinton Blackburn
9d9658f128
Added support for custom CSRF cookie names
...
Instead of hardcoding the CSRF cookie name, the value is passed to the template as a context variable, rendered as a JavaScript variable, and read by csrf.js.
Fixes #4048
2016-04-11 23:58:55 -04:00
Phivos Stylianides
08dad04b19
Fix warnings when running tests ( #4047 )
2016-04-11 14:13:11 +01:00
Simon Charette
d87f2bc7b6
OrderingFilter adjustements ( #3983 )
...
* Made sure the OrderingFilter relies on Field.verbose_name.
* Marked OrderingFilter's order labels for translation.
2016-04-08 15:37:23 +01:00
Xavier Ordoquy
bff3bebdbe
Merge remote-tracking branch 'reference/stable/3.3.x' into merge_test
...
# Conflicts:
# docs/topics/release-notes.md
2016-04-08 15:46:17 +02:00
Xavier Ordoquy
95418eb8ac
Add the medium collection related to Django REST framework. ( #4043 )
2016-04-08 14:43:10 +01:00
Xavier Ordoquy
10a080d395
Merge pull request #4041 from linovia/bug/fix_correct_string_type
...
Fix regression introduced by #4035
2016-04-07 20:16:25 +02:00
Xavier Ordoquy
29a2e549c1
Merge remote-tracking branch 'reference/master' into bug/fix_correct_string_type
2016-04-07 18:03:12 +02:00
Xavier Ordoquy
2622588b30
Typo correction.
2016-04-07 18:00:17 +02:00
Xavier Ordoquy
019c6db759
Fix the string_types / text_types confusion introduced in #4025 ( #4035 )
2016-04-07 16:34:27 +01:00
Jonathan Liuti
78e4ea0d6e
No auth view failing permission should raise 403
...
A view with no `authentication_classes` set and that fails a
permission check should raise a 403 with the message from the
failing permission.
2016-04-07 16:24:26 +01:00
Xavier Ordoquy
6a29196712
Merge pull request #4038 from raphaelgyory/master
...
Add Django Rest Messaging to Third Party Packages
2016-04-06 17:26:16 +02:00
Raphael Gyory
b870101581
Update third-party-resources.md
2016-04-06 17:00:26 +02:00
Raphael Gyory
f1a384b61b
Add Django Rest Messaging in Third party packages
2016-04-06 16:58:15 +02:00
Xavier Ordoquy
763aab6b45
Fix the string_types / text_types confusion introduced in #4025
2016-04-05 16:29:16 +02:00
José Padilla
dd3b47ccbd
Merge pull request #4025 from dnit/master
...
type('') to str
2016-04-03 14:03:13 -04:00
Nitesh Lohchab
09aa8f76c4
python2.x and 3.x compatible
2016-04-03 18:39:32 +05:30
Nitesh Lohchab
c22b92a66c
type('') to str
2016-04-03 00:07:45 +05:30
José Padilla
3d3b06447f
Merge pull request #4024 from auvipy/dev
...
updated minor django versions on tox
2016-04-02 13:11:21 -04:00
auvipy
5cc6c254d5
updated minor django versions on tox
2016-04-02 23:02:44 +06:00
Xavier Ordoquy
67ac0486f5
Merge pull request #4006 from mochawich/patch-1
...
Reorder initializing the view
2016-03-31 13:53:14 +02:00
Xavier Ordoquy
6b1125a2b6
Merge pull request #4020 from alukach/patch-1
...
Add .partial_update to ModelViewSet documentation
2016-03-29 18:57:16 +02:00
Anthony Lukach
3fdd6e1db5
Add .partial_update to ModelViewSet documentation
...
The ModelViewSet inherits from the UpdateModelMixin, which provides the `.partial_update` method. This should be reflected in the documentation.
2016-03-29 10:50:12 -06:00
Xavier Ordoquy
c1802db1eb
Merge pull request #4018 from tomviner/bugfix-cramer-cursors-link
...
remove trailing slash from cramer cursor link
2016-03-24 21:45:40 +01:00
Tom Viner
3e5a1397d7
remove trailing slash from cramer cursor link
2016-03-24 20:37:38 +00:00
Xavier Ordoquy
f9304b6f34
Merge pull request #4016 from sheppard/html-json-forms
...
links to html-json-forms package
2016-03-24 18:02:58 +01:00
S. Andrew Sheppard
101c178b8c
links to html-json-forms package
2016-03-24 11:55:19 -05:00
Xavier Ordoquy
cfb77ae6fa
Merge pull request #3273 from olliewalsh/breadcrumbs_view_name
...
Do not ignore overridden View.get_view_name() in breadcrumbs
2016-03-23 01:10:13 +01:00
Xavier Ordoquy
0e8306341d
Merge pull request #3936 from carltongibson/null-uuid-fk-take2
...
Fix None UUID ForeignKey serialization
2016-03-22 22:46:33 +01:00
Xavier Ordoquy
85e57afc20
Merge pull request #4008 from minddust/hotfix/typo
...
Fix typo
2016-03-21 11:52:11 +01:00
Stephan Groß
0056703fe8
Fix code sample indention
2016-03-21 10:23:34 +00:00
Stephan Groß
3785281d4c
Add missing paginator in docs
2016-03-21 10:07:47 +00:00
Stephan Groß
91e869750e
Fix typo
2016-03-21 08:57:43 +00:00
Mohamad Nour Chawich
03270431ed
Reorder initializing the view
...
Determining the version and performing content negotiation should be done before ensuring the permission of the request. The reason is that these information can be used in handling the exceptions. For example different versions may return different error scheme. Also, the rendering class can be used to determine how to exception handler response should be rendered.
2016-03-20 21:46:37 +01:00
José Padilla
e946a496dc
Merge pull request #4003 from blaze33/patch-1
...
Fixed use of deprecated Query.aggregates
2016-03-19 11:39:53 -04:00
Maxime R
24694ddcb4
Fixed use of deprecated Query.aggregates
...
In Django 1.8 [`Query.aggregates` is replaced by `annotations`](https://docs.djangoproject.com/es/1.9/releases/1.8/#aggregate-methods-and-modules ).
Using aggregates currently raises a `RemovedInDjango20Warning`. [Django's source](https://github.com/django/django/blob/1.8/django/db/models/sql/query.py#L192 )
2016-03-18 16:16:13 +01:00
José Padilla
3645388547
Merge pull request #4002 from minddust/minor_tweaks
...
Fix blank lines around docstrings
2016-03-17 11:40:15 -04:00
Stephan Groß
a101251a2a
Fix blank lines around docstrings
2016-03-17 11:06:47 +00:00
José Padilla
1339fba117
Merge pull request #3989 from wlanslovenija/delay-javascript
...
Run JavaScript only when DOM is ready
2016-03-16 22:53:27 -04:00