mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-31 21:46:05 +00:00
Code Issues 30 Releases Wiki Activity
20,134 Commits 28 Branches 426 Tags 623 MiB
6724ae1185
Commit Graph

7783 Commits

Author SHA1 Message Date
Tim Graham
5447709a57 [1.8.x] Fixed an infinite loop possibility in strip_tags(). 
This is a security fix; disclosure to follow shortly.
 2015-03-18 19:23:21 -04:00
Tim Graham
5a8ef2a3cf [1.8.x] Added stub release notes for security releases. 2015-03-18 19:23:21 -04:00
Karl Hobley
a8c53041f9 [1.8.x] Fixed #24495 -- Allowed unsaved model instance assignment check to be bypassed. 
Backport of 81e1a35c36 from master
 2015-03-18 19:12:46 -04:00
Tim Graham
4cc501205d [1.8.x] Updated location of database backend data_types attribute in docs. 
Backport of d9a30ed190 from master
 2015-03-17 20:04:30 -04:00
Tim Graham
0c92913bb0 [1.8.x] Updated links to latest version of PostGIS docs. 
Backport of 53d11c6821 from master
 2015-03-17 18:35:51 -04:00
Tim Graham
ddb95d6d53 [1.8.x] Refs #24487 -- Added upgrade tips about removal of SortedDict. 
Thanks Pascal Chambon for the initial patch.

Backport of c5c8751147 from master
 2015-03-17 13:42:54 -04:00
Tim Graham
717bbd473c [1.8.x] Updated location of gis_tests in docs. 
Backport of 64b9393ae2 from master
 2015-03-17 11:35:41 -04:00
Josh Smeaton
a0cebe82b5 [1.8.x] Refs #24485 -- Renamed some expression types 
Backport of 88d798d71a from master
 2015-03-17 08:40:45 -04:00
John Giannelos
e150bbd4d6 [1.8.x] Fixed #24427 -- Stopped writing migration files in dry run mode when merging. 
Also added display of migration to stdout when verbosity=3.

Backport of 8758a63ddb from master
 2015-03-16 19:45:55 -04:00
Preston Timmons
ff71d6b8de [1.8.x] Documented Context.get() method. 
Backport of 4d9414098b from master
 2015-03-16 13:13:47 -04:00
Josh Smeaton
09062e9509 [1.8.x] Fixed #24486 -- Documented method to provide output_field to mixed F expressions 
Backport of 820381d38b from master
 2015-03-16 11:56:09 -04:00
Adrian Andreias
63b998a653 [1.8.x] Fixed allow_migrate() signature in router examples. 
Backport of 937643a1f2 from master
 2015-03-16 09:39:41 -04:00
HerHde
6dcbfc0700 [1.8.x] Added missing punctuation in some comments in tutorial 5. 
Backport of 39573a11db from master
 2015-03-16 08:24:58 -04:00
Steven Das
f2db113f51 [1.8.x] Added comma to improve readability in 1.7 release notes. 
Backport of 4f494ed0c6 from master
 2015-03-16 08:17:01 -04:00
Matthew Wilkes
22a67d22e9 [1.8.x] Refs #24354 -- Prevented repointing of relations on superclasses when migrating a subclass's name change 
Forwardport of test and release note from stable/1.7.x

Backport of ae87ad005f from master
 2015-03-14 15:47:10 -04:00
Floris den Hengst
bd36f2d432 [1.8.x] Fixed doc typos. 
Backport of e42a720ba2 from master
 2015-03-14 12:29:27 -04:00
Tim Graham
5b91802718 [1.8.x] Refs #24462 -- Emphasized that order_by() clears previous ordering. 
Backport of b9d9ab23bd from master
 2015-03-13 15:42:03 -04:00
Andrei Kulakov
937c8a5a14 [1.8.x] Fixed #24052 -- Doc'd how to write data migrations with models in multiple apps. 
Backport of b089759d60 from master
 2015-03-13 13:24:18 -04:00
Claude Paroz
f115694547 [1.8.x] Documented gdal DataSource encoding parameter 
Thanks Max Demars for the suggestion and Tim Graham for the review.
Backport of a8991b9b9f from master.
 2015-03-13 16:41:37 +01:00
Remco Kranenburg
6f555e54f7 [1.8.x] Refs #23559 -- warned about consequences of letting users edit User model in admin. 
Backport of f6b09a7f85 from master
 2015-03-13 08:51:24 -04:00
Ian Lee
06085024f6 [1.8.x] Added link to section in docs/howto/custom-template-tags.txt. 
Backport of 56cd87a5af from master
 2015-03-13 08:26:28 -04:00
Ian Lee
606e436a37 [1.8.x] Fixed typo in docs/howto/custom-template-tags.txt. 
Backport of 7614efa2f9 from master
 2015-03-13 08:14:30 -04:00
Ian Lee
77564c6f5a [1.8.x] Documented how to use a non-root subdirectory with mod_wsgi. 
Backport of 7f8588d22e from master
 2015-03-12 20:09:56 -04:00
Steven Das
e1657cc37f [1.8.x] Fixed typo in docs/ref/models/fields.txt 
Backport of 53bc6e2e98 from master
 2015-03-12 19:16:22 -04:00
Aksel Ethem
fee18ce415 [1.8.x] Fixed #24364 -- Doc'ed that ManifestStaticFileStorage shouldn't be used during testing. 
Backport of b4d8b16e51 from master
 2015-03-12 09:23:57 -04:00
ldrumm
def39428bf [1.8.x] Fixed wrong operator in iri_to_uri() docs 
Backport of 27ad12a9b8 from master
 2015-03-12 13:49:07 +01:00
Dan Fellin
9f39715509 [1.8.x] Fixed typo in docs/topics/forms/modelforms.txt. 
Backport of 6ff826e12e from master
 2015-03-11 19:58:14 -04:00
Sean Wang
e0e2df412f [1.8.x] Fixed #24414 -- Added examples of Prefetch object usage to the docs. 
Backport of a3e89f13df from master
 2015-03-11 12:39:50 -04:00
Preston Timmons
2982143dac [1.8.x] Fixed typo in current_app deprecation note. 
Backport of 6b605be5fe from master
 2015-03-11 12:36:08 -04:00
Claude Paroz
12e199356e [1.8.x] Fixed download instructions for cities shapefile 
Thanks Daniel Wiesmann for spotting the issue.
Backport of 57d42aef97 from master.
 2015-03-10 19:44:27 +01:00
Claude Paroz
e2816f1ff9 [1.8.x] Updated GIS docs wrt GIS test paths 
Backport of 1825365152 from master.
 2015-03-10 18:01:29 +01:00
Erik Romijn
846a970106 [1.8.x] Fixed #23903 -- Configured Sphinx to autogenerate django-admin manpage 
Backport of f66c2bdc0f from master
 2015-03-10 08:15:40 -04:00
Calvin Jeong
6e81786f92 [1.8.x] Fixed typo in docs/ref/database.txt 
Backport of cefbbb9db3 from master
 2015-03-10 07:12:39 -04:00
Psilo Cybin
b25e542ecd [1.8.x] Fixed #24456 -- Added links to topics/forms/modelforms.txt. 
Backport of 866e71140f from master
 2015-03-09 20:53:05 -04:00
Floris den Hengst
9853844ed3 [1.8.x] Fixed #24432 -- Added docs for ManyToManyFields that reside in and refer to the same model. 
Backport of b9b8411129 from master
 2015-03-09 20:46:26 -04:00
Tim Graham
ffa4ff5e8c [1.8.x] Added stub release notes for 1.7.7. 
Backport of ea9157f681 from master
 2015-03-09 13:10:09 -04:00
Baptiste Mispelon
35d68e8e76 [1.8.x] Refs #24461 -- Added test/release notes for XSS issue in ModelAdmin.readonly_fields 
This issue was fixed by refs #24464.
 2015-03-09 10:15:12 -04:00
Tim Graham
980d604bf2 [1.8.x] Clarified an item in 1.7.6 release notes. 
Backport of 300fdbbebb from master
 2015-03-09 10:11:44 -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 fa350e2f30 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 63f2dd4ad7 from master
 2015-03-09 07:06:32 -04:00
Rik
930fc4db7b [1.8.x] Fixed #21661 -- Expanded authentication views documentation 
Backport of eb9b7abb83 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 f4f0060fea 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 8e744fa150 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 9a4a9a8a49 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 6b28e957df 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 a40a34a4b2 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 fea45eff5a 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 fde4857fb8 from master
 2015-03-02 12:37:07 -05:00
Alex Shaindlin
5a3b59370c [1.8.x] Improved wording in tutorial 1. 
Backport of dcdef1fe2e 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 2b19b3a031 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 71820721a1 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 aca73737da 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 0af3822dc3.
It's obsoleted by refs #24395.

Backport of d298b1ba50 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 e83aba0e2c 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 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
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 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
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
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
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 32b67b3fd1 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 3adc5f1ee6 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 35f0cae19d 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 f3bc7c5447 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 e35c70bef4 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 0af3822dc3 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 18c0aaa912 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 648e516b8d 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 f287bec583 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 e8cf4f8abe 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 a93c5fb2bf 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 e519ee1d35 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 e2d6e14662 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 7cf3a5786b 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 0ed7d15563 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 737d24923a.

Backport of 2832a9b028 from master
 2015-02-07 20:35:20 +01:00
Peter Inglesby
b6323302e0 [1.8.x] Fixed docs typo 
Backport of a8f1c70dce from master
 2015-02-07 18:47:17 +01:00
Collin Anderson
fc8e1e0c10 [1.8.x] Fixed E265 comment style 
Backport of db77915c9f from master
 2015-02-06 09:35:08 -05:00
Tim Graham
6adc23d6b6 [1.8.x] Removed gather_profile_stats.py 
This script uses the unmaintained hotshot module (gone on Python 3)
and doesn't seem to be Django specific in any way.

Backport of 388d986b8a from master
 2015-02-06 08:55:02 -05:00
minusf
5bc9904b35 [1.8.x] Removed inaccurate sentence about PO files in translation docs. 
Backport of aea103b6a5 from master
 2015-02-06 07:46:14 -05:00
Tom Christie
f5749252ea [1.8.x] Improved nested ArrayField example 
Backport of 737b184d91 from master
 2015-02-05 11:35:23 +01:00
Josh Schneier
16e3910e9c [1.8.x] Fixed typos of "select_related" in docs and tests. 
Backport of 7d363ed432 from master
 2015-02-04 07:32:34 -05:00
Tim Graham
dd83bab931 [1.8.x] Demoted "Installing a distribution-specific package" in install notes. 
Backport of 281fc03474 from master
 2015-02-03 16:38:05 -05:00
Tim Graham
ff39de1e1e [1.8.x] Added a "Writing migrations" how-to. 
Backport of 570912a97d from master
 2015-02-03 13:46:56 -05:00
minusf
b35c226154 [1.8.x] Fixed typos in docs/ref/forms/validation.txt. 
Backport of 66f5aa9fa5 from master
 2015-02-03 12:27:16 -05:00
Anssi Kääriäinen
43b0131fb5 [1.8.x] Fixed #23617 -- Added get_pk_value_on_save() 
The method is mainly intended for use with UUIDField. For UUIDField we
want to call the field's default even when primary key value is
explicitly set to None to match the behavior of AutoField.

Thanks to Marc Tamlyn and Tim Graham for review.

Backport of 8adc59038c from master
 2015-02-03 09:25:55 -05:00
Tim Graham
5fdd74f4be [1.8.x] Fixed broken links in class based views flattend index; refs #24250. 
Backport of 9a391fbd61 from master
 2015-02-03 09:12:08 -05:00
Tim Graham
6454716264 [1.8.x] Fixed #24250 -- Corrected mistakes in FormMixin docs. 
Backport of 5d193d042a from master
 2015-02-03 08:42:49 -05:00
Aymeric Augustin
f87457a460 [1.8.x] Fixed #24168 -- Allowed selecting a template engine in a few APIs. 
Specifically in rendering shortcuts, template responses, and class-based
views that return template responses.

Also added a test for render_to_response(status=...) which was missing
from fdbfc980.

Thanks Tim and Carl for the review.

Backport of 2133f31 from master.

Conflicts:
	docs/topics/http/shortcuts.txt
	tests/generic_views/test_base.py
 2015-02-03 08:32:14 +01:00