innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
9,280 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

93 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
Luke Plant b9e6db4ae8 Added info about using logging to the 'Error reporting' howto. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 14:00:38 +00:00
Luke Plant 165f13dc88 Corrected 'email' to 'e-mail' in error reporting docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 13:30:31 +00:00
Jannis Leidel 70edd4e103 Reverted deprecation of media context processor (from r14293) to separate static files and media files a bit more. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-11 21:44:33 +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
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
Ramiro Morales 4239bb0f35 Documented options accepted by the runfcgi management command. 
Also, modified our custom management command option docs xref parser
to also process those without a ``--`` prefix. --  Refs #14398.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14361 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-27 15:35:07 +00:00
Gabriel Hurley 298f3d300e Fixed #14562 -- corrected a typo in the static-files howto. Thanks to stephaner for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-26 12:32:35 +00:00
Chris Beaven 82dca6d4af Replace an incorrect reference to collectmedia in the docs (the command is collectstatic) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-26 01:16:22 +00:00
Gabriel Hurley 9facaec719 Fixed #10545 -- Mentioned that template context variables are scoped to the block in which they're assigned. Thanks to yaniv.haber for the report and timo for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-25 20:50:53 +00:00
Alex Gaynor 8a8c0ed0f9 Fixed #14551 -- corrected a type in the remote user auth documentation. Thanks to mag for the report and fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14344 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-24 17:29:24 +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
Jacob Kaplan-Moss 14b52b95d2 Removes a mistaken note about the static media development helper. 
Turns out that when you write documentation without actually consulting the code
you get things wrong. Who knew?

Thanks to Waldemar Kornewald for catching my mistake.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-20 20:16:36 +00:00
Alex Gaynor ec80e55cac Fixed #14514 -- fixed a typo in the static files docs, thanks to Andy McKay for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-20 17:57:37 +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 3739f89b44 Fixed #7616 -- Added advice on unix socket permissions and umasks to fastcgi deployment documentation. Thanks to Malcolm Tredinnick for the report and advice, and PaulM and cramm for reviewing the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-19 00:58:03 +00:00
Gabriel Hurley 05001056a8 Fixed #12369 -- Improved example to account for environments where cStringIO is not available. Thanks to rubic for the report and niall for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14076 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 10:21:55 +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
Simon Meers c93f5e5d0e Fixed #5677 -- update modpython stdout documentation. Thanks to Manfred Wassmann for the report, nickefford for the initial patch and Graham Dumpleton for the expert advice. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 05:08:42 +00:00
Russell Keith-Magee 98c6ff3a2b Fixed #14384 -- Updated mod_wsgi docs to match documented best practice. Thanks to monokrome for the report and wogan for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14016 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-08 15:36:48 +00:00
Jannis Leidel e77f16144b Fixed #14281 -- A few documentation fixes. Thanks, Ramiro and Timo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-01 02:00:52 +00:00
Malcolm Tredinnick 030c97b119 Documented how to manually piece together URLs with get_script_name(). 
Thanks to timo and leovitch for the patch. Fixed #10328.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 19:44:19 +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
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
Russell Keith-Magee 5da6aeba17 Fixed #13636 -- Migrated fixtures tests to use unittests, eliminating another set of expensive flush calls. Thanks to Eric Holscher for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-05 05:26:04 +00:00
Karen Tracey 8e7d2d2e68 Fixed #13530: Corrected a handful of doc typos. Thanks Ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-12 22:53:23 +00:00
Russell Keith-Magee a0cf7f4bb9 Fixed #12135 -- Clarified custom template tag example. Thanks to EvilDMP for the report, and timo for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-10 14:05:16 +00:00
Russell Keith-Magee 9f230c7eeb Fixed #12517 -- Corrected get_prep_lookup example in custom field docs. Thanks to django@pressure.net.nz for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-10 13:17:12 +00:00
Russell Keith-Magee b832e61308 Fixed #12621 -- Corrected grammar error in custom template tag docs. Thanks to beemzet for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-10 13:16:08 +00:00
Brian Rosner 0618cb24f5 Fixed #9170 -- added improved custom management command documentation. 
Thanks to David Fischer and Eric Holscher for their work on initial patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-08 21:38:00 +00:00
Russell Keith-Magee 07590ff4e8 Fixed #13184 -- Document the requirement that custom model fields using SubfieldBase should probably implement formfield. Thanks to Mark L. for the report, and to Joseph and Honza for the guidance on the solution. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 14:34:40 +00:00
James Bennett 4c0701a5d3 Fixed #13084: Corrected typo in error-reporting docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-11 09:33:49 +00:00
James Bennett bb3d93f290 Fixed #11680: Added a note in the error-reporting documentation about basic e-mail configuration. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-06 11:20:50 +00:00
Russell Keith-Magee 841210b308 Fixed #12880 -- Added some missing sphinx directives for module references. Thanks to psagers for the report, and timo for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-24 13:55:37 +00:00
Jacob Kaplan-Moss 5366aa96fe Fixed #10258: handle duplicate file names better. 
Instead of just continually appending "_" to duplicate file names, Django's
default storage now appends `_1`, `_2`, `_3`, etc.

Thanks to ianschenck and Thilo.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 22:39:22 +00:00
Jannis Leidel 0d4726f518 Fixed #11714 - Document a few of the i18n function that can be used outside views and templates. Thanks, Jarek Zgoda and Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-21 23:44:05 +00:00
Jannis Leidel f93f056c32 Fixed #10260 - Refactored internationalization documentation. Thanks, Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:12:53 +00:00
Luke Plant eaee55e547 Removed docs that assume developer might be using Python < 2.4 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-09 19:37:08 +00:00
Gary Wilson Jr adb74a8f2e Fixed several broken and redirecting URLs in the documentation (fixes #12219, refs #12427). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-26 06:37:26 +00:00
Russell Keith-Magee 0f2f08a7d7 Documentation markup fixes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 16:10:48 +00:00
Russell Keith-Magee ff60c5f9de Fixed #1142 -- Added multiple database support. 
This monster of a patch is the result of Alex Gaynor's 2009 Google Summer of Code project.
Congratulations to Alex for a job well done.

Big thanks also go to:
 * Justin Bronn for keeping GIS in line with the changes,
 * Karen Tracey and Jani Tiainen for their help testing Oracle support
 * Brett Hoerner, Jon Loyens, and Craig Kimmerer for their feedback.
 * Malcolm Treddinick for his guidance during the GSoC submission process.
 * Simon Willison for driving the original design process
 * Cal Henderson for complaining about ponies he wanted.

... and everyone else too numerous to mention that helped to bring this feature into fruition.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 15:18:51 +00:00
Karen Tracey 833df0afaa Fixed #12385: Made built-in field type descriptions in admindocs translatable again. Many thanks to Ramiro for the problem report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11878 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-16 18:13:34 +00:00
Russell Keith-Magee 44b9076bbe Fixed #6262 -- Added a cached template loader, and modified existing template loaders and tag to be cacheable. Thanks to Mike Malone for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-14 12:08:23 +00:00
Karen Tracey d10dd3eceb Apply doc addition that somehow was left out of r11833. Refs #7977. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-13 15:16:48 +00:00
Russell Keith-Magee 94d8da31da Fixed #11780 -- Corrected a typo in the static file serving docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-12 22:48:20 +00:00
Karen Tracey c8517025af Fixed #11573: Updated Nginx url. Thanks bryanveloso. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-13 16:53:19 +00:00
Russell Keith-Magee 9fd19c0161 Fixed #11229 -- Updated the mod_wsgi deployment documentation to avoid references to mod_python and techniques that are not recommended or required for mod_wsgi. Thanks to Graham Dumpleton for the suggestion and guidance. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-16 16:08:18 +00:00
Russell Keith-Magee 2124811150 Fixed #11438 -- Corrected some bad grammar in the custom fields docs. Thanks to thepointer for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-11 15:38:08 +00:00
Russell Keith-Magee f36b3898ae Fixed #11453 -- Added note on customizing SERVER_EMAIL for error reporting. Thanks to seveas for the suggestion and draft text. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11219 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-11 15:37:38 +00:00
Russell Keith-Magee 5cef76ffb7 Fixed #10426 -- Added note on language variables required for Apache to survive non-ASCII file uploads. Thanks to daybreaker for the report, and david for the draft text. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-03 07:16:25 +00:00