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

20028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 a8991b9b9f1 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 f6b09a7f85c3b67b2011553838b079788c413432 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 56cd87a5aff034a7b976977a2902697cd5397b94 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 7614efa2f9e169749ab109aab909fbc244fd76a9 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 7f8588d22ea3b53ba55d05922b67e7b3a0a7c91c 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 53bc6e2e98b4889082049f50718b13f8d5d84b6b 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 b4d8b16e5109170614ba505e36f60c2ad64dafc2 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 27ad12a9b865bf3deebd165360f73ace722cee31 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 6ff826e12ea99c0eb871716cfedc2c8e199695f3 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 a3e89f13dfb1f22a26ead8b06b37695598a4421a 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 6b605be5fe5ec62f6a927f868fc0f4e3413cd9e3 from master
 2015-03-11 12:36:08 -04: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
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 1825365152c 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 f66c2bdc0f056ffcbf6df121ea9132aaa0c4cadb 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 cefbbb9db3410f757532e0f968e76a8fd9e7ce3b 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 866e71140f9612e45087b8acafefa2e51ffc4a29 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 b9b8411129efe13642cef1fc6bbfc62bed717352 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 ea9157f681654d393c970108866edb344b65a1aa from master
 2015-03-09 13:10:09 -04:00
Tim Graham
449d1effb8 [1.8.x] Bumped version to 1.8 beta 2. 1.8b2 2015-03-09 10:22:51 -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 300fdbbebba45cb4e7f32edc524171019d9bce80 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 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
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
Aymeric Augustin
311b880fa9 [1.8.x] Prevented some tests from writing in the CWD. 
Backport of 90b069c33f3f8785a7d068a2032f130d2dbb0c75 from master
 2015-03-07 10:40:17 -05: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
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
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
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
Brent O'Connor
761b97c344 [1.8.x] Updated contributing link in the README. 
Backport of f7bf135f62297c580e9b36af4c2470adb652fbaf from master
 2015-03-02 08:23:52 -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
Alex Shaindlin
5a3b59370c [1.8.x] Improved wording in tutorial 1. 
Backport of dcdef1fe2ec59a7aeca39efc5a29f0d238d0c560 from master
 2015-02-27 17:54:27 -05: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
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
b8f9fd7591 [1.8.x] Updated trove classifier to beta. 1.8b1 2015-02-25 08:29:14 -05:00
Tim Graham
3fff408a27 [1.8.x] Bumped version to 1.8 beta 1. 2015-02-25 08:26:23 -05:00