1
0
mirror of https://github.com/django/django.git synced 2025-01-15 21:02:52 +00:00

19961 Commits

Author SHA1 Message Date
Kenneth Kam
a752a2c951 [1.8.x] Fixed #23762 -- clarified CACHE_MIDDLEWARE_ANONYMOUS_ONLY deprecation in docs
Backport of e83aba0e2cce16cd1b32d1c172239a4e20867e95 from master
2015-02-23 09:23:49 -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
Ian Lee
04c262aea9 [1.8.x] Broke long lines in code examples.
The website only renders code blocks at 96 chars, and therefore
long code lines get wrapped. Manually breaking the lines prevents
the wrapping from occurring.

Backport of 00fbd8fd527fd6ee0319361bf194cd51a1ac1bfb from master
2015-02-23 07:46: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
Tim Graham
ddc1e0c0fb [1.8.x] Updated tutorial to use explicit relative imports.
Backport of b2f331dc68ec3c5a34285f7af9614e4178e9a371 from master
2015-02-22 14:20:25 -05:00
Tim Graham
576c1096d2 [1.8.x] Corrected sqlmigrate output in tutorial 1.
Backport of ff5e47e7a4a638a30424331222e0abdb60842ddd from master
2015-02-22 12:29:39 -05:00
Tim Graham
fbddd946ad [1.8.x] Fixed #24371 -- Cautioned against trying to switch databases.
Backport of 7901eccf2e591447850be00011a7bb556a3c53f2 from master
2015-02-22 10:12:15 -05: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
Sean Wang
f0780df608 [1.8.x] Fixed #24358 -- Corrected code-block directives for console sessions.
Backport of eba6dff581aa8bd6a1c08456e83e68ad09ae4ec3 from master
2015-02-22 09:36:51 -05: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
Aymeric Augustin
481d3bd617 [1.8.x] Removed obsolete reference to media directory.
Backport of 787dd6519a791f210dc8275eaf2fd41454bf9670 from master
2015-02-21 13:08:15 -05:00
Aymeric Augustin
82e323167d [1.8.x] Removed workaround for SVN limitations.
In addition to simplifying the code, this reduces the number of writes.

Backport of bd059e3f8c6311dcaf8afe5e29ef373f7f84cf26 from master
2015-02-21 13:07:59 -05:00
Aymeric Augustin
de3bda9cd3 [1.8.x] [1.8.x] Avoided collecting admin static files in tests.
This makes the staticfiles tests 2.5 times faster.

Backport of 2bb5b0e09863df65756fe0050406163cb70750f1 from master

Backport of bd059e3f8c6311dcaf8afe5e29ef373f7f84cf26 from master
2015-02-21 13:07:42 -05:00
Aymeric Augustin
5c02c75068 [1.8.x] Removed TestServeAdminMedia.
It should have been removed when the ADMIN_MEDIA_PREFIX setting was deprecated.

Backport of 1d9d39fa1c60896e31360d5f8d6b972979ee7c95 from master
2015-02-21 13:05:11 -05:00
Loic Bistuer
850b2ca794 Removed zombie file again.
Refs 5355baf6c770ac1e5c7f7a4f86ef95042f76b8b4.
2015-02-21 22:34:00 +07:00
Loic Bistuer
1b73c764d4 Fixed a couple of allow_migrate routers in tests.
This reverts commit 88e6fbb2e341657cb5365b9b78fb44e3c7065d2d.
2015-02-21 21:44:05 +07: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
Tim Graham
88e6fbb2e3 Silenced a deprecation warning in commands_sql test. 2015-02-20 13:24:29 -05:00
Tim Graham
5355baf6c7 Removed an inadvertently added test directory. 2015-02-20 13:16:42 -05: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
Andrei Kulakov
564487601e [1.8.x] Fixed #23932 -- Added how-to on migrating unique fields.
Backport of 1f9e44030e9c5300b97ef7b029f482c53a66f13b from master
2015-02-20 21:53:15 +07:00
Tim Graham
18dceab05b [1.8.x] Fixed typo in path to is_safe_url()
Backport of dd0b487872de4e3ff966da51e3610bac996e44f0 from master
2015-02-20 09:22:17 -05: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
Shai Berger
e2a3be1e4d [1.8.x] Fixed #24362: Made test run each migration operation in its own schema editor
Thanks Tim Graham for pointing out the fix.

Backport of f7d34fe from master ticket_24362
2015-02-18 22:51:06 +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
5068a51d88 [1.8.x] Refs #24324 -- Skipped fixtures_regress tests that fail on Python 2 on a non-ASCII path.
Backport of b8d6cdbcc90ff8af781d13131b79ce88a9eff66d from master
2015-02-18 07:36:02 -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
2aa06e439a [1.8.x] Refs #24324 -- Fixed Python 2 test failures when path to Django source contains non-ASCII characters.
Backport of 307c0f299a6c26f5231d3516df5b4edc54b36553 from master
2015-02-17 19:05:31 -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
ec9119d4ec [1.8.x] Fixed "environment can only contain strings" in model_regress test on Windows.
Backport of ad50b6c853f4a6c864219fbd38b4254ffaef7b1c from master
2015-02-17 13:55:18 -05:00
Tim Graham
e4df10668c [1.8.x] Added an import to docs/topics/testing/advanced.txt example.
Backport of 32b67b3fd1d252566f60cf38fe1459bb83de2ce2 from master
2015-02-17 13:53:57 -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