| Age | Commit message (Collapse) | Author |
|
|
|
|
|
This is a security fix; disclosure to follow shortly.
|
|
This is a security fix; disclosure to follow shortly.
|
|
replacement for the contrib app. Backport from master.
|
|
Backport of b70c371fc1f18ea0c43b503122df3f311afc7105 from master.
|
|
Backport of 17559e6eb0 from master
|
|
Thanks to av@rdf.ru and flarno11@yahoo.de for the report.
Backport of 4fd94969d8 from master
|
|
Thanks bmispelon for the report.
Backport of 9b88dd3809 from master
|
|
Thanks Martyn Clement for the report and the initial patch.
Backport of 27c1a7257 from master.
|
|
down aliases
Thanks simonpercivall.
Backport of d9c580306c from master
|
|
than LocMemCache.
As override_settings was used after the initialization of the session backend,
we need to use a new session backend here.
Backport of 8c1cc4b3b0 from master
|
|
Backport of 3c736207a3 from master
|
|
Backport of d63327d843 from master.
|
|
aliases for defau
Thanks simonpercivall.
Backport of 2cbd579efe from master.
|
|
Thanks littlepig for the report.
Backport of f407f75aae from master.
|
|
Affected language: Mexican Spanish, Mongolian, Romanian, Turkish
Translations for 1.6 and master will be refetched from Transifex.
Thanks ruless at gmail.com for the report.
|
|
Thanks Baptiste Mispelon for the suggestion.
Backport of c5bc98d7e1 from master.
|
|
Thanks Riley Strong for the report.
Backport of 3fd0ee5b46 from master
|
|
In Django < 1.6, override_settings restores the settings module that was
active when the override_settings call was executed, not when it was
run. This can make a difference when override_settings is applied to a
class, since it's executed when the module is imported, not when the
test case is run.
In addition, if the settings module for tests is stored alongside the
tests themselves, importing the settings module can trigger an import
of the tests. Since the settings module isn't fully imported yet,
class-level override_settings statements may store a reference to an
incorrect settings module. Eventually this will result in a crash during
test teardown because the settings module restored by override_settings
won't the one that was active during test setup.
While Django should prevent this situation in the future by failing
loudly in such dubious import sequences, that change won't be backported
to 1.5 and 1.4. However, these versions received the "allowed hosts"
patch and they're prone to "AttributeError: 'Settings' object has no
attribute '_original_allowed_hosts'". To mitigate this regression, this
commits stuffs _original_allowed_hosts on a random module instead of the
settings module.
This problem shouldn't occur in Django 1.6, see #20290, but this patch
will be forward-ported for extra safety.
Also tweaked backup variable names for consistency.
|
|
Backport of 1514f17aa60772f48839130f9a5071b9ffe15213 from master
|
|
|
|
|
|
There were a couple of regressions related to field pickling. The
regressions were introduced by QuerySet._known_related_objects caching.
The regressions aren't present in master, the fix was likely in
f403653cf146384946e5c879ad2a351768ebc226.
Fixed #20157, fixed #20257. Also made QuerySets with model=None
picklable.
|
|
A regression caused by d5b93d3281fe93cbef5de84a52 made .get() error
reporting recurse infinitely on certain rare conditions. Fixed this by
not trying to print the given lookup kwargs.
Backpatch of 266c0bb23e9d64c47ace4d162e582febd5a1e336
|
|
signals.
Thanks brandon@ and Anssi for the report.
Backport of 2c62a509de from master
|
|
Made a few minor compatibility adjustments.
Backport of e81e319f from master.
|
|
Backport of 86b4ac66 from master.
|
|
`UnicodeDecodeError`
Handle the `UnicodeDecodeError` exception, send a warning to `stdout` with the
file name and location, and continue processing other files.
Backport of 99a6f0e77 from master.
|
|
Backport from master (a5becad9094e5c5403b692b9a7b3a6ffaabf64a3).
Signed-off-by: Jannis Leidel <jannis@leidel.info>
|
|
This is a partial backport of commit eb9430fc4be1. Without this,
geojson support is never detected with Spatialite.
Refs #20252 and #19028.
|
|
Backport of b04fd579d5 from master.
|
|
BoundField.label_tag
Also cleaned up label escaping and consolidated the test suite regarding
label_tag.
Backport of ab686022f from master.
|
|
Thanks Baptiste Mispelon for the review.
Backport of fe01404bb9 from master.
|
|
Backport of 216580e034.
|
|
based on the `SCRIPT_NAME` environment parameter or the `FORCE_SCRIPT_NAME` setting, regardless of whether or not those have a trailing slash. Thanks to bmispelon for the review.
Backport of 2f81a0ca6543f
|
|
Backport of ec04fd1344 from master
|
|
|
|
|
|
Polish, Telugu, Georgian, Azerbaijani, Norwegian Bokmål, Basque,
Dutch, Thai, Spanish (Argentina), Afrikaans.
|
|
Backport of 9e462f810194800af30ea19a6fb8ac5697d839b4 from master.
|
|
Also don't compete with -W CLI option.
Thanks to Aymeric Augustin for the catch, and Claude Paroz for the patch.
Backport of e79b857a07905340556f781a7d63016236b21c61 from master.
|
|
Backpatch of e17fa9e877e84e93b699c2bd13ea48dbbb86e451
|
|
custom User models.
Thanks to matiasb for the report of #20060 and the draft patch for #20048.
(cherry picked from commit 930af661abdb4eb7322f1ab06f21df9ed04af43d)
|
|
This was a regression due to unicode_literals usage. Thanks Ivan
Virabyan for the report and the initial patch.
Backport of 164528acc8 from master.
|
|
Python 2.6 has some different behaviour when checking
isinstance(foo, collections.Iterator).
Backport of 829dc3c5 from master.
|
|
raise an exception too"
This reverts commit d1e87eb3baf75b1b6a0ada46a9b77f7e347cdb60.
This commit was the cause of a memory leak. See ticket for more details.
Thanks Anssi Kääriäinen for identifying the source of the bug.
|
|
Some alternative implementations don't have them.
Closes #19944.
Backport of 9d4a5b00f1977d8cddf8e241fa4bb8a9e819f188 from master.
|
|
Backport of e11ccc76d325b6bbbf101f510a91299f507f0745.
|
|
This includes fixes for the java/jython detection and a new license header.
Thanks to Thomas Bartelmess for the report.
Backport of c5ce0e8a687ecf7fbc38fa85c5311a6320a246c6 from master.
|