1
0
mirror of https://github.com/django/django.git synced 2025-03-13 10:50:55 +00:00

15639 Commits

Author SHA1 Message Date
Tim Graham
df18cc632c [1.6.x] Fixed typo in previous commit; refs #21490.
Backport of 03bc0a8ac5 from master
2013-11-24 16:29:10 -05:00
Tim Graham
af65860c5b [1.6.x] Fixed #21490 -- Fixed custom admin URL reverse example.
Thanks glarrain for the report.

Backport of bfe7377adb from master
2013-11-24 15:19:34 -05:00
Claude Paroz
432de54611 [1.6.x] Fixed #21486 -- Prevented settings config in signal connection
This was particularly problematic in the chain get_wsgi_application
-> db.connections import -> signal connection -> settings configuration.
Thanks Jon Dufresne for the report.
Backport of 42fef294464 from master.
2013-11-23 18:49:06 +01:00
Ramiro Morales
8750296918 [1.6.x] Fixed #21488 -- Multiple locales treatment in i18n commands.
Removed multiple locales separated by commas variation (that wasn't
working as documented) in favor of simply allowing use of the
``--locale``/``-l`` options more than once for ``makemessages`` and
``compilemessages``.

Thanks Romain Beylerian for the report and Claude, Simon for their help.
2013-11-23 11:02:30 -03:00
Aymeric Augustin
ddd3926280 [1.6.x] Removed obsolete deprecation notes. 2013-11-23 14:57:30 +01:00
Loic Bistuer
a0ab432f2f [1.6.x] Improved docs for ModelFormSet.clean().
Backport of 033b26173b from master
2013-11-22 19:50:46 -05:00
mlissner
4212ae6fef [1.6.x] Noted that localmem is the default cache.
Backport of c456ea4ec8 from master
2013-11-22 19:39:54 -05:00
Bouke Haarsma
d55df0b810 [1.6.x] Fixed #21443 -- Cannot show debug info on PY3's importlib
Thanks productions@zaziork.co.uk for the review.
Backport of 18185724e6 from master.
2013-11-22 20:37:09 +01:00
Cody Scott
ea0d97c470 [1.6.x] Fixed sentence structure in docs/internals/contributing/triaging-tickets.txt
Backport of 4a54b69e88 from master
2013-11-22 11:02:50 -05:00
Aymeric Augustin
1eddca0a52 [1.6.x] Fixed #21487 -- Session cannot store tzinfo instances anymore.
Thanks filipp for the report.
2013-11-22 15:32:22 +01:00
Claude Paroz
9cbcd06b1a [1.6.x] Fixed #21405 -- Prevented queryset overwrite in BaseModelAdmin
Thanks guido@20tab.com for the report and Tim Graham for the
analyze.
Backport of 1718b5256c from master.
2013-11-21 22:24:00 +01:00
Anssi Kääriäinen
5730bf2819 [1.6.x] Fixed #21431 -- GenRel->FK list_filter regression in admin
Report, analysis and tests from stephenmcd.

Backpatch of 752d3d70da6291039f33781a0a2ef6f3b7c5fcb5 from master.
2013-11-21 15:34:04 +02:00
Markus Amalthea Magnuson
47abfa237e [1.6.x] Fixed #21427 -- Clearly state integer field value ranges in docs
Added an explicit mention of the exact value ranges for integer type
fields that are safe in all databases supported by Django. Also, put
all value numbers inside double ticks.

Backport of b6a6cf4ab791b092e18ab16537aa88dd7ae9bc36 from master.
2013-11-21 14:17:58 +01:00
Claude Paroz
d8fdee7db8 [1.6.x] Fixed #21472 -- Fixed inline formsets display when parent pk is 0
Thanks agale031176@gmail.com for the report.
Backport of fafb6cf049b from master.
2013-11-20 21:37:35 +01:00
Dražen Lučanin
6f48ae0b0f [1.6.x] Recommended setuptools in the reuseable app tutorial.
setuptools has merged with distribute.

Backport of b5eef8535a from master.
2013-11-19 16:21:06 -05:00
Baptiste Mispelon
20e322f4bf [1.6.x] Added more examples to the get_object_or_404 documentation.
Backport of ebfa508fa32b27de6f3e2ca04c81b46408b0506e from master.
2013-11-19 19:56:06 +01:00
Rocky Meza
ac2ef4af7c [1.6.x] Fixed the base class note in the Date Views docs.
Backport of 42197e31aa from master
2013-11-19 10:25:48 -05:00
Tim Graham
44469af34b [1.6.x] Fixed typo in topics/http/sessions.txt.
Backport of 9348fc5628 from master
2013-11-18 19:11:33 -05:00
Claude Paroz
833f7d11e8 [1.6.x] Fixed #21457 -- Allowed fixture file name to contain dots
Thanks Keryn Knight for the report.
Backport of 97ac22ebfc from master.
2013-11-18 20:34:39 +01:00
Claude Paroz
62bb4fc806 [1.6.x] Added non-breaking spaces for humanize in Russian 2013-11-18 20:08:01 +01:00
Baptiste Mispelon
4c9362d81f [1.6.x] Added more internal links in the management command documentation.
Backport of bc0413cbc6fd472371e907f17303c5ddcc9b4642 from master.
2013-11-18 19:28:29 +01:00
Claude Paroz
9f59149cfe [1.6.x] Added release note for TypedChoiceField coerce limitation
Thanks Elec for the report and Simon Charette for the review.
Refs #21397.
Backport of 4a00f132e0 from master.
2013-11-18 18:09:54 +01:00
Dominic Rodger
a9c50fccf2 [1.6.x] 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.

Backport of c33d1ca1d98003de29cdecb6080b52c5c52139bd from master.
2013-11-18 16:03:00 +01:00
Tim Graham
2b03d53438 [1.6.x] Fixed #21240 -- Added 1.5 release note for OneToOneField/select_related change.
Thanks marcin at sokrates.pl.

Backport of ba63b9895b from master
2013-11-18 09:33:53 -05:00
Tim Graham
a776e3f420 [1.6.x] Fixed #21404 -- Added session.set_expiry() note to 1.6 release notes.
Thanks pwr for the suggestion.

Backport of ffdae5b66d from master
2013-11-18 08:00:16 -05:00
Claude Paroz
e85baa813f Updated humanize translations and added release note.
Refs #21415.
2013-11-17 21:20:44 +01:00
Anssi Kääriäinen
cbf8784d20 [1.6.x] Fixed a regression caused by fix for #21428
On Python 3 sorting Fields mixed with GenericForeignKeys doesn't work
as GenericForeignKey isn't a subclass of django.db.models.fields.Field.

Refs #21428.

Backport of 326539f6a4 from master
2013-11-16 20:55:37 +02:00
Anssi Kääriäinen
1fd762c106 [1.6.x] Fixed #21428 -- editable GenericRelation regression
The GenericRelation refactoring removed GenericRelations from
model._meta.many_to_many. This had the side effect of disallowing
editable GenericRelations in ModelForms. Editable GenericRelations
aren't officially supported, but if we don't fix this we don't offer any
upgrade path for those who used the ability to set editable=True
in GenericRelation subclass.

Thanks to Trac alias joshcartme for the report and stephencmd and Loic
for working on this issue.

Backpatch of 0e079e4331a8be4dbd18d5e5776116330b0a5e61 from master.
2013-11-16 20:15:46 +02:00
Tim Graham
e8dea1f35c [1.6.x] Fixed #21440 -- Typo #2 in topics/http/shortcuts.txt
Thanks alasdair.

Backport of d011714002 from master
2013-11-15 10:22:51 -05:00
Claude Paroz
882ee16f68 [1.6.x] Updated humanize translation catalog
Refs #21415
2013-11-15 15:49:07 +01:00
glts
1e2bbc3b71 [1.6.x] Fixed #21415 -- Replaced escape sequence by literal non-breaking space
Unfortunately, escape sequences (\x.. or \u....) do not fit well
with the gettext toolchain. Falling back to using literal char,
even if visibility is not ideal.

Backport of 7e0ebd74c from master.
2013-11-15 15:35:44 +01:00
Tim Graham
f2b5e9d5bb [1.6.x] Fixed #21440 -- Typo in topics/http/shortcuts.txt
Thanks olof.bjarnason at gmail.com for the report.

Backport of 6e9e6ca071 from master
2013-11-15 07:10:47 -05:00
Baptiste Mispelon
2a0039ba62 Fixed Python2.6 incompatibility caused by 67c30426c1370f5d6c39bd73888c3902c1c5f365. 2013-11-15 00:24:11 +01:00
Baptiste Mispelon
bdde6f6a03 [1.6.x] Added backported fixes to 1.6.1 release notes.
Backport of 8e6d1b97921dd3ead6afd5eb39fcd2c82244e106 from master.
2013-11-14 23:14:37 +01:00
Baptiste Mispelon
2cfff0cb72 Fixed wrong override_settings path introduced by 67c30426c1370f5d6c39bd73888c3902c1c5f365. 2013-11-14 23:09:20 +01:00
Loic Bistuer
67c30426c1 [1.6.x] Fixed #21432 -- DateTimeQuery now copies tzinfo when cloning.
Thanks Enrique Martínez for the report and @bmispelon for the tests.

Backport of 17ed99f3a3eea4bd27fa34be59c3582616ed8079 from master.
2013-11-14 21:39:24 +01:00
Matt Robenolt
0aa06bd378 [1.6.x] Propagate get_user_model exception from get_user
Fixes #21439

Backport of 3560ef04 from master.

Conflicts:
	django/contrib/auth/tests/test_auth_backends.py
2013-11-14 21:21:02 +01:00
Anssi Kääriäinen
c37b2e46b9 [1.6.x] Release notes for ORM changes in 1.6
Backport of 4301d6fa36 from master
2013-11-14 18:04:55 +02:00
Tim Graham
5b8c8c462d [1.6.x] Added release note for #21410; thanks Loic.
Backport of 94d567ba30 from master
2013-11-13 12:25:31 -05:00
Loic Bistuer
b107421acf [1.6.x] Fixed #21410 -- prefetch_related() for ForeignKeys with related_name='+'
Regression introduced by commit 9777442.

Thanks to trac username troygrosfield for the report and test case.

Backpatch of cb83448891f2920c926f61826d8eae4051a3d8f2 from master.

Conflicts:

	tests/prefetch_related/models.py
2013-11-13 07:41:30 +02:00
Baptiste Mispelon
b6acc4f749 [1.6.x] Removed a mention of Form._errors from the documentation.
Also removed a sentence that was incorrect: raising a
`ValidationError` inside `Form.clean` doesn't clear the
`cleaned_data` attribute.

Thanks to loic84 and timograham for the review.

Backport of 9aa6d4bdb6618ba4f17acc7b7c0d1462d6cbc718 and
0048ed77c7016a03aed6dbc255a6372f3df2ccd5 from master.
2013-11-12 20:54:37 +01:00
Bernardo Pires
4aed1ee339 [1.6.x] Fixed #21372 -- Corrected docs regarding translating LANGUAGES.
Corrected LANGUAGES documentation on how to translate language
names. Now using django.utils.translation.ugettext_lazy instead
of a dummy gettext() function.

Thanks to Salvatore for the report.

Backport of 8bc350b38516d8c3a14aed113dd3402b9375b75c from master.
2013-11-10 00:02:13 +01:00
Tim Graham
4b9e932fd4 [1.6.x] Fixed #21398 -- Fixed BCryptSHA256PasswordHasher with py-bcrypt and Python 3.
Thanks arjan at anymore.nl for the report.

Backport of d15985d81f from master
2013-11-09 10:21:19 -05:00
Tim Graham
c9076a408c [1.6.x] Fixed spelling of compatibility. 2013-11-09 10:18:55 -05:00
Baptiste Mispelon
86e72f5ba9 [1.6.x] Fixed versionadded misuse in the admin documentation.
Backport of c82e850eed2eb3957ed792908b73622ebd3034a7 from master.
2013-11-09 15:10:14 +01:00
Cody Scott
82e756da83 [1.6.x] Noted that .clear() will delete intermediary models
Backport of a8e84521c4 from master
2013-11-08 19:25:21 -05:00
Tom Scholl
c9917f4c83 [1.6.x] Fixed docs for EmailMessage extra_headers attribute
The EmailMessage documentation describes the initialization parameters
and states they 'can be set at any time prior to calling the send()
method.'. However, the 'headers' parameter's corresponding attribute is
called 'extra_headers'.

Backport of cab72a439b from master
2013-11-08 18:39:53 -05:00
glts
d4b1724b36 [1.6.x] Added missing parameter in npgettext_lazy docs
Backport of 413307fe35 from master
2013-11-08 18:35:43 -05:00
Claude Paroz
3c8879f092 [1.6.x] Removed obsolete locale restriction admonition
Refs #14461. Thanks Ramiro Morales for pointing this.
Backport of b780d03d62 from master.
2013-11-08 16:53:12 +01:00
Baptiste Mispelon
6c34e18bd4 [1.6.x] Fixed #21396: Document backwards-incompatible change in RedirectView.get_redirect_url.
Thanks to Tim for the review.

Backport of f2e0266be766b0b6149377b90ae3ddc41c91c3fb from master.
2013-11-08 10:55:11 +01:00