Andrew Godwin
b6a957f0ba
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
docs/ref/django-admin.txt
2013-08-19 18:30:48 +01:00
Tim Graham
7b69c3e775
Removed versionadded/changed annotations for 1.5
2013-08-19 09:09:41 -04:00
Anssi Kääriäinen
3844089edc
Fixed #20777 -- Admin proxy model deletion regression
...
Added proxy_models tests by Harm Geerts <github@geertswei.nl>.
2013-08-19 09:51:41 +03:00
Anssi Kääriäinen
4668c142dc
Made Model.__eq__ consider proxy models equivalent
...
Fixed #11892 , fixed #16458 , fixed #14492 .
2013-08-19 09:51:28 +03:00
Carl Meyer
c2907a6e3d
Remove the last FIXME from the howto-release-Django doc.
2013-08-16 23:55:43 -06:00
Tim Graham
55339a7669
Fixed #20891 -- Removed part of the tutorial that requires pytz
...
Thanks AtomicSpark for the report.
2013-08-15 15:24:58 -04:00
James Bennett
bc5716fc9c
Added release date to 1.5 release notes.
...
Forwardport of 61283a8208
from 1.5.x
2013-08-15 07:41:18 -04:00
Tim Graham
29255fcb4f
Fixed some ReST errors regarding backticks
2013-08-15 07:14:10 -04:00
Alasdair Nicol
354009d67e
Updated docs following deprecation of django.views.defaults.shortcut
...
Follows 3f2befc
2013-08-15 00:27:16 +01:00
Tim Graham
b6178fa24b
Added some doc links for django.contrib.messages
2013-08-14 12:57:55 -04:00
Jonathan Slenders
ff410565bf
Fixed #20709 -- Allowed {% widthratio %} to accept an "as" parameter.
...
Thanks clay.evil@ for the suggestion.
2013-08-14 12:40:19 -04:00
SusanTan
71c491972e
Fixed #11400 -- Passed kwargs from AbstractUser.email_user() to send_mail()
...
Thanks Jug_ for suggestion, john_scott for the initial patch,
and Tim Graham for code review.
2013-08-14 07:46:11 -04:00
Matt Johnson
907ef9d0d1
Fixed #20555 -- Make subwidget id attribute available
...
In `BoundField.__iter__`, the widget's id attribute is now passed to
each subwidget. A new id_for_label property was added to ChoiceInput.
2013-08-13 13:23:05 -04:00
Tim Graham
db682dcc9e
Added 1.4.6/1.5.2 release notes.
2013-08-13 11:16:30 -05:00
Loic Bistuer
163a34ce4b
Fixed #20883 -- Made model inheritance find parent links in abstract parents
2013-08-13 15:14:11 +03:00
Tim Graham
3f6cc33cff
Added missing release notes for older versions of Django
2013-08-12 14:05:25 -04:00
Mel Collins
6bdb3b1135
Fixed #13518 -- Added FILE_UPLOAD_DIRECTORY_PERMISSIONS setting
...
This setting does for new directories what FILE_UPLOAD_PERMISSIONS
does for new files.
Thanks jacob@ for the suggestion.
2013-08-12 07:15:59 -04:00
Tim Graham
ab680725bf
Fixed #20890 -- Added missing import in class-based view docs.
...
Thanks André Augusto.
2013-08-10 18:08:05 -04:00
Julien Phalip
6e70f47d02
Merge pull request #1464 from evildmp/squashing_commits
...
Clarified misleading wording about squashing commits
2013-08-10 14:48:46 -07:00
Daniele Procida
e868eaf680
clarified misleading wording about squashing commits
2013-08-10 22:24:24 +01:00
Andrew Godwin
7970d97a70
Docs tweaks (thanks timgraham)
2013-08-10 20:00:12 +01:00
ersran9
00d23a13eb
Fixed #20828 -- Allowed @permission_required to take a list of permissions
...
Thanks Giggaflop for the suggestion.
2013-08-10 10:10:18 -04:00
Tim Graham
5737c57d95
Fixed #20868 -- Added an email to django-announce as a security step.
...
Thanks garrison for the report.
2013-08-09 16:02:05 -04:00
Andrew Godwin
588b523233
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/db/models/options.py
2013-08-09 14:37:37 +01:00
Andrew Godwin
1d1cfd0bd8
Document new field API in release notes
2013-08-09 14:31:24 +01:00
Tim Graham
ddae74b64c
Fixed #9057 -- Added default_permissions model meta option.
...
Thanks hvendelbo for the suggestion and koenb for the draft patch.
2013-08-09 09:19:52 -04:00
Andrew Godwin
de64c4d6e9
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/core/management/commands/flush.py
django/core/management/commands/syncdb.py
django/db/models/loading.py
docs/internals/deprecation.txt
docs/ref/django-admin.txt
docs/releases/1.7.txt
2013-08-09 14:17:30 +01:00
Loic Bistuer
f8a6a4eba1
Improved queryset handling and docs for (Single|Multiple)ObjectMixin.
2013-08-09 17:51:58 +07:00
Tim Graham
8442268869
Added an anchor for django.forms.Form.clean in docs
2013-08-08 14:13:52 -04:00
Tim Graham
58e4fe464c
Merge pull request #1457 from jaimeirurzun/master
...
Clarified meaning of models.User.is_authenticated()
2013-08-08 07:27:08 -07:00
Daniele Procida
7e6af9d40c
Added more on @cached_property, refs #20870
2013-08-08 09:45:26 -04:00
Marc Tamlyn
1c4a9bd9ad
Revert change to the default Form.clean()
...
This means it doesn't break for people who are doing
`cleaned_data = super(FooForm, self).clean()`.
2013-08-08 14:27:48 +01:00
Marc Tamlyn
fb1dd6b13a
Form.clean() does not need to return cleaned_data.
...
If it does, that will be used as the cleaned_data. The default
implementation has been changed to match this change.
2013-08-08 14:05:55 +01:00
Jaime Irurzun
f96fe3cd1e
Clarify meaning of models.User.is_authenticated()
2013-08-08 12:45:06 +01:00
Daniele Procida
7a2296eb5b
Fixed #20870 -- Documented django.utils.functional.cached_property
2013-08-08 05:36:17 -04:00
Preston Holmes
cf041b883c
Merge pull request #1453 from chrismedrela/ticket20484-improvement
...
Fixed #20484 again -- added note to field documentation
2013-08-07 14:10:24 -07:00
Christopher Medrela
fb26c4996a
Fixed #20484 again -- added note to field documentation
2013-08-07 20:57:56 +02:00
Leandro Regueiro
709cd2c4b7
Added section labels in cache docs
2013-08-06 11:56:01 -04:00
Tai Lee
1280675834
Fixed #15511 -- Allow optional fields on ``MultiValueField` subclasses.
...
The `MultiValueField` class gets a new ``require_all_fields`` argument that
defaults to ``True``. If set to ``False``, individual fields can be made
optional, and a new ``incomplete`` validation error will be raised if any
required fields have empty values.
The ``incomplete`` error message can be defined on a `MultiValueField`
subclass or on each individual field. Skip duplicate errors.
2013-08-06 08:50:47 -04:00
Dominic Rodger
c33d1ca1d9
Fixed #20852 - Fixed incorrectly generated left quotes in docs.
...
Sphinx generates left single quotes for apostrophes after
code markup, when right single quotes are required. The
easiest way to fix this is just by inserting the unicode
character for a right single quote.
Instances of the problem were found by looking for
">‘" in the generated HTML.
2013-08-06 07:13:17 -04:00
Justin Michalicek
6d88d47be6
Fixed #20832 -- Enabled HTML password reset email
...
Added optional html_email_template_name parameter to password_reset view
and PasswordResetForm.
2013-08-05 09:47:28 -04:00
Jimmy Song
94d7fed775
Fixed #20859 - Clarified Model.clean() example.
2013-08-05 09:06:09 -04:00
Tim Graham
26c4bd38ac
Fixed #20862 -- Updated startproject MIDDLEWARE_CLASSES in docs.
...
Thanks Keryn Knight.
2013-08-05 08:14:27 -04:00
Julien Phalip
0b071ba7df
Fixed a small formatting issue.
2013-08-04 17:29:55 -07:00
Julien Phalip
28d3b33c04
Added a note to the 1.6 release about the new `--keep-pot` option for `makemessages`.
...
Refs #17008 .
2013-08-04 17:18:10 -07:00
Tim Graham
1593a86494
Fixed #20860 -- Removed references to defunct chicagocrime.org
2013-08-04 14:46:06 -04:00
Daniele Procida
e8183a8193
Fixed #20842 and #20845 - Added a note on order_by() and improved prefetch_related() docs.
2013-08-04 12:34:28 -04:00
Loic Bistuer
ebb3e50243
Introduced ModelAdmin.get_fields() and refactored get_fieldsets() to use it.
...
Refs #18681 .
This also starts the deprecation of ModelAdmin.declared_fieldsets
2013-08-04 09:14:18 -04:00
Justin Michalicek
61ecb5f48a
Fixed #20855 -- Added documentation of current_app and extra_context params to django.contrib.auth views
...
refs #5298 and refs #8342
2013-08-04 08:04:12 -04:00
Curtis Maloney
07876cf02b
Deprecated SortedDict (replaced with collections.OrderedDict)
...
Thanks Loic Bistuer for the review.
2013-08-04 07:09:39 -04:00