| Age | Commit message (Collapse) | Author |
|
|
|
Fixes a regression introduced in 53c2cf1e.
Backport of 3f4e77840 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
|
|
|
|
|
|
Thanks Claude Paroz and Tim Graham for the review
Backport of 3e7d9d05ac5efff4e4732c3453c7a8ef502d0ed0 from master
|
|
they are first needed
Calling Migration.mutate_state() now also allows to do in_place
mutations in case an intermediate state is thrown away later.
Thanks Anssi Kääriäinen for the idea, Ryan Hall for parts of the patch,
and Claude Paroz and Tim Graham for the review
Backport of 57dc8dd3fa3c3adf133c522ecadb501d94bacd52 from master
|
|
Backport of 29b4a3f513f412fb4a987b777b61b596c09d217e from master
|
|
non-Django templates.
Backport of 1f2abf784a9fe550959de242d91963b2ad6f7e9c from master
|
|
|
|
|
|
Backport of 127b3873d03704f77428b984de022664b268314e from master
|
|
gettext version.
Backport of 53c2cf1e7b3f1c9a7794fcc5c4669145f351b2fa from master
|
|
Backport of 9e83f30cd31 from master.
|
|
Backport of 8d90489fe0049049f1f13c737ac51a24abf1efc3 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
|
|
non-Django templates.
Backport of 6bff3439894ac22d80f270f36513fc86586273f3 from master
|
|
Strings are frozen in anticipation of the Django 1.8 release.
|
|
The only one translatable string will be handled in the core catalog.
|
|
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
|
|
Backport of 21ffbb06ec9eb741f62ac51abab4b722fb91b9bc from master
|
|
Backport of d8de9a64d7 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
|
|
|
|
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
|
|
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
|
|
This speeds up the timesince function/filter substantially.
Backport of d6969ab from master.
|
|
show_full_result_count=False.
Backport of 36a17be9f3cf6081f7e6f83fcfeae3d09ce8a72b from master
|
|
Backport of fe42bfaaff93e6b4af34ab48892e20c9cdee0c1a 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
|
|
Since a4b8a4b632dbb6d9fed1a8654aed99a9c53560d4 the admin
URL returned by get_admin_url() is no longer relative to
the Django admin index page.
Backport of 85757d0e79f4237d7cf3ee1785946315aa6959eb 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 47b35b1844b2adc167e64674824873991e9c4c2b from master
|
|
Backport of 65441bbdb02427655869c42791a0bc5a9c631292 from master
|
|
instance.
Backport of 4c2f546b55c029334d22e69bb29db97f9356faa3 from master
|
|
have defaults.
Backport of 1306cd1e8acfb13602ee8dc40993b2505cd7523b from master
|
|
Backport of dda2a3cf4cc29d01de180f66d19441f300732e52 from master
|
|
These cached properies were causing problems with pickling, and in
addition they were confusingly defined: field.rel.model._meta was
not the same as field.rel.opts.
Instead users should use field.rel.related_model._meta inplace of
field.rel.opts, and field.rel.to._meta in place of field.rel.to_opts.
Backport of f95122e541df5bebb9b5ebb6226b0013e5edc893 from master
|