mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
19,976 Commits 30 Branches 460 Tags
81911f29b70710d8f72916c49a69aa5df5cd7df8
Commit Graph

19976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Graham
81911f29b7 [1.8.x] Reverted "Fixed #24325 -- Documented change in ModelForm.save() foreign key access." 
This reverts commit 0af3822dc3.
It's obsoleted by refs #24395.

Backport of d298b1ba50 from master
 2015-02-24 11:51:10 -05:00
Stanislas Guerra
a3fca05b05 [1.8.x] Fixed #24395 -- Ensured inline ModelsForms have an updated related instance. 
Backport of 4c2f546b55 from master
 2015-02-24 11:49:27 -05:00
Preston Timmons
450b42eafe [1.8.x] Cleaned up template directory handling in template tests. 
Backport of 8e129b42ad from master
 2015-02-24 09:22:25 -05:00
Preston Timmons
b22d20dd18 [1.8.x] Combined TemplateTests and TemplateRegressionTests. 
Backport of 32c108a221 from master
 2015-02-24 09:22:20 -05:00
Preston Timmons
2e7414cdf4 [1.8.x] Moved test_token_smart_split into ParserTests. 
Backport of 25a0b5cdcd from master
 2015-02-24 09:22:15 -05:00
Preston Timmons
e15292daa0 [1.8.x] Moved ifchanged tests into syntax_tests/test_if_changed.py. 
Backport of 3d8fee6051 from master
 2015-02-24 09:22:05 -05:00
Preston Timmons
f3a49c628e [1.8.x] Moved cache tests into syntax_tests/test_cache.py. 
Backport of f6d087b628 from master
 2015-02-24 09:21:54 -05:00
Preston Timmons
d8114552a0 [1.8.x] Moved RequestContextTests into test_context. 
Backport of 250a3d1993 from master
 2015-02-24 09:18:28 -05:00
Preston Timmons
c1bf9e47ec [1.8.x] Moved TemplateTagLoading cases into test_custom. 
Backport of ff67ce5076 from master
 2015-02-24 09:17:45 -05:00
Preston Timmons
272208c124 [1.8.x] Moved include tests into syntax_tests/test_include.py. 
Backport of 06ffc764a9 from master
 2015-02-24 09:10:01 -05:00
Preston Timmons
cdb73ec8cd [1.8.x] Moved ssi tests into syntax_tests/test_ssi.py. 
Backport of 441a47e1ef from master
 2015-02-24 09:09:52 -05:00
Tim Graham
210bf24ddb [1.8.x] Cleaned up template loader tests. 
Backport of 1827aa9024 from master
 2015-02-24 08:59:05 -05:00
Nik Nyby
3e0df285fd [1.8.x] Fixed typos in flatpages_tests comments. 
Backport of 2be6b52656 from master
 2015-02-24 06:31:59 -05:00
Aymeric Augustin
e3953de900 [1.8.x] Normalized usage of the tempfile module. 
Specifically stopped using the dir argument.

Backport of a8fe12417f from master
 2015-02-23 15:26:35 -05:00
Aymeric Augustin
fae31f2348 [1.8.x] Guaranteed removal of temporary files during tests. 
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 934400759d from master
 2015-02-23 15:26:26 -05:00
Kenneth Kam
a752a2c951 [1.8.x] Fixed #23762 -- clarified CACHE_MIDDLEWARE_ANONYMOUS_ONLY deprecation in docs 
Backport of e83aba0e2c 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 1306cd1e8a 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 00fbd8fd52 from master
 2015-02-23 07:46:00 -05:00
Emin Mastizada
ff2e0896a3 [1.8.x] Added formats for the Azerbaijani locale. 
Backport of dda2a3cf4c 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 f95122e541 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 78d43a5e10 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 b2f331dc68 from master
 2015-02-22 14:20:25 -05:00
Tim Graham
576c1096d2 [1.8.x] Corrected sqlmigrate output in tutorial 1. 
Backport of ff5e47e7a4 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 7901eccf2e 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 eba6dff581 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 ea3168dc6c from master
 2015-02-21 14:26:47 -05:00
Aymeric Augustin
481d3bd617 [1.8.x] Removed obsolete reference to media directory. 
Backport of 787dd6519a 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 bd059e3f8c 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 2bb5b0e098 from master

Backport of bd059e3f8c 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 1d9d39fa1c from master
 2015-02-21 13:05:11 -05:00
Loic Bistuer
850b2ca794 Removed zombie file again. 
Refs 5355baf6c7.
 2015-02-21 22:34:00 +07:00
Loic Bistuer
1b73c764d4 Fixed a couple of allow_migrate routers in tests. 
This reverts commit 88e6fbb2e3.
 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 99a1bbf985 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 1d1d5d1c31 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 bad5f262bf 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 bed504d70b 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 1f9e44030e 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 dd0b487872 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 4755f8fc25 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 e467919c63 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