Commit Graph

86 Commits

Author SHA1 Message Date
Aymeric Augustin 17f3e9258e Fixed #18397 -- Avoided referencing lawrence.com.
This commit includes multiple small related changes, see the ticket
for a full discussion.
2012-06-07 11:50:20 +02:00
Aymeric Augustin 00ec03fd44 Fixed #17733 -- Discouraged setting TIME_ZONE to None when USE_TZ is True. Thanks berdario for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-26 14:17:13 +00:00
Jannis Leidel 4219e2b7f8 Fixed #17920 -- Actually pass the full path of a newly created project or app in the template context as mentioned in the startproject docs. Many thanks to Preston Holmes for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-21 22:29:32 +00:00
Jannis Leidel a9a0f0b03f Fixed #17042 -- Extended startproject and startapp management commands to better handle custom app and project templates. Many thanks to Preston Holmes for his initial patch and Alex Gaynor, Carl Meyer, Donald Stufft, Jacob Kaplan-Moss and Julien Phalip for code reviewing.
* Added ability to pass the project or app directory path as the second argument
* Added ``--template`` option for specifying custom project and app templates
* Cleaned up admin_scripts tests a little while I was there

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-22 22:38:02 +00:00
Aymeric Augustin 9b1cb755a2 Added support for time zones. Thanks Luke Plant for the review. Fixed #2626.
For more information on this project, see this thread:
http://groups.google.com/group/django-developers/browse_thread/thread/cf0423bbb85b1bbf



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17106 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-18 13:01:06 +00:00
Carl Meyer 145a77edc9 Fixed #16360 -- Added WSGI entrypoint to startproject layout, and enabled internal servers (runserver and runfcgi) to use an externally-defined WSGI application. Thanks to Armin Ronacher, Jannis Leidel, Alex Gaynor, ptone, and Jacob Kaplan-Moss.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-22 04:30:10 +00:00
Carl Meyer 38f1fe3b35 Fixed #15372 -- Switched to a startproject default layout that allows us to avoid sys.path hacks.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-13 05:56:15 +00:00
Carl Meyer 343004c4de Fixed #16568 -- Added RequireDebugFalse filter to prevent sending 500 error emails when DEBUG is True in projects with no explicit LOGGING setting. Thanks to Andreas Pelme for report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-16 16:41:38 +00:00
Ramiro Morales 26b8122087 Fixed #14675 -- Completed removal of `from django.conf.urls.default import *` usage.
This applies to both our own [test] code and documentation examples. Also:
 * Moved the functions and handlers from `django.conf.urls.defaults` up to
   `django.conf.urls` deprecating the former module.
 * Added documentation for `handler403`.
 * Tweaked the URLs topic document a bit.

Thanks to pupeno and cdestigter for their great work contributing patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-11 22:36:16 +00:00
Jannis Leidel 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
Carl Meyer 43503b093a Fixed #16288 -- Enabled django.request exception logger regardless of DEBUG setting.
Thanks Matt Bennett for report and draft patch; Vinay Sajip and Russell Keith-Magee for review.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-22 06:01:44 +00:00
Luke Plant 524c5fa07a Fixed #14261 - Added clickjacking protection (X-Frame-Options header)
Many thanks to rniemeyer for the patch!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-30 22:27:47 +00:00
Adrian Holovaty f8495d2371 Fixed #15822 -- Removed references to the v1 postgresql backend (which has been removed). Thanks for the patch, aaugustin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-17 20:45:06 +00:00
Ramiro Morales a797b7dba0 Fixed #14130 -- Made manage.py error reporting more useful when the settings.py file triggers import errors (in new projects). Thanks Setok for the report, mk and steph for their work.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-13 01:56:12 +00:00
Jannis Leidel ff4a24af51 Fixed whitespace errors in settings modules.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 19:11:42 +00:00
Carl Meyer 0ffa39f744 Refs #14675 - Added import of url() function in project template urls.py, added commented sample named url, and converted existing sample patterns to use url().
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-04 17:37:25 +00:00
Carl Meyer a158873488 We have always been at war with 'import *'.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-03 04:55:43 +00:00
Carl Meyer 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
Jannis Leidel 544ab30ed7 Fixed #6218 -- Made MEDIA_URL and STATIC_URL require a trailing slash to ensure there is a consistent way to combine paths in templates. Thanks to Michael Toomim, Chris Heisel and Chris Beaven.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02 01:33:11 +00:00
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
Adrian Holovaty 5844cdca38 Small grammar fix in 'user-uploaded files' comment from [14560]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 23:48:08 +00:00
Ramiro Morales 74f46c0ae2 Fixed #10650 -- Clarified description of MEDIA_ROOT in setting files. Thanks jjconti, tvon, vak, Muhammad Alkarouri and thiggins for their work.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 15:42:54 +00:00
Carl Meyer 4ba6348a00 Fixed #14598 -- Changed some 'domain.com' uses to 'example.com'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 16:19:17 +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
Russell Keith-Magee 24acca4139 Fixed #12012 -- Added support for logging. Thanks to Vinay Sajip for his draft patch, and to the many people who gave feedback during development of the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-04 15:12:39 +00:00
Russell Keith-Magee f4dd38757c Fixed #13681 -- Added a commented out admindocs entry to the default INSTALLED_APPS for a new project. Thanks to elkan for the report, and andrews for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 12:38:05 +00:00
Jannis Leidel 44390aeb5d Fixed #13045 - Add USE_L10N to the project skeleton settings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 12:16:21 +00:00
Russell Keith-Magee 46cc7021a8 Fixed #1480 -- Added the ability to use the system timezone. Thanks to Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 15:33:27 +00:00
Jannis Leidel 2e91309c55 Fixed #12675 - Add the admin app to the project template settings.py for consistency with the urls.py. Thanks, stephanhoyer.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:39:45 +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
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
Luke Plant 25020ddb05 Fixed #4604 - Configurable message passing system, supporting anonymous users
This deprecates User.message_set in favour of a configurable messaging
system, with backends provided for cookie storage, session storage and
backward compatibility.

Many thanks to Tobias McNulty for the bulk of the work here, with
contributions from Chris Beaven (SmileyChris) and lots of code review from
Russell Keith-Magee, and input from many others.  Also credit to the authors
of various messaging systems for Django whose ideas may have been pinched
:-)



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-09 16:57:23 +00:00
Luke Plant 7230a995ce Moved contrib.csrf.* to core code.
There is stub code for backwards compatiblity with Django 1.1 imports.

The documentation has been updated, but has been left in
docs/contrib/csrf.txt for now, in order to avoid dead links to
documentation on the website.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 00:36:34 +00:00
Luke Plant 8e70cef9b6 Fixed #9977 - CsrfMiddleware gets template tag added, session dependency removed, and turned on by default.
This is a large change to CSRF protection for Django.  It includes:

 * removing the dependency on the session framework.
 * deprecating CsrfResponseMiddleware, and replacing with a core template tag.
 * turning on CSRF protection by default by adding CsrfViewMiddleware to
   the default value of MIDDLEWARE_CLASSES.
 * protecting all contrib apps (whatever is in settings.py)
   using a decorator.

For existing users of the CSRF functionality, it should be a seamless update,
but please note that it includes DEPRECATION of features in Django 1.1,
and there are upgrade steps which are detailed in the docs.

Many thanks to 'Glenn' and 'bthomas', who did a lot of the thinking and work
on the patch, and to lots of other people including Simon Willison and
Russell Keith-Magee who refined the ideas.

Details of the rationale for these changes is found here:

http://code.djangoproject.com/wiki/CsrfProtection

As of this commit, the CSRF code is mainly in 'contrib'.  The code will be
moved to core in a separate commit, to make the changeset as readable as
possible.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26 23:23:07 +00:00
Luke Plant 20f7e51493 Reverted 10094 and 10095 (in favour of solution that will hopefully land for beta 2)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-23 23:02:46 +00:00
Luke Plant 2d28724730 Added CSRF middleware to default settings and updated docs.
Updated docs to reflect the change, and the fact that using the
two separate middleware is preferred to using the combined one.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@10094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-19 23:14:20 +00:00
Jacob Kaplan-Moss 1f84630c87 Fixed #6470: made the admin use a URL resolver.
This *is* backwards compatible, but `admin.site.root()` has been deprecated. The new style is `('^admin/', include(admin.site.urls))`; users will need to update their code to take advantage of the new customizable admin URLs.

Thanks to Alex Gaynor.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-14 20:22:25 +00:00
Jacob Kaplan-Moss 24d7b49849 Fixed #8496: added a note about admindocs to the project template and the tutorial. Thanks, ericvw.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-02 16:52:42 +00:00
Jacob Kaplan-Moss e206eabc68 Fixed #7317: the x-view middleware is no longer enabled by default.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25 12:57:24 +00:00
Brian Rosner ee7a5cdd7d Fixed #8392 -- Corrected a typo in the project urls.py template. Thanks ramiro for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-18 13:52:26 +00:00
Jacob Kaplan-Moss f3ec0c18b1 Modified the comments in the skeleton urls.py to be more clear about how to enable the admin. Refs #7824.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8026 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-21 17:10:27 +00:00
Brian Rosner effa299342 Added admin.autodiscover() to project template urls.py. It is left commented out intentionally. Thanks tome for the suggestion. Refs #7824.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 18:09:27 +00:00
Brian Rosner a53a1ba541 Fixed #7842 -- Added a raw string identifier in project template urls.py for consistency sake. Added spaces for consistency too. Thanks yoshi.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 18:05:11 +00:00
Brian Rosner a19ed8aea3 Merged the newforms-admin branch into trunk.
This is a backward incompatible change. The admin contrib app has been
refactored. The newforms module has several improvements including FormSets
and Media definitions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18 23:54:34 +00:00
Gary Wilson Jr 9fcaf3504c Fixed #6431 -- Fixed misspelling in projects template settings file, thanks Daniel Lindsley.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7041 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-28 05:40:57 +00:00
Adrian Holovaty 863ee0ef89 Fixed #5395 -- Changed URL of all language codes in project_template/settings.py. Thanks, Jarek Zgoda and mikkel@hoegh.org
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-13 14:37:22 +00:00
Malcolm Tredinnick 4d42dc3846 Changed the URL reference for timezone specifications. It looks like PostgreSQL is removing that list from their docs (in 8.2) and this might also help avoid problems with people not noticing there are multiple entries per line in the current PostgreSQL docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-08-19 10:24:35 +00:00
Malcolm Tredinnick 501448e3f2 Fixed #4863 -- Removed comment references to a no-longer present link. Pointed
out by Thomas Güttler.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5693 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-14 12:48:24 +00:00
Malcolm Tredinnick fedcabea9e Added Oracle to the list of permitted DATABASE_ENGINE settings (and removed
ado_msql, since we don't have a working backend for that at the moment).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5543 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-06-26 12:58:42 +00:00
Malcolm Tredinnick dcc090e457 Fixed #4290 -- Added a warning about trailing slashes to the project settings
file. Thanks, mw@agami.at.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-06-01 10:00:00 +00:00