encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-22 17:47:04 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,525 Commits 18 Branches 132 Tags 105 MiB
03270431ed
Commit Graph

6525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Luke Murphy
f3c5802872 fix typo in relations docs 2016-02-24 14:22:24 +01:00
Tom Christie
a568d16ae4 Merge pull request #3950 from jpadilla/templates 
Create issue and pull request templates
 2016-02-22 16:03:06 +00:00
José Padilla
9c2899f6c8 Create issue and pull request templates 2016-02-22 11:17:02 -04:00
José Padilla
69c0de4faa Merge pull request #3953 from akarambir/remove-old-django-checks 
Closes #3952: Remove old django checks from tests and compat
 2016-02-19 11:08:45 -04:00
José Padilla
0b6f53eb98 Merge pull request #3943 from erickwilder/3937-accept-callable-as-initial-value 
Closes #3937. Support callable as the value of `initial` for any `serializer.Field`
 2016-02-19 10:41:23 -04:00
Erick Wilder
a32baeab0c Use datetime example for the Field.initial attribute 
Just like regular Django fields, the example adopted uses a `datetiume.date.today` to
illustrate the functionality.
 2016-02-19 09:53:50 +01:00
Karambir Singh Nain
69f1e3a9fd Remove old django checks from tests and compat 
Remove skipping of tests for Django<1.8. Remove several functions from compat.py not needed for Django>=1.8
 2016-02-19 01:47:45 +05:30
Xavier Ordoquy
5ace7174d4 Merge pull request #3949 from meoooh/patch-2 
fix typo
 2016-02-18 09:15:39 +01:00
meoooh
5cda3a04dd fix typo 
fix typo
 2016-02-18 14:43:41 +09:00
José Padilla
bec5f3db83 Merge pull request #3941 from wesgt/master 
fix typo
 2016-02-17 07:11:36 -04:00
José Padilla
0e1c1f6b91 Merge pull request #3940 from jianlin/typo-fix 
fix typo
 2016-02-17 07:11:04 -04:00
Erick Wilder
908efd6656 #3937 Update docs for the Field.initial attribute. 
Add an usage example on how to pass a callable to the `Field.initial` in the docs.
 2016-02-17 11:01:09 +01:00
Erick Wilder
8109752061 Closes #3937. Support callable as the value of initial for any serializer.Field 2016-02-17 10:52:21 +01:00
Wes
b773f03bd0 fix typo 2016-02-17 16:35:53 +08:00
Kin
96644bd6c1 fix typo 2016-02-16 23:08:45 -08:00
Xavier Ordoquy
79dad012b0 Merge pull request #3933 from carltongibson/drop-django-17 
Drop EOL Django 1.7
 2016-02-15 19:59:00 +01:00
Carlton Gibson
296c567645 Drop EOL Django 1.7 2016-02-15 16:07:42 +01:00
Xavier Ordoquy
3693e938a4 Merge pull request #3908 from kostya0shift/fix_exceptions_force_text 
Fixed _force_text_recursive typo
 2016-02-12 08:24:13 +01:00
José Padilla
8c1365e315 Merge pull request #3926 from federicobond/patch-1 
Add missing space in serializer error message
 2016-02-11 15:23:16 -04:00