mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-15 21:02:52 +00:00
Code Issues 32 Releases Wiki Activity
20,006 Commits 29 Branches 429 Tags
Commit Graph

7695 Commits

Author SHA1 Message Date
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
Tim Graham
83269b2935 [1.8.x] Fixed typo in docs/howto/custom-template-tags.txt 
Backport of 63f2dd4ad774d39fc7bbe05492d30efc45e4e7a9 from master
 2015-03-09 07:06:32 -04:00
Rik
930fc4db7b [1.8.x] Fixed #21661 -- Expanded authentication views documentation 
Backport of eb9b7abb833a6d317e355265552d47e0d8f24af8 from master.
 2015-03-08 20:40:33 +01: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
Marten Kenbeek
bd7c879d5a [1.8.x] Stressed authentication should be successful before logging in a user. 
Backport of 8e744fa1507b6d425860c54e7673e603279367eb from master
 2015-03-05 12:18:13 -05:00
Aymeric Augustin
2bef57f3fb [1.8.x] Improved get_media_prefix template tag example. 
Backport of 9a4a9a8a49ed3e38f3038b8d6fc7c405256271f1 from master
 2015-03-05 10:00:05 -05:00
Ross Brunton
72539a5f29 [1.8.x] Fixed #24379 -- Documented that remote user example disables ModelBackend. 
Backport of 6b28e957df364532109a1897c73a1fa8b1416bd4 from master
 2015-03-02 19:57:12 -05:00
Tim Graham
cc525e31bb [1.8.x] Fixed #13015 -- Clarified language about model instances attached to forms. 
Backport of a40a34a4b2d79dbf798df538c26222148d42b17c from master
 2015-03-02 18:45:27 -05:00
Andrew Pinkham
ac6bc2c090 [1.8.x] Fixed #24439 -- Removed incorrect make_object_list attributes in CBV docs. 
Backport of fea45eff5a2f2ad10b2788603db80e5a4fe6be06 from master
 2015-03-02 13:33:42 -05:00
Ian Lee
ed25758556 [1.8.x] Added syntax highlighting for apache code blocks 
Backport of fde4857fb83101d27ae4cb3552a6a6cf20d3d8ce from master
 2015-03-02 12:37:07 -05:00
Alex Shaindlin
5a3b59370c [1.8.x] Improved wording in tutorial 1. 
Backport of dcdef1fe2ec59a7aeca39efc5a29f0d238d0c560 from master
 2015-02-27 17:54:27 -05:00
Tim Graham
9d6f0dce13 [1.8.x] Fixed #24359 -- Cleaned up docs/ref/exceptions.html 
Backport of 2b19b3a031e7d5b5264bc9e880d0192301289bc2 from master
 2015-02-27 13:51:29 -05:00
Tim Graham
31a1f96bd3 [1.8.x] Added stub release notes for 1.7.6. 
Backport of 71820721a19f5628b3176f16813d47378cb2c3cb from master
 2015-02-25 09:11:43 -05:00
Tim Graham
a9ab8bd4dd [1.8.x] Added release date for 1.7.5 release. 
Backport of aca73737da8ba173ad9435b1e9e1fe5d8516f3b3 from master
 2015-02-25 09:03:38 -05:00
Tim Graham
81911f29b7 [1.8.x] Reverted "Fixed #24325 -- Documented change in ModelForm.save() foreign key access." 
This reverts commit 0af3822dc362b6253bda1c9699466dd0bbbf6066.
It's obsoleted by refs #24395.

Backport of d298b1ba5043eaa40f3f4bebe3c7634b359ba34b from master
 2015-02-24 11:51:10 -05:00
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
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
Michael Manfre
ed941ef2d0 Fixed signature of BaseDatabaseOperations.date_interval_sql() 
Backport of 7fa7dd48c4 from master
 2015-02-23 00:04:57 -05: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
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
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
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
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
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
730fb593ad [1.8.x] Fixed #24335 -- Bumped required psycopg2 version to 2.4.5 (2.5 for contrib.postgres). 
Backport of 3adc5f1ee6618a615db07d4a868b366a15c39f82 from master
 2015-02-17 06:21:59 -05:00
Tim Graham
fb9551189d [1.8.x] Fixed #24350 -- Freshened up database install topic section. 
Backport of 35f0cae19de226d9d7771304fc8dd2619e644998 from master
 2015-02-16 14:59:57 -05:00
Tim Graham
50ec49c087 [1.8.x] Removed a note about old versions of MySQLdb. 
Backport of f3bc7c5447a1e4bfa428a7ff32ea3336850c5c2d from master
 2015-02-16 14:29:30 -05:00
Carl Meyer
e63d9b98e7 [1.8.x] Fixed #23892 -- Clarified compatibility policy for migrations. 
Backport of e35c70bef44805d47f6a4ae692be878184c4fe1f from master
 2015-02-16 10:12:13 -05:00
Aymeric Augustin
e8950668ca [1.8.x] Deprecated TEMPLATE_DEBUG setting. 
Backport of 15b711b from master.
 2015-02-15 20:48:48 +01:00
Aymeric Augustin
69c662c981 [1.8.x] Documented how to set up the Jinja2 environment. 
This may also help with "Why do context processors not work in Jinja2
templates?" etc.

Backport of 9fbd302 from master
 2015-02-15 20:44:40 +01:00
Aymeric Augustin
87e9cad4a4 [1.8.x] Fixed #24318 -- Set the transaction isolation level with psycopg >= 2.4.2. 
Backport of 76356d96 from master
 2015-02-14 18:52:28 +01:00
Claude Paroz
a1fc97c1a7 [1.8.x] Fixed #24144 -- Documented that GEOSGeometry.envelope can return a point 
Thanks Manel Clos for the report.
Backport of 1379165b35 from master.
 2015-02-14 16:20:58 +01:00
Tim Graham
8657e7caaa [1.8.x] Fixed #24325 -- Documented change in ModelForm.save() foreign key access. 
Backport of 0af3822dc362b6253bda1c9699466dd0bbbf6066 from master
 2015-02-14 08:09:27 -05:00
Loic Bistuer
20b621eb3c [1.8.x] Fixed #24289 -- Reversed usage of Field.many_to_one and one_to_many. 
Thanks Carl Meyer and Tim Graham for the reviews and to all involved
in the discussion.

Backport of 18c0aaa9123579375294fcc4a8ee7e3530176b88 from master
 2015-02-14 02:42:06 +07:00
Joe Simpson
8277f5d7d0 [1.8.x] Added each_context() and a template tip to custom admin view docs. 
Backport of 648e516b8d5694c01a225fe27429f0bf7776fb43 from master
 2015-02-13 10:38:29 -05:00
Markus Holtermann
bd80fa6b0f [1.8.x] Fixed #24184 -- Prevented automatic soft-apply of migrations 
Previously Django only checked for the table name in CreateModel
operations in initial migrations and faked the migration automatically.
This led to various errors and unexpected behavior. The newly introduced
--fake-initial flag to the migrate command must be passed to get the
same behavior again. With this change Django will bail out in with a
"duplicate relation / table" error instead.

Thanks Carl Meyer and Tim Graham for the documentation update, report
and review.

Backport of f287bec5833d75750fa6368bc2802741b7924533 from master
 2015-02-13 15:21:10 +01:00
Tim Graham
4c948c7c9d [1.8.x] Fixed #24332 -- Fixed contrib.sites create_default_site() when 'default' DATABASES is empty. 
Backport of e8cf4f8abec87b9da6ed8e5c8cf833af9b27f4dd from master
 2015-02-13 07:02:37 -05:00
Tim Graham
6476fa73d3 [1.8.x] Forwardported item in 1.7.5 release notes. 
Backport of a93c5fb2bfbadd4628a2a5d6b6aecbd64bd527cb from master
 2015-02-12 14:06:21 -05:00
Thomas Güttler
6b8c8d7e18 [1.8.x] Clarified timeout=0 in cache docs. 
Backport of e519ee1d352e0e36fcb8edc9d33ec2845f663d3a from master
 2015-02-12 10:32:56 -05:00
Josh Smeaton
a6ea62aeaf [1.8.x] Refs #14030 -- Improved expression support for python values 
Backport of e2d6e14662d780383e18066a3182155fb5b7747b from master
 2015-02-12 08:53:03 +11:00
Tim Graham
411028df53 [1.8.x] Updated docs and runtests.py for removal of tests from contrib. 
Backport of 7cf3a5786bc76374e743fbc0c1a1c8470a61f6c0 from master
 2015-02-11 12:05:55 -05:00
Josh Smeaton
3518d51697 [1.8.x] Fixed #24200 -- Made introspection bypass statement cache 
Backport of 1fbe8a2de3 from master
 2015-02-10 23:42:16 +02:00
Tim Graham
a8b70d251d [1.8.x] Sorted imports with isort; refs #23860. 
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
 2015-02-09 14:24:06 -05:00
Markus Holtermann
edbf6de753 [1.8.x] Revert "Fixed #24075 -- Prevented running post_migrate signals when unapplying initial migrations of contenttypes and auth" 
This reverts commit 737d24923ac69bb8b89af1bb2f3f4c4c744349e8.

Backport of 2832a9b028c267997b2fd3dd0989670d57cdd08f from master
 2015-02-07 20:35:20 +01:00
Peter Inglesby
b6323302e0 [1.8.x] Fixed docs typo 
Backport of a8f1c70dce792831688588f271efb3a825dffef8 from master
 2015-02-07 18:47:17 +01:00