Commit Graph

6548 Commits

Author SHA1 Message Date
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
José Padilla
f1a4e9a846 Merge pull request #3986 from AltSchool/docs/dynamic-rest
Add a reference to the dynamic-rest addon
2016-03-16 17:39:14 -04:00
Xavier Ordoquy
bb56ca46ed Merge pull request #3998 from AlexRiina/patch-1
Remove django1.7 from README.md
2016-03-16 08:40:28 +01:00
Alex Riina
1725e5e5b8 Remove django1.7 from README.md
Remove django1.7 since #296c56764574b178be2d0ac96b38d7879e0b3947 took django1.7 off the build.
2016-03-15 23:23:06 -04:00
Carlton Gibson
2ef74cfa61 Bring check for null fk to BaseSerializer.to_representation 2016-03-13 20:39:19 +01:00
Mitar
2f49df8242 Run JavaScript only when DOM is ready. 2016-03-12 16:52:31 -08:00
aleontiev
3a3fd66852 documentation: add a reference to the dynamic-rest addons under the serializers guide 2016-03-11 12:43:17 -05:00
Xavier Ordoquy
22695ec8a7 Merge pull request #3978 from jpadilla/master
Update Django versions after bugfix release
2016-03-07 10:43:40 +01:00
José Padilla
c811a51be7 Update Django versions after bugfix release 2016-03-05 11:28:28 -04:00
Tom Christie
82ec6e859c Merge pull request #3962 from jslang/fix_null_check_in_hyperlinkrelation
Fix empty pk detection in HyperlinkRelatedField.get_url
2016-03-04 16:19:48 +00:00
Xavier Ordoquy
5f3868a3bf Merge pull request #3974 from jpadilla/master
Update Django security releases 1.9.3 and 1.8.10
2016-03-02 16:13:51 +01:00
José Padilla
03c95c0e71 Update Django security releases 1.9.3 and 1.8.10 2016-03-02 11:04:53 -04:00
José Padilla
b3582cd36b Merge pull request #3973 from lwm/docs-generic-relations
add rest-framework-generic-relations link to docs
2016-03-01 13:54:44 -04:00
Luke Murphy
66e86dc483 add rest-framework-generic-relations link to docs 2016-03-01 18:44:17 +01:00
Tom Christie
6b01c5f094 Merge pull request #3972 from szuliq/patch-1
Add `/en` to Heroku guidelines link
2016-03-01 13:59:31 +00:00
Krzysztof Szularz
2ddd30be90 Add /en to Heroku guidelines link 2016-03-01 14:52:07 +01:00
Xavier Ordoquy
c2cfb84308 Merge pull request #3971 from lynndotconfig/master
[change] using safer calling way of  "@api_view" in docs/tutorial/5-relationships-and-hyperlinked-apis.md
2016-03-01 10:20:21 +01:00
Liping Wang
c3cea1499f remove comma
remove comma
2016-03-01 15:46:20 +08:00
Jared Lang
7ac8cc760c Fix empty pk detection in HyperlinkRelatedField.get_url
This implementation allows detection of empty values that are non-nullable, allowing the field to return None values for such cases
2016-02-29 12:56:56 -08:00
Liping Wang
d372ccca02 [FIX] "@api_view" calling error.
"@api_view" usage error.
2016-02-29 19:51:33 +08:00
José Padilla
eec7c1754e Merge pull request #3969 from rexkerr/fix-versioning-docs
Fixes incorrect references to URLPathVersioning
2016-02-27 17:11:15 -04:00
Rex Kerr
88320b8a61 Fixes incorrect references to URLPathVersioning 2016-02-27 12:41:56 -08:00
Tom Christie
a15e46af88 Merge pull request #3965 from ildoc/master
updated tutorial for django 1.9
2016-02-25 21:37:27 +00:00
José Padilla
82245be8f9 Merge pull request #3966 from staranjeet/typo-fix
Docs: Fix repetitive word in the tutorial
2016-02-25 14:59:22 -04:00
Taranjeet
3fd6db1445 Docs: Fix repetitive word in the tutorial 2016-02-26 00:02:45 +05:30
ildoc
35036aee15 updated tutorial for django 1.9 2016-02-25 14:27:57 +01:00
Xavier Ordoquy
450c76472b Merge pull request #3960 from lwm/fix-typo-relations
Fix typo in relations docs
2016-02-24 15:45:23 +01:00