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

239 Commits

Author SHA1 Message Date
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
Russell Keith-Magee aba5389326 Fixed #10355 -- Added an API for pluggable e-mail backends. 
Thanks to Andi Albrecht for his work on this patch, and to everyone else that contributed during design and development.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-03 12:53:26 +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
Adrian Holovaty a251e0ab7e Fixed #11070 -- Removed JING_PATH setting, which was no longer used. Thanks for the patch, seanl 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-26 05:32:52 +00:00
Luke Plant cdc8c61bc3 Made default MIDDLEWARE_CLASSES same as in project_template. 
And updated docs, and also corrected them about middleware by removing
'XViewMiddleware'



git-svn-id: http://code.djangoproject.com/svn/django/trunk@10129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-23 23:20:40 +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
Malcolm Tredinnick e31ed8f2b1 Fixed #9574 -- Hindi translation from Thejaswi Puthraya. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-14 07:11:34 +00:00
Malcolm Tredinnick b69182fcc3 Added a couple of missed pieces from r9376. Refs #9542. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-10 10:24:51 +00:00
Malcolm Tredinnick 62c3a7a625 Fixed #9410 -- I did not spell Portuguese correctly 18 months ago. Fixed now. 
Thanks, kimus.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-24 04:37:51 +00:00
Jacob Kaplan-Moss 23f012dbfa Cleaned up a bunch of minor doc stuff: 
* Removed flatpages/redirects README; no other contrib apps have those.
  * Cleaned up top-level README to be more readable.
  * Removed outdated references to old docs (Fixes #8701)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 16:42:13 +00:00
Jacob Kaplan-Moss ff420b4364 Fixed #8454: added a FILE_UPLOAD_PERMISSIONS setting to control the permissoin of files uploaded by the built-in file storage system. Thanks, dcwatson. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 22:21:14 +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
Jacob Kaplan-Moss 7899568e01 File storage refactoring, adding far more flexibility to Django's file handling. The new files.txt document has details of the new features. 
This is a backwards-incompatible change; consult BackwardsIncompatibleChanges for details.

Fixes #3567, #3621, #4345, #5361, #5655, #7415.

Many thanks to Marty Alchin who did the vast majority of this work.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 20:59:02 +00:00
Luke Plant fcd837cd0f Fixed #7723 - implemented a secure password reset form that uses a token and prompts user for new password. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-31 20:47:53 +00:00
Malcolm Tredinnick bfcecbffd3 Changed/fixed the way Django handles SCRIPT_NAME and PATH_INFO (or 
equivalents). Basically, URL resolving will only use the PATH_INFO and the
SCRIPT_NAME will be prepended by reverse() automatically. Allows for more
portable development and installation. Also exposes SCRIPT_NAME in the
HttpRequest instance.

There are a number of cases where things don't work completely transparently,
so mod_python and fastcgi users should read the relevant docs.

Fixed #285, #1516, #3414.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-21 07:57:10 +00:00
Jacob Kaplan-Moss d725cc9734 Fixed #2070: refactored Django's file upload capabilities. 
A description of the new features can be found in the new [http://www.djangoproject.com/documentation/upload_handing/ upload handling documentation]; the executive summary is that Django will now happily handle uploads of large files without issues.

This changes the representation of uploaded files from dictionaries to bona fide objects; see BackwardsIncompatibleChanges for details.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-01 15:10:51 +00:00
Jacob Kaplan-Moss 7ecd4867a5 Fixed #7458: added Lithuanian to LANGUAGES. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-18 20:53:55 +00:00
Jacob Kaplan-Moss 8cb4895c68 Added Estonian to global_settings.LANGUAGES. Refs #7141. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-18 20:51:22 +00:00
Adrian Holovaty a08b2dd328 Negligible comment typo fixes 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-12 03:37:13 +00:00
Jacob Kaplan-Moss 8d4f79a799 Fixed #2548: added get/set_expiry methods to session objects. Thanks, Amit Upadhyay and SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7586 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-07 20:28:06 +00:00
Luke Plant 8c9fceebb1 Added DEBUG_PROPAGATE_EXCEPTIONS setting that helps testing under e.g. twill 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-05-16 23:24:36 +00:00
Malcolm Tredinnick 42ba428166 Fixed #6910 -- Updated Brazilian Portugese translation from Guilherme M. Gondim 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-05 02:50:01 +00:00
Malcolm Tredinnick c30a050e41 Removed the ado_mssql database backend. 
It has not been maintained, contains bugs, and improved versions are available
externally(e.g. django-mssql and django-pyodbc at Google code).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-26 08:25:48 +00:00
Adrian Holovaty 0e552e5cd6 Edited some docs changes from the past few days 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7361 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-25 04:42:21 +00:00
Malcolm Tredinnick 9e47cc2e51 Fixed #5507 -- Use a more portable way to get at the system's tmpdir (fixes a 
problem with the default on Windows). Thanks, Philippe Raoult.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-20 06:43:58 +00:00
Malcolm Tredinnick efed04b634 Fixed #5603 -- Allow customization of the language cookie name. Thanks, moe. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-29 18:38:44 +00:00
Malcolm Tredinnick 99b200dac7 Changed the name of the "ga" locale to "Irish" in the settings file. 
We use the English names for all the langauges in there.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-19 03:40:24 +00:00
Malcolm Tredinnick 68e43660d8 Fixed #6617 -- Added new Georgian (ka) translation from David Avsajanishvili. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-19 03:38:16 +00:00
Malcolm Tredinnick 87ca6ae4cc Fixed #6607 -- Added a new Basque (eu) translation. Thanks ibonso@gmail.com. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-15 11:29:27 +00:00
Malcolm Tredinnick 0a3c8f03e0 Fixed #6409 -- Unbreak compound locale name parsing (e.g. zh-cn). 
This was inadvertently broken back in [6608]. Slightly backwards-incompatible:
people specifying "es_AR" in their LANGUAGES list will need to change that to
"es-ar". Thanks, simonb and Ramiro Morales for making the effort to fix this.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-06 01:04:30 +00:00
Malcolm Tredinnick f6a3b499b8 Fixed #6086 -- Deprecate the "simple" cache backend in favour of "locmem". 
Thanks, Paul Bissex.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-02 00:35:14 +00:00
Ian Kelly bbc3a95557 Fixed #6007: Added DEFAULT_TABLESPACE and DEFAULT_INDEX_TABLESPACE 
options to global_settings.py


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-01 19:23:49 +00:00
Gary Wilson Jr 1607acee40 Fixed #5978 -- Gave `LOCALE_PATHS` a default setting of an empty tuple and removed some code that was checking for its existance in settings before accessing it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-19 05:59:58 +00:00
Malcolm Tredinnick 5f51964be2 Changed the location of language codes to match the project settings file from [6123]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-21 16:20:02 +00:00
Malcolm Tredinnick e172e7be57 Fixed #4724 -- Added support for configurable session cookie paths. Helps with 
multiple Django installs under the same hostname. Thanks, frej and Graham
Dumpleton.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6545 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-20 05:13:56 +00:00
Jacob Kaplan-Moss bcf7e9a9fe Fixed #2066: session data can now be stored in the cache or on the filesystem. This should be fully backwards-compatible (the database cache store is still the default). A big thanks to John D'Agostino for the bulk of this code. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6333 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-15 21:29:14 +00:00
Malcolm Tredinnick 5ce8a38933 Fixed #5456 -- Added a new Irish translation. Thanks, Michael Thornhill. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-15 04:43:48 +00:00
Malcolm Tredinnick 972e77f7e8 Fixed #5279 -- Added Khmer translation. Thanks, Sengtha Chay! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-13 19:51:26 +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 478926ffde Fixed #5141 -- Added Croation translation. Thanks, Aljosa Mohorovic. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-13 01:17:19 +00:00
Malcolm Tredinnick ea1544e938 Fixed #4624 -- Added Persian ('fa') to the list of right-to-left languages. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-11 06:28:51 +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 79e914e496 Added CACHE_MIDDLEWARE_SECONDS to global settings and documentation (it's 
used by the cache middleware). Refs #1015.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-05 11:08:40 +00:00
Malcolm Tredinnick 953badbea5 Merged Unicode branch into trunk (r4952:5608). This should be fully 
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-04 12:11:04 +00:00
Malcolm Tredinnick 786fab6d84 Fixed #4624 -- Added new Persian (fa) translation. Thanks, Reza Mohammadi. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5523 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-24 12:16:06 +00:00
Malcolm Tredinnick 130c7eee80 Fixed #4517 -- Made sure that URL_VALIDATOR_USER_AGENT includes the up-to-date 
Django version number. Thanks, James Wheare.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5451 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-10 02:00:46 +00:00
Malcolm Tredinnick 0c4385bb02 Added new TEST_DATABASE_CHARSET and TEST_DATABASE_COLLATION settings to ensure 
that databases are created with the expected encoding during testing.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-29 12:42:08 +00:00
Russell Keith-Magee d9f6470f2d Fixed #1278 -- Added a context processor that puts MEDIA_URL in the context, and added that context processor to the default set. Thanks to Ubernostrum for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-29 11:09:24 +00:00
Malcolm Tredinnick 5152b55b38 Fixed #4283 -- Added Bulgarian translation. Thanks Jordan Dimov. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-14 08:12:03 +00:00
Malcolm Tredinnick 7a84ad93e6 Fixed #2897 -- Added support for TLS connections to email handling. This means 
servers like Google's SMTP server can now be used for admin emails.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-03 13:35:02 +00:00
Malcolm Tredinnick 5dfe74f221 Fixed #3185 -- Made values for login, logout and post-login redirect URLs 
configurable. This is a combined patch from Vasily Sulatskov, Marc Fargas and
Collin Grady.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-25 08:49:57 +00:00
Malcolm Tredinnick 66356056a5 Fixed #3943 -- Added Korean translation. Thanks, Hyun Mi Ae. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 11:58:25 +00:00
Malcolm Tredinnick f708bd69c9 Fixed #3745 -- Added Portugese (pt) translation. Thanks Nuno Mariz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-20 23:57:24 +00:00
Malcolm Tredinnick 20a240cf51 Fixed #3673 -- Added new Telugu (te) localisation. Thanks, pavithran s. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-09 04:42:30 +00:00
Russell Keith-Magee f2582eb972 Fixes #2333 -- Added test fixtures framework. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-01 13:11:08 +00:00
Jacob Kaplan-Moss 8930f3d027 Fixed #3589: settings templates and default settings now mention psycopg2 instead of psycopg1. Thanks (again), Mark Fargas. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-27 00:02:40 +00:00
Malcolm Tredinnick b1fbfb3f61 Fixed #3251 -- Added Kannada (kn) translations. Thanks to the volunteers from 
http://dev.sampada.net/.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-26 08:23:33 +00:00
Malcolm Tredinnick 278e224d67 Fixed #3329 -- Added Catalan (ca) translation. Thanks Marc Fargas. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4513 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-15 00:07:07 +00:00
Malcolm Tredinnick 4717291d0d Fixed #3093 -- Added Macedonian translation from Georgi Stanojevski 
<glisha@gmail.com>.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4510 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-14 23:56:29 +00:00
Malcolm Tredinnick d9953d6095 Fixed #3058 -- Added partial Latvia translation from viestards.lists@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-14 23:50:26 +00:00
Adrian Holovaty 06a5370e6a Fixed #1977 -- Changed postgresql.org URL in global_settings.py and project_template/settings.py. Thanks, regexbot@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-12-15 15:56:42 +00:00
Adrian Holovaty a84404c190 Formatting fixes from the past round of checkins 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-07 19:07:27 +00:00
Jacob Kaplan-Moss fef89a01c5 Fixed #2866: Added DATABASE_OPTIONS setting which gets passed as extra kwargs to the backend's connect method. Thanks, ymasuda. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4048 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-07 05:17:38 +00:00
Jacob Kaplan-Moss 4d59730fad Fixed #2934: greatly improved the accuracy if the isExistingURL check. Also introduced a new setting, URL_VALIDATOR_USER_AGENT, which is the User-Agent that the validator will use to check for URL existance. Thanks, Jeremy. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4035 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-07 02:20:08 +00:00
Georg Bauer 0d240504ca fixed #2911: added polish to the default languages 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-10-16 16:23:28 +00:00
Adrian Holovaty f638234932 Removed ENABLE_PSYCO setting. If you still need to use this, write custom middleware that activates psyco for you. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-28 02:31:05 +00:00
Adrian Holovaty 321a59a36a Small improvements to profanities-to-settings move from [3784] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-25 17:38:35 +00:00
Georg Bauer 9194038121 fixed #2623: added new turkish translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-25 13:30:16 +00:00
Malcolm Tredinnick b46a093c45 Fixed #2678 -- Moved the list of profanities for the hasNoProfanities validator 
into global_settings. Patch from Matt Croydon.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-22 02:48:19 +00:00
Georg Bauer 2535c91c5b fixed #2617: added finnish translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-11 14:53:36 +00:00
Russell Keith-Magee d78e2ae355 Refs #2333 - Added a TEST_DATABASE_NAME setting that can be used to override the 'test_' + DATABASE_NAME naming policy. This setting is then used in runtests.py to restore the use of 'django_test_db' as the Django model/regression test database. Thanks to Michael Radziej for the feedback. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-01 13:33:26 +00:00
Russell Keith-Magee 77ab11be45 Refs #2333 - Added 'test' target to django-admin script. Includes addition of --verbosity and --noinput options to django-admin, and a new TEST_RUNNER setting to control the tool used to execute tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-27 12:46:39 +00:00
Adrian Holovaty 45be33a632 Fixed #2523 -- Added SESSION_COOKIE_SECURE setting. Thanks, mir@noris.de 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-12 06:02:28 +00:00
Georg Bauer f3e3869e09 fixed #2371: added tamil translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-21 14:47:14 +00:00
Georg Bauer 8c399ba5b6 fixed #2302: added arabic translation. thx Ahmad Alhashemi. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-10 14:14:00 +00:00
Adrian Holovaty ec4a143a40 Made django/utils/translation.py into a package django/utils/translation, which is loaded lazily depending on the value of settings.USE_I18N. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-04 03:58:45 +00:00
Adrian Holovaty 4a324ba7ac Added USE_I18N setting, which lets you turn off internationalization overhead with a single setting. Defaults to True. Currently only affects the admin i18n JavaScript, but I'll be adding other optimizations. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-01 03:09:14 +00:00
Jacob Kaplan-Moss aab3a418ac Merged multi-auth branch to trunk. See the authentication docs for the ramifications of this change. Many, many thanks to Joseph Kocherhans for the hard work! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-28 16:37:02 +00:00
Adrian Holovaty ab2fb1634f Fixed #2062 -- Added YEAR_MONTH_FORMAT and MONTH_DAY_FORMAT settings, and added technical message IDs of the same names. Thanks, ramiro 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-02 04:20:32 +00:00
Adrian Holovaty 26b61aa813 Fixed #395 -- Added SESSION_EXPIRE_AT_BROWSER_CLOSE setting, which regulates whether session framework should use browser-session-length cookies. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3049 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-01 22:25:06 +00:00
Adrian Holovaty be25b661b1 Fixed #1998 -- Changed double quotes to single quotes 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-26 04:05:02 +00:00
Georg Bauer b6b64737fc fixed #1915: new argentinean spanish (es_AR) translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-24 14:22:05 +00:00
Georg Bauer d2ba1c3cca fixed #1831: added hungarian translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-16 07:41:39 +00:00
Georg Bauer ca197739d9 fixed #1660: added support functions and tags for bidi language support 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-16 07:35:20 +00:00
Adrian Holovaty f69cf70ed8 MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-02 01:31:56 +00:00
Adrian Holovaty 8d70ed4b25 Fixed #1555 -- Added EMAIL_PORT setting. Thanks, bde3 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-04-11 03:23:03 +00:00
Georg Bauer 158aeb7b97 fixed #1581 - added new hebrew translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-04-06 09:58:05 +00:00
Georg Bauer 3d8094f898 fixed #1587 - added new ukrainian translation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-04-06 09:52:06 +00:00
Adrian Holovaty fe24eca81a Fixed #1529 -- Added support for authenticated SMTP to django.core.mail. Thanks, Bruce Kroeze 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-03-22 19:47:15 +00:00
Georg Bauer 732210320a fixed #1520 - added new greek translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-03-20 10:38:41 +00:00
Georg Bauer f21b75a280 fixed #1521 - new slovenian translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-03-20 10:35:14 +00:00
Adrian Holovaty e0c915ec39 Added TEMPLATE_STRING_IF_INVALID setting, which specifies what the template system should output in case of invalid variables. Default is empty string (to match current behavior) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-02-09 00:31:51 +00:00
Adrian Holovaty 567e4e4411 Fixed #1323 -- Added ENABLE_PSYCO. Thanks, Wojtek. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-02-03 15:18:20 +00:00
Adrian Holovaty 1dc65cb6ab Fixed #1271 -- Added a 'request' template context processor, which is not activated by default. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-01-27 15:55:04 +00:00
Georg Bauer a6404e24ec updated translation strings and added dutch to LANGUAGES 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-01-12 22:08:00 +00:00
Georg Bauer e08e19604f fixes #1129 - added new 'zh-tw' translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-12-28 22:58:41 +00:00
Adrian Holovaty 49fd163a95 Fixed #925 -- Added TEMPLATE_CONTEXT_PROCESSORS, which lets you specify processesors for DjangoContext. Thanks, Luke Plant 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-12-24 04:39:59 +00:00
Adrian Holovaty e6745d3420 Fixed #857 -- Changed default session cookie name from hotclub to sessionid. Django is now 10% less pornish. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-12-09 03:39:31 +00:00
Adrian Holovaty 5d863f1fbd Fixed #603 -- Added template debugging errors to pretty error-page output, if TEMPLATE_DEBUG setting is True. Also refactored FilterParser for a significant speed increase and changed the template_loader interface so that it returns information about the loader. Taken from new-admin. Thanks rjwittams and crew 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-23 23:10:17 +00:00
Adrian Holovaty 3895a825a9 Added SESSION_SAVE_EVERY_REQUEST setting. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-20 17:16:13 +00:00
Georg Bauer 29be17533a added new danish translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-15 18:37:41 +00:00
Georg Bauer fdf2738f0e fixes #751, added new icelandic translation (thx Dagur), updated the serbian translation and updated .po files for updated global_settings (because of the new language) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-13 19:38:31 +00:00
Georg Bauer 0bff994e25 added swedish to the global settings LANGUAGES 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1216 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-13 18:02:55 +00:00
Adrian Holovaty 1873c95b31 Added INSTALLED_APPS to global_settings. It's an empty tuple by default. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-11 22:56:18 +00:00
Adrian Holovaty 1b035c35d9 BACKWARDS-INCOMPATIBLE CHANGE -- Moved flatpages and redirects to standalone apps in django.contrib that are NOT installed by default. See http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges for full migration information. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-11 04:45:05 +00:00
Georg Bauer 2188f19286 fixes #762 - new bengali translation. Thx. b.ghose 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-10 11:50:24 +00:00
Georg Bauer ce0876bcc4 added ro and cy to the LANGUAGES setting 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-09 10:25:02 +00:00
Adrian Holovaty de5ea0d879 Added Slovak (sk) translation. Thanks, Vlado 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-07 03:42:38 +00:00
Adrian Holovaty d4df074d41 Fixed #109 -- Created DATE_FORMAT, DATETIME_FORMAT and TIME_FORMAT settings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-06 23:49:03 +00:00
Adrian Holovaty 5defabca11 Reordered MEDIA_ROOT and MEDIA_URL in global_settings so they're not in the COMMENTS section 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1109 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-06 23:16:24 +00:00
Adrian Holovaty a734759fa0 Renamed language no_NB to no 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1083 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-04 16:09:38 +00:00
Adrian Holovaty 9d188cf3bb Added Norwegian translation -- Thanks Espen 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1080 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-04 15:30:15 +00:00
Adrian Holovaty 9f92a2b92b Renamed 'Traditional Chinese' to 'Simplified Chinese' and updated po files 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-04 14:53:24 +00:00
Jacob Kaplan-Moss 5cf8f68423 Merged i18n branch into the trunk! Fixes #65, and perhaps some others. NB: this means that the i18n branch is now obsolete and will be made read-only. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-04 04:59:46 +00:00
Adrian Holovaty d310b108f4 Changed global_settings.TEMPLATE_LOADERS to be same as default project_template.settings.TEMPLATE_LOADERS 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1011 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-25 02:02:58 +00:00
Adrian Holovaty 8b7ebca68a Changed global_settings.ADMIN_FOR from [] to () 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-17 04:36:51 +00:00
Adrian Holovaty 57b4f231fd Fixed #583 -- Added app_directories template loader, which searches for templates in 'templates' directory in each INSTALLED_APPS package. It's turned off by default. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-17 02:37:50 +00:00
Adrian Holovaty 24154b2166 Fixed #225 -- Added first stab at MS SQL Server support (via ADO). Thanks to gmilas@gmail.com for the patch 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-15 01:37:16 +00:00
Adrian Holovaty 7aefff7833 Fixed #582 -- Added support for loading templates from Python eggs, and a TEMPLATE_LOADERS setting, which defines which loaders to use. Thanks, Sune 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-14 22:22:12 +00:00
Adrian Holovaty f2088d456c Fixed #618 -- Added DATABASE_PORT setting. Thanks, Esaj 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-14 03:43:01 +00:00
Adrian Holovaty b6fd05e445 Added CACHE_MIDDLEWARE_KEY_PREFIX to global_settings 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-09 01:02:19 +00:00
Adrian Holovaty ab9aacd4db Fixed #333 and #440 -- Split DEFAULT_MIME_TYPE setting into DEFAULT_CONTENT_TYPE and DEFAULT_CHARSET. Thanks, Maniac. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-06 02:27:08 +00:00
Adrian Holovaty c3fa47edb8 Added USE_FLAT_PAGES setting, which defaults to True. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-05 23:36:17 +00:00
Jacob Kaplan-Moss 837afc5a29 Changed default JING_PATH setting to be something that might actually be useful. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-04 18:05:37 +00:00
Jacob Kaplan-Moss cd34c163cc Moved JING from django.core.validators into settings where it belongs. Fixes #568. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-27 16:34:10 +00:00
Jacob Kaplan-Moss 2d1303bd68 Added EMAIL_SUBJECT_PREFIX setting so you can customize the "[Django]" prefix 
on emails send with mail_admins/mail_managers.  Refs #568.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-27 16:32:21 +00:00
Adrian Holovaty 36fc73a45b Fixed #333 -- Added DEFAULT_MIME_TYPE setting, and set it to 'text/html; charset=utf-8' by default 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-23 01:50:01 +00:00
Adrian Holovaty f55f98f989 Fixed #500 -- Created a TEMPLATE_FILE_EXTENSION setting that lets you override the default '.html' if you want to use a different extension (or none at all) for templates 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-14 01:24:36 +00:00
Adrian Holovaty 72109f4e35 Added SessionMiddleware to MIDDLEWARE_CLASSES in global_settings, so it's available by default. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-08-16 23:02:06 +00:00
Adrian Holovaty 07889c13a6 Fixed #1 -- Added anonymous session support via middleware and request.session. Removed the former request.session, which wasn't being used anyway. Removed auth.Session model. See the BackwardsIncompatibleChanges wiki page for IMPORTANT notes on code you'll have to change and a DB table you'll have to create. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@518 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-08-16 22:54:05 +00:00
Adrian Holovaty 77faac0cb7 Changed SEND_BROKEN_LINK_EMAILS from True to False in global_settings -- it was causing too much confusion with improperly configured/missing mail servers 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-08-01 20:01:18 +00:00
Adrian Holovaty a1f479e080 Fixed #147 -- Thanks, Robin Munn! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-07-22 04:18:03 +00:00
Adrian Holovaty 897d24b220 Fixed #95 -- Added SECRET_KEY setting instead of hard-coding keys that are shared for every Django installation. 'django-admin.py startproject' now creates a random SECRET_KEY. The auth and comments modules, and the admin middleware, all use SECRET_KEY now, instead of hard-coded values. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-07-20 00:37:45 +00:00
Adrian Holovaty 68baafc110 Added ADMIN_MEDIA_PREFIX setting instead of hard-coding /m/ 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-07-16 16:38:28 +00:00
Adrian Holovaty 8c098891e2 Removed World-Online-specific stuff from django.conf.global_settings 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-07-14 04:27:55 +00:00
Adrian Holovaty d3abdd8731 Removed hard-coded Adrian and Jacob in global_settings.ADMINS 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-07-14 04:03:11 +00:00
Adrian Holovaty ed114e1510 Imported Django from private SVN repository (created from r. 8825) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-07-13 01:25:57 +00:00