cfba246037
Fixed #16631 -- Fixed embarrassing typo introduced in r16617. Thanks, Andi Albrecht.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-15 08:22:22 +00:00
2980f2ab9a
Fixed #16629 -- Relaxed check for STATIC_ROOT and STATIC_URL settings slightly to only raise an exception if really needed.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-14 18:15:04 +00:00
21705bd97a
Added with_statement Python 2.5 compatibility import missed in [16594]. Thanks Julien.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-12 00:29:34 +00:00
1d32bdd3c9
Fixed #15252 -- Added static template tag and CachedStaticFilesStorage to staticfiles contrib app.
...
Many thanks to Florian Apolloner and Jacob Kaplan-Moss for reviewing and eagle eyeing.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-11 14:07:39 +00:00
d99b86d6c1
Fixed #16518 -- Fixed collectstatic management command to run on Jython. Thanks, Josh Smeaton.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-26 08:47:46 +00:00
319b0cfb83
Explicitly close a file in the collectstatic management command.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-08 09:39:56 +00:00
21e0b3a243
Fixed #16424 -- Fixed regression in collect static management command introduced in r16509 that prevented prefixed collection.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-06 10:28:18 +00:00
94a38dfd0e
Fixed #16161 -- Added `--clear` option to `collectstatic` management command to be able to explicitly clear the files stored in the destination storage before collecting.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-04 21:34:29 +00:00
a3733967e8
Fixed #15765 -- Stopped showing an odd error message when using the staticfiles enabled runserver management command and trying to serve files from STATIC_URL at the same time.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-04 16:19:54 +00:00
38a2444277
Fixed #16050 -- BACKWARDS-INCOMPATIBLE CHANGE: Moved static files of the admin to conventional file system location.
...
This also removes the need for ADMIN_MEDIA_PREFIX and replaces it with the convention to find admin's static files at STATIC_URL + 'admin/'.
Thanks to Jacob for the review and general help.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-30 09:06:19 +00:00
16ad1d951a
Refined exception message to make sure we don't confuse users.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-18 18:46:48 +00:00
f05aab1a43
Modified collectstatic management command to not include STATIC_ROOT in the user prompt since it's misleading when using a non-local storage backend.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 12:34:17 +00:00
c47b69ba53
Fix the docstring of contrib.staticfiles BaseFinder so it's not misleading.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 22:54:55 +00:00
4bb2db0cae
Modified the staticfiles serve view to return a 404 early in the stack.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 23:45:41 +00:00
64a0a33c33
Fixed the staticfiles management commands collectstatic and findstatic to not raise encoding related exceptions when handlings filenames with non-ASCII characters.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 23:45:32 +00:00
a26034ffbf
Fixes #15270 -- Moved back the serve view to django.views.static due to dependency conflicts with the contrib app staticfiles (reverts parts of r14293). Added a helper function that generates URL patterns for serving static and media files during development. Thanks to Carl for reviewing the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 01:42:26 +00:00
77030ccc1e
Fixed a few test docstrings and removed an unused import in staticfiles.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 20:39:40 +00:00
3bff7ed34c
Preserve order of STATICFILES_DIRS locations in FileSystemFinder.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 20:10:29 +00:00
5cd5612808
Fixed #15190 -- Refactored the collectstatic command to improve the symlink mode and generally straighten out its behavior.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 19:19:52 +00:00
7aad3d3fa8
Fixed #15094 - Added check for forgetting trailing comma in STATICFILES_DIRS tuple. Also reorganized staticfiles settings-checks for better consistency.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 14:57:10 +00:00
76fb2bb0e2
Fixed some documentation and default-settings.py comments that were misleading about the purpose of STATIC_ROOT, and removed an unused import.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 14:28:07 +00:00
f3a9c719fe
Added check to the staticfiles app to make sure the STATIC_ROOT setting isn't accidentally added to the STATICFILES_DIRS setting. Thanks for the suggestion, SmileyChris and harijay.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 23:29:31 +00:00
9e81e18929
Uses a SortedDict for memoization of staticfiles finder instances to preserve order during tests.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 17:23:36 +00:00
ca64a3cb2d
Call superclass init in collectstatic command, otherwise printing error messages for it fails since style has not been set.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-19 16:36:20 +00:00
645eb2b26b
Stopped staticfiles app from requiring a models module when looking for static files. Also removed a bit of code smell in the prefix handling by saving it in the source file storage.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15219 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-15 23:38:00 +00:00
19ab52f77f
Fixed #15035 -- Fixed collectstatic management command to work with non-local storage backends correctly. Also refactored a bit code smell.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15154 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 10:03:27 +00:00
465833834c
Fixed a few docstrings and other helper texts in the staticfiles app.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-05 12:41:40 +00:00
be56f74f93
Fixed #14998 -- Made use of os.path.join to make sure this works on all platforms. Thanks for the pointer, CarlFK.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02 01:32:17 +00:00
e45d1e2dac
Safely join paths in staticfiles finder.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02 01:31:55 +00:00
0de63c96f2
Fixed #14961 -- Revised staticfiles's prefix handling to make sure it runs on Windows. Also revised staticfiles tests to pass on Windows.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 14:22:32 +00:00
3d5bb27945
Added an additional check for the availability of the STATIC_* settings to make sure upgrading a pre-1.3 project doesn't raise a misleading error. Thanks for the report, Florian Apolloner.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 00:43:36 +00:00
0714b0f390
Fixed #14812 -- Made parsing of the If-Modified-Since HTTP header more robust in presence of malformed values when serving static content. Thanks shaohua for the report, and alexey.smolsky@gmail.com for a similar report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14753 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-30 21:27:26 +00:00
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
e9f3899b20
Refactored runserver command and moved code related to staticfiles to a subclass that is enabled if staticfiles app is installed.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:41:55 +00:00
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
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
aa951eb8ea
Ensure that the staticfiles tests use the MEDIA_ROOT they intended, also use a more approrpiate datastructure in collectstatic.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-30 23:39:53 +00:00
85ef6c0938
Fixed #14544 -- Squashed bug in the findstatic command when used with the --first option.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14324 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 14:32:54 +00:00
58af951c30
Fixing a few cosmetic bugs. Thanks for the hint, Alex Gaynor.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-21 03:16:58 +00:00
1c4868f4c1
Fixed #14507 -- Corrected the logic of the URL helpers and view of staticfiles to actual work like documented (only when settings.DEBUG is True). Thanks for the report and initial patch, mbi.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-21 03:16:41 +00:00
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
Jannis Leidel
Ramiro Morales
Alex Gaynor
Chris Beaven
Carl Meyer
Karen Tracey