1
0
mirror of https://github.com/django/django.git synced 2025-01-26 18:19:18 +00:00

12112 Commits

Author SHA1 Message Date
Tim Graham
da8b3aa7eb [1.8.x] Fixed #24480 -- Marked strings in contrib.gis templates for translation.
Backport of 21ffbb06ec9eb741f62ac51abab4b722fb91b9bc from master
2015-03-14 15:20:53 -04:00
Sævar Öfjörð Magnússon
8fe451d183 [1.8.x] Fixed #24478 -- Added NUMBER_GROUPING value for Icelandic
Backport of d8de9a64d7 from master.
2015-03-13 16:57:37 +01:00
Tim Graham
aba74d6f1e [1.8.x] Fixed escaping regression in urlize filter.
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
2015-03-10 19:12:20 -04:00
Tim Graham
449d1effb8 [1.8.x] Bumped version to 1.8 beta 2. 2015-03-09 10:22:51 -04:00
Erik Romijn
d16e4e1d6f [1.8.x] Fixed #24464 -- Made built-in HTML template filter functions escape 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
2015-03-09 09:31:07 -04:00
Anssi Kääriäinen
3a0fe942dd [1.8.x] Fixed #24171 -- Fixed failure with complex aggregate query and 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
2015-03-09 07:51:05 -04:00
Jean-Louis Fuchs
1ae2df6bfc [1.8.x] Fixed #24447 -- Made migrations add FK constraints for existing columns
When altering from e.g. an IntegerField to a ForeignKey, Django didn't
add a constraint.

Backport of f4f0060feaee6bbd76a0d575487682bc541111e4 from master
2015-03-07 14:15:27 +01:00
Claude Paroz
ac07890f95 [1.8.x] Fixed urlize regression with entities in query strings
Refs #22267.
Thanks Shai Berger for spotting the issue and Tim Graham for the
initial patch.
Backport of ec808e807 from master.
2015-03-06 22:22:51 +01:00
Josh Smeaton
823f8cdbc9 [1.8.x] Fixed #24420 -- Allowed ordering by case expressions
Backport of ceaf31adfff3801f1092a215f73704e15a70e90c from master
2015-03-06 13:31:43 +11:00
Benjamin Wohlwend
3bc35f7e08 [1.8.x] Moved definition of chunks out of timesince function.
This speeds up the timesince function/filter substantially.

Backport of d6969ab from master.
2015-03-04 22:31:27 +01:00
Tim Graham
20bf320502 [1.8.x] Fixed #24426 -- Displayed admin actions panel when show_full_result_count=False.
Backport of 36a17be9f3cf6081f7e6f83fcfeae3d09ce8a72b from master
2015-03-04 13:56:51 -05:00
Tim Graham
4fa61e0e4f [1.8.x] Used format_html() in contrib.admin.utils for consistency.
Backport of fe42bfaaff93e6b4af34ab48892e20c9cdee0c1a from master
2015-03-04 10:44:44 -05:00
Markus Holtermann
bff446c205 [1.8.x] Fixed #24435 -- Prevented m2m field removal and addition in migrations when changing blank
Thanks Mark Tranchant for the report and Tim Graham for the test and
review.

Backport of a9e29fae105d1ddd4e0ac2059cbe62b0ee348bc8 from master
2015-03-04 15:44:38 +01:00
Mathias André
44dd65fb2c [1.8.x] Removed outdated docstring for get_admin_url().
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
2015-03-03 07:47:32 -05:00
Claude Paroz
c0df8d1be9 [1.8.x] Fixed #24413 -- Prevented translation fallback for English
Thanks Tomasz Kontusz for the report, Baptiste Mispelon for
analysis and Tim Graham for the review.
Backport of 3cf1c02695 from master.
2015-02-28 10:09:01 +01:00
Claude Paroz
b825ec38c1 [1.8.x] Fixed #24418 -- Prevented crash in refresh_from_db with null fk
Thanks Johannes Lerch for the report, Tim Graham for the test case,
and Simon Charette for the review.
Backport of 5cf96b49e4 from master.
2015-02-27 20:25:12 +01:00
Tim Graham
3fff408a27 [1.8.x] Bumped version to 1.8 beta 1. 2015-02-25 08:26:23 -05:00
Tim Graham
dfcdf64d47 [1.8.x] Fixed #24411 -- Avoided dict key/method clash in admin delete views.
Backport of 47b35b1844b2adc167e64674824873991e9c4c2b from master
2015-02-25 08:07:25 -05:00
Michael Angeletti
278b698794 [1.8.x] Fixed #24391 -- Made BoundField.value() cache callable values.
Backport of 65441bbdb02427655869c42791a0bc5a9c631292 from master
2015-02-24 20:05:16 -05:00
Stanislas Guerra
a3fca05b05 [1.8.x] Fixed #24395 -- Ensured inline ModelsForms have an updated related instance.
Backport of 4c2f546b55c029334d22e69bb29db97f9356faa3 from master
2015-02-24 11:49:27 -05:00
Tim Graham
41d5ed480c [1.8.x] Fixed #24377 -- Fixed model inline formsets with primary key's that have defaults.
Backport of 1306cd1e8acfb13602ee8dc40993b2505cd7523b from master
2015-02-23 09:01:00 -05:00
Emin Mastizada
ff2e0896a3 [1.8.x] Added formats for the Azerbaijani locale.
Backport of dda2a3cf4cc29d01de180f66d19441f300732e52 from master
2015-02-23 07:37:42 -05:00
Anssi Kääriäinen
155a127afb [1.8.x] Fixed #24381 -- removed ForeignObjectRel opts and to_opts
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
2015-02-23 07:26:10 -05:00
Marten Kenbeek
980dfca717 [1.8.x] Fixed #24366 -- Optimized traversal of large migration dependency graphs.
Switched from an adjancency list and uncached, iterative depth-first
search to a Node-based design with direct parent/child links and a
cached, recursive depth-first search. With this change, calculating
a migration plan for a large graph takes several seconds instead of
several hours.

Marked test `migrations.test_graph.GraphTests.test_dfs` as an expected
failure due to reaching the maximum recursion depth.

Backport of 78d43a5e1064b63db1c486516c4263ef1c4c975c from master
2015-02-23 12:55:43 +01:00
Michael Manfre
ed941ef2d0 Fixed signature of BaseDatabaseOperations.date_interval_sql()
Backport of 7fa7dd48c4 from master
2015-02-23 00:04:57 -05:00
Aymeric Augustin
19c2fe04a8 [1.8.x] Fixed a few uses of Template that relied on a default engine.
Refs #24389.

Backport of 556a748 from master
2015-02-22 23:22:19 +01:00
Aymeric Augustin
c564033408 [1.8.x] Fixed #24389 -- Isolated the CSRF view from the TEMPLATES setting.
Thanks uranusjr for the report and analysis.

Backport of 88a5f17 from master
2015-02-22 15:47:11 +01:00
Michael Angeletti
1feeefe918 [1.8.x] Fixed #24376 -- added verbose_name arg to UUIDField
Backport of ea3168dc6ced391d848c511a14cfcecfeac9d401 from master
2015-02-21 14:26:47 -05:00
Don Kirkby
5131aec7d2 [1.8.x] Fixed typo in django/db/models/fields/files.py comment.
Backport of 99a1bbf9853e0b06385d7f221a90828e6c060132 from master
2015-02-20 20:11:58 -05:00
foresmac
3207fcd0a0 [1.8.x] Fixed #24341 -- Added specific error messages to RangeField subclasses
Backport of 1d1d5d1c315e0e58f02a7f2a07b56ed20b09c087 from master
2015-02-20 16:50:41 -05:00
Aymeric Augustin
e4e140c49b [1.8.x] Removed a non-obvious side-effect of assigning Context.template.
Explicit is better than implicit.

Backport of 51b606f from master
2015-02-20 22:28:24 +01:00
Anssi Kääriäinen
6f03a4ca91 [1.8.x] Fixed #24328 -- cleaned up Options._get_fields() implementation
Backport of bad5f262bf4a17f157808ec1aa225ba9c94c1eee from master
2015-02-20 13:11:59 -05:00
Loic Bistuer
3a6c37fce4 [1.8.x] Fixed #24351, #24346 -- Changed the signature of allow_migrate().
The new signature enables better support for routing RunPython and
RunSQL operations, especially w.r.t. reusable and third-party apps.

This commit also takes advantage of the deprecation cycle for the old
signature to remove the backward incompatibility introduced in #22583;
RunPython and RunSQL won't call allow_migrate() when when the router
has the old signature.

Thanks Aymeric Augustin and Tim Graham for helping shape up the patch.

Refs 22583.

Conflicts:
	django/db/utils.py

Backport of bed504d70bede3431a213203c13a33905d6dbf77 from master
2015-02-20 21:55:50 +07:00
Marc Tamlyn
b6ef67d752 [1.8.x] Fixed #24373 -- Added run_validators to ArrayField.
Thanks to DavidMuller for the report.

Backport of c490e410af from master
2015-02-20 11:53:17 +00:00
Marc Tamlyn
3886338c1d [1.8.x] Update converters to take a consistent set of parameters.
As suggested by Anssi. This has the slightly strange side effect of
passing the expression to Expression.convert_value has the expression
passed back to it, but it allows more complex patterns of expressions.

Backport of 32d4db66b9 from master
2015-02-20 11:47:48 +00:00
Marc Tamlyn
c54d73ae01 [1.8.x] Fixed #24343 -- Ensure db converters are used for foreign keys.
Joint effort between myself, Josh, Anssi and Shai.

Conflicts:
	django/db/models/query.py
	tests/model_fields/models.py

Backport of 4755f8fc25331c739a6f932cc8aba0cc9e62e352 from master.
2015-02-20 11:46:57 +00:00
Alex Vidal
82f39bfb1a [1.8.x] Fixed typo in django.core.servers.basehttp message.
Backport of e467919c6315be87abec72383ec1a81e2665ebec from master
2015-02-19 19:37:22 -05:00
Aymeric Augustin
cc4effba0b [1.8.x] Set context.template instead of context.engine while rendering.
This opens more possibilities, like accessing context.template.origin.

It also follows the chain of objects instead of following a shortcut.

Backport of 1bfcc95 from master
2015-02-19 22:10:56 +01:00
Claude Paroz
84e7fec88d [1.8.x] Fixed #20889 -- Prevented BadHeaderError when Python inserts newline
Workaround for http://bugs.python.org/issue20747.
In some corner cases, Python 2 inserts a newline in a header value
despite `maxlinelen` passed in Header constructor.
Thanks Tim Graham for the review.
Backport of efb1f99f94 from master.
2015-02-19 20:19:38 +01:00
Shai Berger
66d37e593c [1.8.x] Fixed #24307: Avoided redundant column nullability modifications on Oracle
Thanks Joris Benschop for the report, and Tim Graham for the tests.

Backport of ceadc94f09 from master
2015-02-19 02:44:08 +02:00
Marten Kenbeek
84c9b24c5a [1.8.x] Fixed #24291 - Fixed migration ModelState generation with unused swappable models
Swapped out models don't have a _default_manager unless they have
explicitly defined managers. ModelState.from_model() now accounts for
this case and uses an empty list for managers if no explicit managers
are defined and a model is swapped out.

Backport of 15dc8d1c9d3697170a2c59ecaa7a2b4ba58f5990 from master
2015-02-18 19:11:51 +01:00
Adam Chainz
4abadc4872 [1.8.x] Removed unused foreign_key_re variables in MySQL/Oracle DB backends
Backport of e9282747a4ba99adc7e0f677b3a897830df51732 from master
2015-02-18 10:24:40 -05:00
Tim Graham
1153bccc1b [1.8.x] Refs #24324 -- Fixed crash in {% debug %} tag on Python 2.
If Django is installed in a path that contains non-ASCII characters,
the tag failed with UnicodeDecodeError.

Backport of 098fa12dd390e733c7568d824eea2c346550c75a from master
2015-02-18 07:35:56 -05:00
Tim Graham
09da1b465e [1.8.x] Refs #24324 -- Fixed UnicodeDecodeError in MigrationWriter on Python 2.
Backport of fa66ea75326e669cd3d51fb926a4364b8ba08959 from master
2015-02-17 18:50:15 -05:00
Tim Graham
f9a99c410e [1.8.x] Refs #24324 -- Fixed UnicodeDecodeError in template_backends tests
The message for the SuspiciousFileOperation exception needs to
be a unicode string.

Backport of bebc1e53a3ab059849e5c4e5a55b2f5e68b67169 from master
2015-02-17 18:45:07 -05:00
Tim Graham
a1fa0135ec [1.8.x] Refs #24324 -- Fixed get_app_template_dirs() UnicodeDecodeError on Python 2.
The function implemented most of upath(), but skipped the check for
strings that are already unicode.

Backport of bad6280c4e3f75f3ccd27f8fd85a4043bb296128 from master
2015-02-17 08:24:36 -05:00
Tim Graham
ba3a7636f1 [1.8.x] Refs #24324 -- Fixed UnicodeDecodeError in makemigrations.
If the project path contained a non-ASCII character, Python 2 crashed.

Backport of c9ece2e6b9365fa4be16bd0de25dd7b68c8dc97e from master
2015-02-17 08:14:01 -05:00
Tim Graham
4f43e5c435 [1.8.x] Refs #24324 -- Fixed UnicodeEncodeError in SQLite backend while testing.
If 'name' contained non-ASCII characters, the comparison raised a
UnicodeEncodeError on Python 2.

Backport of 63c5c9870129f6b81358c1ed7ed2392bbc46f77d from master
2015-02-17 08:11:38 -05:00
Tim Graham
9dba901d9c [1.8.x] Refs #24324 -- Fixed makemessages crash when Django is installed in a non-ASCII path.
Backport of 81a94cc616ab80decaa495cfa1c0c623527fc0e7 from master
2015-02-17 08:08:28 -05:00
Tim Graham
bcb3bfa5a2 [1.8.x] Refs #24324 -- Fixed management command discovery on non-ASCII paths.
Backport of 4a0aeac1b5cfb7b6229a01119a596afb38d8a2a0 from master
2015-02-17 07:29:30 -05:00