Commit Graph

6490 Commits

Author SHA1 Message Date
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
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
Xavier Ordoquy
753f4dc477 Fix sorting order. 2016-02-27 01:46:59 +01:00
Xavier Ordoquy
6ea6e37ac9 Add missing migration file for #3887 2016-02-27 00:51:35 +01:00
Xavier Ordoquy
24a2ec0501 Merge remote-tracking branch 'reference/stable/3.3.x' into stable/3.3.3 2016-02-27 00:36:23 +01:00
Taranjeet
a609e4e1ca Docs: Fix repetitive word in the tutorial 2016-02-27 00:28:15 +01:00
Luke Murphy
c03c6c6e78 fix typo in relations docs 2016-02-27 00:27:41 +01:00
José Padilla
c6dadc062d Merge pull request #3946 from linovia/feature/remove_page_info_in_pagination_error_msg
Remove page information in pagination error messages
2016-02-17 22:48:30 -04:00
Xavier Ordoquy
5e08231453 Remove informations about why the pagination didn't work.
We remove a couple of informations to lower the exposition of our internals.
2016-02-17 18:18:19 +01:00
Xavier Ordoquy
2fc44402f9 Merge pull request #3928 from linovia/feature/pandoc_for_setup
Use pandoc to generate a nice PyPI information page.
2016-02-12 14:52:17 +01:00
Xavier Ordoquy
f48ccad581 Fail hard during publish if pandoc isn't available. 2016-02-12 13:43:18 +01:00
Xavier Ordoquy
f5822e7b71 Bump version to 3.3.3 2016-02-12 13:23:08 +01:00
Xavier Ordoquy
72ecd32c6b Use pandoc to generate a nice PyPI information page. 2016-02-12 13:15:20 +01:00
Xavier Ordoquy
c8ca3a1c05 Release notes for 3.3.3 2016-02-11 07:14:45 +01:00
Xavier Ordoquy
aeda2adeea Merge pull request #3913 from blag/patch-2
Remove version string from admin template
2016-02-09 14:03:28 +01:00
blag
89d575a52a Remove version string from admin template 2016-02-09 05:56:47 -07:00
Xavier Ordoquy
582928da3e Merge pull request #3912 from blag/patch-1
Remove version string from base template
2016-02-09 08:09:11 +01:00
blag
d2ca8872c0 Remove version string from base template 2016-02-08 22:36:39 -07:00
Tom Christie
df9b3fbde4 Merge pull request #3910 from m1kola/patch-1
Fixes vertical html layout for BooleanField
2016-02-08 15:12:51 +00:00
Mikalai Radchuk
59ab3a291c Fixes vertical html layout for BooleanField
`HTMLFormRenderer` renders `BooleanField` field as not checked if vertical layout are used.
2016-02-08 17:07:16 +03:00
Xavier Ordoquy
a3f513c83c Merge pull request #3904 from charettes/tox-warnings
Displayed warnings during test suite.
2016-02-04 20:14:27 +01:00
Simon Charette
57608b937e Displayed warnings during test suite. 2016-02-04 13:58:50 -05:00
Xavier Ordoquy
61f3ccf385 Merge pull request #3903 from charettes/deprecation-warnings-1.8
Silenced deprecation warnings on Django 1.8.
2016-02-04 19:57:32 +01:00
Simon Charette
1a052d6ee3 Silenced deprecation warnings on Django 1.8. 2016-02-04 13:49:55 -05:00
Tom Christie
24c4850019 Merge pull request #3902 from betacloud-solutions/tutorial_createsuperuser_password
Use 'password123' as password for new users in the tutorial
2016-02-04 11:11:02 +00:00
Christian Berendt
ff4d7c7e07 Use 'password123' as password for new users in the tutorial
Trying to create a new user on Django 1.9.x with the password 'password'
will fail with the error message 'This password is too common.'. Because
of that it is necessary to change the used password from 'password' to
'password123'.
2016-02-04 07:26:15 +01:00
Xavier Ordoquy
564b1c8268 Merge pull request #3896 from m1kola/patch-1
Fixes docstrings in fields.py
2016-02-03 11:10:12 +01:00
Xavier Ordoquy
d4fbd6e531 Merge pull request #3898 from auvipy/dev
updated readme with commands from recent versions of django
2016-02-03 11:05:29 +01:00
Xavier Ordoquy
ea796fa071 Merge pull request #3897 from zvovov/master
typo in docs - tutorial part 1
2016-02-03 11:04:20 +01:00
auvipy
0d4db85e8c updated readme with commands from recent versions of django 2016-02-03 16:01:37 +06:00
Chirag Khatri
62551bc80f typo in tutorial part 1 2016-02-03 15:25:31 +05:30
Mikalai Radchuk
1f2a32d506 Fixes docstrings in fields.py
Fixes docstrings for `to_choices_dict` and `flatten_choices_dict` functions in fields.py.

Mistakes were introduced in #4d69286
2016-02-03 12:36:00 +03:00
José Padilla
0512c394a3 Merge pull request #3875 from m1kola/bugfix/HTMLFormRenderer-render-renderer_context-default
Fixes AttributeError in HTMLFormRenderer.render
2016-02-01 16:28:11 -04:00
Xavier Ordoquy
ee23ef9907 Merge pull request #3889 from jpadilla/update-django
Update Django versions
2016-02-01 20:43:24 +01:00
José Padilla
37d1d3e738 Update Django versions 2016-02-01 15:36:11 -04:00
Xavier Ordoquy
dce544ec59 Merge pull request #3887 from mnach/enhancement-3886
enhancement #3886 Internationalization in admin interface for authtoken
2016-02-01 10:10:48 +01:00
Mikhail Nacharov
d0f7b04805 enhancement #3886 Internationalization in admin interface rest_framework.authtoken
+ verbose_name in models.Token fields
+ Meta-options verbose_name & verbose_name_plural
+ Labels in AuthTokenSerializer fields in case of usages in Brousable API
+ provide AppConfig class as described in django documentation with verbose_name came through ugettext_lazy
2016-02-01 13:20:16 +05:00
Xavier Ordoquy
d738ad7ae6 Update to serialization results (closes #3881). 2016-01-27 22:23:20 +01:00
Mikalay Radchuk
714607307e Fixes AttributeError in HTMLFormRenderer.render
If `HTMLFormRenderer.render` will be called with default arguments,
`AttributeError: 'NoneType' object has no attribute 'get'` will be raised.
2016-01-26 21:26:30 +03:00
Xavier Ordoquy
72372efdb6 Merge pull request #3867 from jamesbeith/docs-example-fixes
Fix syntax errors in docs example
2016-01-24 18:16:02 +01:00
James Beith
34901a5ffa Fix syntax errors in docs example
- Add missing comma in kwargs
- Remove spaces around keyword / parameter equals
- Replace incorrect curly brace with parenthesis
2016-01-24 13:33:18 +00:00
Xavier Ordoquy
f2d6013134 Merge pull request #3866 from ekonstantinidis/more-drf-docs-info
Mention Live API Endpoints for DRF Docs
2016-01-24 00:14:49 +01:00
Emmanouil Konstantinidis
ee2861887e Mention DRF Docs - Live API Endpoints 2016-01-23 23:08:19 +00:00
Xavier Ordoquy
909a3e80a1 Merge pull request #3861 from linovia/feature/relation_get_queryset_override
Refactor the `get_queryset` overriding test
2016-01-21 18:10:32 +01:00
Xavier Ordoquy
5068ecf64b Rename the get_queryset overriding test. 2016-01-21 16:50:07 +01:00
Xavier Ordoquy
6d95da7b2d Improve the get_queryset overriding test readability. 2016-01-21 16:48:32 +01:00