| Age | Commit message (Collapse) | Author |
|
Backport of 2112b7d78 from master.
|
|
Backport of a184a99123e4dc4c2a90c20e1604e5d301cd76bf from master
|
|
This change:
* Makes the InclusionNode cache-safe by removing render-time side effects
to its nodelist.
* Ensures the render_context stack is properly scoped and reset by updating
the render call to use Template.render rather than Nodelist.render.
Backport of 0808ccce3808235c5b5a56e3f689cec0d4bc0ebf from master
|
|
Rendering a Jinja template with self in the context threw an error.
While self is a reserved variable in Jinja, including self in the
context is not an error, so Django should respect that.
Backport of 4ea1909d3c420ba1fbdbf7221cad518d43aef885 from master
|
|
SimpleCookie.__repr__() changed in
https://hg.python.org/cpython/rev/88e1151e8e02
Backport of 4e59156c10d36eeb1e6fced4dff0f11157f68264 from master
|
|
Backport of ba1665ed75264e57b7bc6cd7606e072ad3050a3b from master
|
|
non-Django templates.
Backport of 1f2abf784a9fe550959de242d91963b2ad6f7e9c from master
|
|
Backport of 74f8110e74927c231bfcd106fa28bf6e6dd034e6 from master
|
|
patterns.
When reversing, only outer parameters are used if captured parameters are
nested. Added tests to check the edge cases and documentation for the
behavior with an example to avoid it.
Backport of 23a5d64f40b0f4a3fbfef7427ca793cb1df1034e from master
|
|
|
|
|
|
Backport of 127b3873d03704f77428b984de022664b268314e from master
|
|
Backport of 9e83f30cd31 from master.
|
|
This is a security fix; disclosure to follow shortly.
|
|
This is a security fix; disclosure to follow shortly.
|
|
be bypassed.
Backport of 81e1a35c364e5353d2bf99368ad30a4184fbb653 from master
|
|
Backport of b4a56ed4f55502239cb11b57f0fa75baa0a97640 from master
|
|
non-Django templates.
Backport of 6bff3439894ac22d80f270f36513fc86586273f3 from master
|
|
Backport of 88d798d71a20662bdf5335f0586fb9eb6e660c57 from master
|
|
Backport of ff2aa4019259947734c4791d6afc9f5405d901d0 from master
|
|
merging.
Also added display of migration to stdout when verbosity=3.
Backport of 8758a63ddbbf7a2626bd84d50cfe83b477e8de0a from master
|
|
Fixed create_default_site() to use a default value in case
settings.SITE_ID isn't set; refs #23945.
Backport of 818182b514d1c6b379130c440689355b4d231d49 from master
|
|
when migrating a subclass's name change
Forwardport of test and release note from stable/1.7.x
Backport of ae87ad005f7b62f5fa5a29ef07443fa1bbb9baf0 from master
|
|
Now that the URL is always unescaped as of refs #22267,
we should re-escape it before inserting it into the anchor.
Backport of 7b1a67cce52e5c191fbfa1bca501c6f0222db019 from master
|
|
ModelAdmin.readonly_fields
This issue was fixed by refs #24464.
|
|
their input by default.
This may cause some backwards compatibility issues, but may also
resolve security issues in third party projects that fail to heed warnings
in our documentation.
Thanks Markus Holtermann for help with tests and docs.
Backport of fa350e2f303572ee8f9a8302dda45a12288d3d95 from master
|
|
expressions
The query used a construct of qs.annotate().values().aggregate() where
the first annotate used an F-object reference and the values() and
aggregate() calls referenced that F-object.
Also made sure the inner query's select clause is as simple as possible,
and made sure .values().distinct().aggreate() works correctly.
Backport of fb146193c49e4c683dc8da39d9b7c479375fdb57 from master
|
|
Backport of 90b069c33f3f8785a7d068a2032f130d2dbb0c75 from master
|
|
When altering from e.g. an IntegerField to a ForeignKey, Django didn't
add a constraint.
Backport of f4f0060feaee6bbd76a0d575487682bc541111e4 from master
|
|
Refs #22267.
Thanks Shai Berger for spotting the issue and Tim Graham for the
initial patch.
Backport of ec808e807 from master.
|
|
Backport of ceaf31adfff3801f1092a215f73704e15a70e90c from master
|
|
show_full_result_count=False.
Backport of 36a17be9f3cf6081f7e6f83fcfeae3d09ce8a72b from master
|
|
migrations when changing blank
Thanks Mark Tranchant for the report and Tim Graham for the test and
review.
Backport of a9e29fae105d1ddd4e0ac2059cbe62b0ee348bc8 from master
|
|
Thanks Tomasz Kontusz for the report, Baptiste Mispelon for
analysis and Tim Graham for the review.
Backport of 3cf1c02695 from master.
|
|
Thanks Johannes Lerch for the report, Tim Graham for the test case,
and Simon Charette for the review.
Backport of 5cf96b49e4 from master.
|
|
Backport of 65441bbdb02427655869c42791a0bc5a9c631292 from master
|
|
instance.
Backport of 4c2f546b55c029334d22e69bb29db97f9356faa3 from master
|
|
Backport of 8e129b42ad9c9adca599228ae2ad68271fa46d44 from master
|
|
Backport of 32c108a221c54a4f680afe32175d70b5d2e92593 from master
|
|
Backport of 25a0b5cdcd5e70a6563116639a477b915ee5784e from master
|
|
Backport of 3d8fee605184d8ffa47a32546298b52b52d7a087 from master
|
|
Backport of f6d087b628a61a7b036cc468328497082031dc8e from master
|
|
Backport of 250a3d199310a954a95fb1ffa4915f0e51ba1767 from master
|
|
Backport of ff67ce5076c1f4d3dc32fd755a1b65d3310c6cb1 from master
|
|
Backport of 06ffc764a9b2d2521e6a574d279b66ad411cc65c from master
|
|
Backport of 441a47e1efd46001ca454b80e0d5f8c5ea4e235b from master
|
|
Backport of 1827aa902481cd80d2fb154e7b073f139936d5fc from master
|
|
Backport of 2be6b526568aaaae5353a4a600a085d3c2135363 from master
|
|
Specifically stopped using the dir argument.
Backport of a8fe12417f778a76837f8e4f8503779f52a396ba from master
|
|
Dropped the DJANGO_TEST_TEMP_DIR environment variable.
Before this change, proper removal depended on the developer passing
dir=os.environ['DJANGO_TEST_TMP_DIR'] to tempfile functions.
Backport of 934400759de817471ff37d736686201d7ae34e82 from master
|