Commit Graph

7115 Commits

Author SHA1 Message Date
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
Xavier Ordoquy
0c42c74229 Merge pull request #3924 from linovia/stable/3.3.3
Version 3.3.3
2016-03-14 08:46:03 +01:00
Xavier Ordoquy
f0fc339278 Release date update. 2016-03-14 08:40:00 +01:00
Xavier Ordoquy
265db86590 Translation update. 2016-03-14 08:31:27 +01: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
c91229aaab PAGINATE_BY_PARAM and MAX_PAGINATE_BY removed in 3.3 2016-03-08 06:41:08 +01:00
Xavier Ordoquy
c90cf828ae PAGE_SIZE addition in 3.1 2016-03-08 06:40:33 +01:00
Xavier Ordoquy
180137300f PAGINATE_BY removed in 3.3 2016-03-08 06:39:58 +01:00
Xavier Ordoquy
a0aac166bc DEFAULT_PAGINATION_SERIALIZER_CLASS removed in 3.1 2016-03-08 06:39:08 +01:00
Xavier Ordoquy
9208619362 Those are now fully removed. 2016-03-08 06:38:03 +01:00
Xavier Ordoquy
cac1ecb250 paginate_by removed in 3.3 2016-03-08 06:37:46 +01:00
Krzysztof Szularz
cfd681dc73 Add /en to Heroku guidelines link 2016-03-07 21:01:04 +01:00
ildoc
2e2abbc811 updated tutorial for django 1.9 2016-03-07 20:59:58 +01:00
meoooh
0a2a01d05a fix typo
fix typo
2016-03-07 20:58:47 +01:00
Wes
0e1dcb7323 fix typo 2016-03-07 20:58:24 +01:00
Kin
b572cdb068 fix typo 2016-03-07 20:58:12 +01:00
Xavier Ordoquy
6ea9a41408 Add #3962 in the last minute fixes. 2016-03-07 20:39:34 +01:00
Xavier Ordoquy
4399d601c5 Translation updates. 2016-03-07 20:25:10 +01:00
Xavier Ordoquy
173c2f1e53 Release date update. 2016-03-07 20:22:47 +01:00
Jared Lang
e34a34e90b 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-03-07 19:37:48 +01:00
Luke Murphy
ef8e7f168f add rest-framework-generic-relations link to docs 2016-03-07 19:37:30 +01: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
97cc83483f Merge remote-tracking branch 'reference/stable/3.3.x' into stable/3.3.3 2016-03-01 10:39:34 +01:00
Xavier Ordoquy
0324429107 Add #3968 to the release notes. 2016-03-01 10:39:13 +01:00
Rex Kerr
f3b4cb5951 Fixes incorrect references to URLPathVersioning 2016-03-01 10:36:05 +01:00
Liping Wang
239815887d remove comma
remove comma
2016-03-01 10:35:41 +01:00
Liping Wang
05204333a5 [FIX] "@api_view" calling error.
"@api_view" usage error.
2016-03-01 10:35:41 +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
Xavier Ordoquy
d85162c83d Merge pull request #3968 from linovia/bug/missing_auth_token_migration
Add missing migration file for #3887
2016-02-27 01:53:07 +01:00