Commit Graph

231 Commits

Author SHA1 Message Date
Jannis Leidel 33d8fcde8a Fixed #14693, #14709 -- Backwards incompatible change to rectify the confusion around the STATICFILES_URL and STATICFILES_ROOT settings.
* Two new global settings that will be used by -- **but are not limited to** -- the staticfiles app: STATIC_ROOT and STATIC_URL.

  * Moving the 'django.contrib.staticfiles.templatetags.staticfiles' template tag to the core ('django.templatetags.static') and renaming it to 'get_static_prefix'.

  * Moving the context processor 'django.contrib.staticfiles.context_processors.staticfiles' to the core ('django.core.context_processors.static') and renaming it to 'static'.

  * Paths in media definitions will use STATIC_URL as the prefix if the value is not None, and falls back to the previously used MEDIA_URL.

Thanks again to the community for constructive criticism and Carl and Russ for sanity-inducing discussions on IRC.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:36:26 +00:00
Jannis Leidel 9b7be918ed Fixed #12325 -- Allows zero values for moderate_after and close_after fields of comment moderators. Thanks, Gabriel Hurley.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:42:56 +00:00
Jannis Leidel 8e96584f63 Fixed #14524, #14582, #14617, #14665 and #14667 -- Tweaked staticfiles app.
* Updated StaticFilesHandler and AdminMediaHandler
  to make use of the 404 handler if needed.

* Updated runserver management command to serve static files
  only in DEBUG mode (or if specified the --insecure option)
  and if the staticfiles app is in INSTALLED_APPS. Also added
  an option to disable serving completely (--nostatic).

* Added check in debug mode if STATICFILES_* settings are
  different to MEDIA_* settings.

* Removed a faulty PendingDeprecationWarning in AdminMediaHandler
  that is triggered every time runserver is used.

* Fixed an issue with the modification time checks when
  running collectstatic.

* Extended and refined documentation.

Thanks to everyone for input, especially to Carl Meyer, Ted Kaemming and
Adam Vandenberg for patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 21:43:49 +00:00
Carl Meyer 616b30227d Fixed #7539, #13067 -- Added on_delete argument to ForeignKey to control cascade behavior. Also refactored deletion for efficiency and code clarity. Many thanks to Johannes Dollinger and Michael Glassford for extensive work on the patch, and to Alex Gaynor, Russell Keith-Magee, and Jacob Kaplan-Moss for review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-09 16:46:42 +00:00
Gabriel Hurley 682f4cf9ed Fixed #12975 -- Moved the docs for contrib.admindocs out of the template docs and into their own reference section, and significantly improved the documentation of what admindocs can do. Thanks to jabapyth for the report, and whiteinge for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14484 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 09:21:55 +00:00
Gabriel Hurley 7f2b36050e Fixed #10904 -- Corrected inappropriate usage of the term "absolute URL" throughout the docs. Replaced with the (RFC 2396-compliant) terms "absolute path reference" or "absolute path" as appropriate for the context. Thanks to sharan666 for the report, and Malcolm, Chris, and dwillis for their work in supplying a solution and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 01:42:55 +00:00
Gabriel Hurley 11b012038c Fixed #14600 -- Added a versionchanged directive to the TEMPLATE_CONTEXT_PROCESSORS setting reference, and added a currentmodule directive to the staticfiles docs so that the crossref targets would point to the right place even with full paths in the staticfiles docs. Thanks to mathijs for the report and suggested text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 23:30:10 +00:00
Justin Bronn cabc21ca60 Fixed #14318 -- Added `GEOSGeometry.valid_reason` property. Thanks, Rob Coup.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 01:29:37 +00:00
Russell Keith-Magee 5c05233ffc Fixed #14455 -- Documented the backwards compatibility policy for local flavors. Implemented the policy for the changes in the Indonesian local flavor (from r14195) that stimulated the development of this policy. Thanks to Karen, Alex, Ramiro and Chris for their help developing the policy.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-01 00:52:58 +00:00
Gabriel Hurley 6737570aeb Fixed #14526 -- Updated wording regarding the minimum Python version required for GeoDjango. Thanks to PaulM for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 22:24:34 +00:00
Ramiro Morales b874549807 Fixed #14173 -- Added sections about contrib apps-provided commands to django-admin.py docs.
Added documentation about changepassword, pointers to GeoDjango, sitemaps and
staticfiles commands, grouped them by app.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 16:37:51 +00:00
Jannis Leidel c1b3deedaa Fixed #14528 and #14538 -- Refined staticfiles documentation. Thanks, gremmie and romaniuk.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 14:32:20 +00:00
Justin Bronn 4674ef2781 Fixed a typo in the staticfiles docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 09:07:15 +00:00
Jannis Leidel cfc19f84de Fixed #12323 and #11582 -- Extended the ability to handle static files. Thanks to all for helping with the original app, the patch, documentation and general support.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 01:33:24 +00:00
Gabriel Hurley 7baee5b953 Fixed #14426 -- Removed "mysite" import statements from examples that might teach people "bad habits" in regards to creating reusable apps.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 00:10:22 +00:00
Gabriel Hurley 2197b56f30 Fixed #14376 -- added docs for previously undocumented Brazilian localflavor fields. Thanks to henriquebastos for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14229 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 09:30:42 +00:00
Alex Gaynor 5ee1d5ee31 Fixed some typos in the documentation that snuck in with [14223].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 03:15:15 +00:00
Alex Gaynor 5a8e40a03f Fixed #11350 -- added an Israeli localflavor. Thanks to Yuval and Idan Gazit for their work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 02:58:10 +00:00
Luke Plant 45c7f427ce Fixed #14445 - Use HMAC and constant-time comparison functions where needed.
All adhoc MAC applications have been updated to use HMAC, using SHA1 to
generate unique keys for each application based on the SECRET_KEY, which is
common practice for this situation. In all cases, backwards compatibility
with existing hashes has been maintained, aiming to phase this out as per
the normal deprecation process. In this way, under most normal
circumstances the old hashes will have expired (e.g. by session expiration
etc.) before they become invalid.

In the case of the messages framework and the cookie backend, which was
already using HMAC, there is the possibility of a backwards incompatibility
if the SECRET_KEY is shorter than the default 50 bytes, but the low
likelihood and low impact meant compatibility code was not worth it.

All known instances where tokens/hashes were compared using simple string
equality, which could potentially open timing based attacks, have also been
fixed using a constant-time comparison function.

There are no known practical attacks against the existing implementations,
so these security improvements will not be backported.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-14 20:54:30 +00:00
Justin Bronn 120aae2209 Enabled area calculations for geography columns.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 17:13:27 +00:00
Jannis Leidel 6ddfe26932 Fixed #14349 -- Added Belgium localflavor. Thanks for the report and patch, Laurent Luce.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 23:35:23 +00:00
Justin Bronn c4cbbb25a2 Updated version of PostGIS in GeoDjango install docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 19:48:15 +00:00
Russell Keith-Magee a904e55859 Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 08:12:50 +00:00
Russell Keith-Magee 127a25ac27 Fixed #14383 -- Corrected the capitalization of reStructuredText. Thanks to timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:37:16 +00:00
Russell Keith-Magee 060701a26a Fixed #14221 -- Cleaned up some text in the GIS tutorial. Thanks to Grant <renderbox@gmail.com> for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14006 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 14:13:44 +00:00
Luke Plant 667d832e90 Fixed #14386, #8960, #10235, #10909, #10608, #13845, #14377 - standardize Site/RequestSite usage in various places.
Many thanks to gabrielhurley for putting most of this together.  Also to
bmihelac, arthurk, qingfeng, hvendelbo, petr.pulc@s-cape.cz, Hraban for
reports and some initial patches.

The patch also contains some whitespace/PEP8 fixes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-04 14:20:47 +00:00
Karen Tracey 5912903852 Fixed #11358: Don't include private flatpages in sitemap. Thanks dburke and mlavin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 23:30:46 +00:00
Russell Keith-Magee e1e2726957 Fixed #6932 -- Added a template tag that gives a list of available flatpages for a given user. Thanks to Dmitri Fedortchenko for the suggestion, and to Mnewman, faldridge and Simon Meers for their work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 11:59:14 +00:00
Russell Keith-Magee f611ffaab3 Fixed #13820 -- Started the deprecation process for mod_python. Thanks to Robert Coup for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 02:40:57 +00:00
Russell Keith-Magee 23e85ef25f Refactored markup documentation to give it it's own home.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 02:40:17 +00:00
Russell Keith-Magee 8ce4a1991a Fixed #14116 -- Added a flag to enable CSRF checks in the test client. Thanks to jon@licq.org for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-27 13:54:13 +00:00
Karen Tracey 88e83ee472 Fixed #14172: Corrected misspelling of explicitly. Thanks 3point2.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-26 11:08:12 +00:00
Russell Keith-Magee a323fd3c5e Fixed #14112 -- Various Markup fixes for the docs. Thanks to ramiro for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-23 08:07:35 +00:00
Jacob Kaplan-Moss 728effcfbd Fixed #14141: docs now use the :doc: construct for links between documents.
Thanks, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-19 19:27:44 +00:00
Karen Tracey d69cdc6d70 Fixed #14100: Corrected spelling error in description of user_email. Thanks tom_simpson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-12 10:48:24 +00:00
Russell Keith-Magee 103f7f83eb Fixed #11047 -- Clarified the explanation of arguments to GenericForeignKey. Thanks to psmith and timo for their work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 14:56:59 +00:00
Russell Keith-Magee 6ac4aba918 Fixed #11882 -- Added documentation for formfield_for_manytomany. Thanks to Rob Hudson, timo and Simon Meers for their work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 14:56:16 +00:00
Russell Keith-Magee 1a9e0f70ea Fixed #11748 -- Clarified the ways that search_field can be used. Thanks to Michael Richardson for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 14:55:31 +00:00
Russell Keith-Magee 2dc2ed87e5 Fixed #11800 -- Updated Sphinx metadata in queryset docs. Thanks to timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 14:26:07 +00:00
Russell Keith-Magee 5d1627ff6e Fixed #8567 -- Clarified the process of instantiating FormWizards. Thanks to ClaesBas for the suggestion, and ElliotM and timo for draft text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13543 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 07:57:35 +00:00
Russell Keith-Magee bafe9fdef2 Fixed #7284 -- Provided an example for the use of the search_fields clause on ModelAdmin. Thanks to rbell01824@earthlink.net for the suggestion, and Simon Meers for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 07:57:15 +00:00
Russell Keith-Magee 88f2f0b39d Fixed #13740 -- Added documentation for the can_delete InlineModelAdmin option. Thanks to Alex Gaynor for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13458 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-30 04:15:16 +00:00
Justin Bronn 7773a92c7f Fixed #13671, #13748 -- Fixed errata and minor updates to GeoDjango docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13398 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-23 17:34:57 +00:00
Jacob Kaplan-Moss 1b04cb2348 Fixed #13597, a small typo in the admin docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-28 15:03:12 +00:00
Jacob Kaplan-Moss 747e8dfe5f Fixed #13563, a typo in the GeoDjango tutorial.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-19 03:25:42 +00:00
Karen Tracey 111d361d61 Fixed doc markup error that resulted in no anchor tag for the model admin queryset method.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-12 13:34:05 +00:00
Russell Keith-Magee 0e2f215625 Fixed #13529 -- Corrected ModelAdmin example. Thanks to stephane@actinetwork.com for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-12 13:24:38 +00:00
Russell Keith-Magee d0d3e6792d Fixed #13524 -- Added backwards compatibility and feature notes regarding admin inlines and formsets. Thanks to Ramiro Morales and Gabriel Hurley.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-12 11:56:42 +00:00
Russell Keith-Magee efa495f4f0 Fixed #13002 -- Corrected description of the default form base class in InlineModelAdmin classes. Thanks to stijn@typograaf.be for the report, and timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 13:11:09 +00:00
Russell Keith-Magee f6e7a3aee5 Fixed #6039 -- Modified Atom example to be standard compliant. Thanks to ion.morega@gmail.com for the report, and arien for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 07:44:39 +00:00