Commit Graph

1680 Commits

Author SHA1 Message Date
Georg Bauer cdec3d85e2 fixed #3013: fixed typos in the 'de' translation. Additionally added a few missing translations.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-15 17:30:02 +00:00
Georg Bauer e0b83b6929 fixed #2981: updated es_AR translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-15 17:23:18 +00:00
Georg Bauer 5163120587 fixed #2999: updated greek translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-15 17:15:28 +00:00
Adrian Holovaty ab6fd7328f Fixed typo in 'incorrect backend' database error message
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-13 05:02:45 +00:00
Adrian Holovaty 83c40fb922 Fixed bug in [4058], in django/core/mail.py. Thanks, Igor Goryachev
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4065 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-10 17:42:47 +00:00
Adrian Holovaty 6a53c8a2dd Fixed #2997 -- Fixed URLField validation in django.newforms. Thanks, jkocherhans
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-10 03:39:00 +00:00
Adrian Holovaty 4b4efced54 Fixed #3007 -- Fixed Python 2.4-ism from [4051] in django/core/mail.py. Also cached the result of socket.getfqdn(). Thanks for the patch, SmileyChris
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-10 03:28:58 +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 6f164ad485 Fixed #2991: Added Message-ID header to messages sent from Django. Thanks, Graham King.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 15:32:18 +00:00
Jacob Kaplan-Moss b1b4e8e7c4 Fixed #2800: the ifchanged tag now can optionally take paramaters to be checked for changing (instead of always using the content). Thanks, Wolfram Kriesing.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 05:36:51 +00:00
Jacob Kaplan-Moss a14dba5eed Fixed #2848: broken doctest in comment app. Thanks, dummy@habmalnefrage.de
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4049 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 05:20:00 +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 afb2366430 Fixed #2875: made urlresolvers.get_mod_func() deal with non-qualified callbacks better. Thanks, Matt McClanahan.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 05:05:16 +00:00
Jacob Kaplan-Moss a1199d8528 Fixed #2894: XML deserializer now correctly handles null primary keys.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4046 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 05:01:35 +00:00
Jacob Kaplan-Moss 86143f7599 Fixed #2913: CursorDebugWrapper no longer double-tuple-izes parameters. Thanks, artdent@freeshell.org
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 05:00:19 +00:00
Jacob Kaplan-Moss 92151b2d28 Fixed #2914: filesizeformat no longer dies on invalid values. Thanks, dev@simon.net.nz
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 04:58:10 +00:00
Jacob Kaplan-Moss febe05b9ef Fixed #2921: deserialization no longer failes on NULL primary keys. Thanks, mir@noris.de.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4043 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 04:56:50 +00:00
Jacob Kaplan-Moss e39a8e947e Fixed #2701: Added "fields" argument to serializers.serialize. Thanks, Deryck.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4042 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 04:50:13 +00:00
Jacob Kaplan-Moss d4d1a22730 Fixed #2575: ObjectPaginator now accepts a "orphans" option to prevent pages with only a few items. Thanks, SmileyChris.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4041 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 04:44:27 +00:00
Jacob Kaplan-Moss dabf036604 Fixed #2452: comments can now be put within initial SQL files. Thanks, Pawel J. Sawicki.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 04:31:35 +00:00
Jacob Kaplan-Moss 3a0733e12c Fixed #2364: added NumberIsInRange validator. Thanks, Matt McClanahan.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4039 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 04:29:07 +00:00
Jacob Kaplan-Moss 4cb2247327 Fixed #2343: Library.inclusion_tag now accepts a list of template names along with a single name. Thanks, mderk@yandex.ru
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4038 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 04:13:06 +00:00
Adrian Holovaty a888249770 Implemented [4035] (improvement in URL validation) in django.newforms
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 02:32:33 +00:00
Jacob Kaplan-Moss a4d86a7fb0 Fixed #2923: FileFields can now be modified on windows. Thanks, radek.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 02:25:49 +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
Jacob Kaplan-Moss 212cb21baa Fixed #2972: prepopulate_from now works with multiple slugs on the same field. Thanks, Archatas.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 02:04:06 +00:00
Jacob Kaplan-Moss 0fd9f6ec6b Fixed $2973: added minspare/maxspare/maxchildren options to runfcgi. Thanks, James Crasta.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4033 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 02:01:16 +00:00
Jacob Kaplan-Moss 726756bdd5 Fixed #2975: dateparse.js now correctly handles the last day of the year. Thanks, wangbin@exoweb.net.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4032 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 01:59:46 +00:00
Jacob Kaplan-Moss 644af2213d Fixed #2899: added defaults for data and error_dict params to FormWrapper. Thanks, john@sneeu.com.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-06 22:56:23 +00:00
Jacob Kaplan-Moss b6a1789330 Fixed #1021: unique_together should now get validated correctly. Thanks, wam@cisco.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4028 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-06 22:51:00 +00:00
Adrian Holovaty 46b0713315 django.newforms: Implemented hook for validation not tied to a particular field. Renamed to_python() to clean() -- it's just...cleaner. Added Form.as_table(), Form.as_url(), Form.as_table_with_errors() and Form.as_ul_with_errors(). Added ComboField. Updated all unit tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-04 20:49:59 +00:00
Georg Bauer 88029f7700 fixed #2974: updated pt_BR translations
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-03 13:18:07 +00:00
Russell Keith-Magee 77bdaa76df Removed fossilized remnant of pre-magic removal m2m code. Thanks for the report, Baurzhan Ismagulov.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-03 02:14:46 +00:00
Russell Keith-Magee 7f71ae1b8d Fixes #2918 -- Clarified the db_prep_save logic for DateField and DateTimeField to prevent accidental conversion of non-datetime objects into strings, because SQLite doesn't appear to check for valid date format in a string used on an UPDATE of a datetime column.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-02 14:24:31 +00:00
Adrian Holovaty 6645d1fe48 Added ChoiceField, MultipleChoiceField to django.newforms
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-02 03:16:12 +00:00
Adrian Holovaty 36786d28f5 Implemented SelectMultiple in django.newforms.widgets
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-02 01:06:12 +00:00
Adrian Holovaty c0eab791df Added PasswordInput, HiddenInput, FileInput, Select to django.newforms.widgets
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-01 23:53:37 +00:00
Adrian Holovaty c58fe999a1 Added URLField to django.newforms.fields
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-01 23:52:43 +00:00
Russell Keith-Magee 7bff9cc368 Fixes #2969 -- Added maxRequests option for FCGI servers. Thanks, Michael Radziej.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-31 12:27:55 +00:00
Adrian Holovaty 41d11a685f Fixed #2968 -- Changed arguments to __import__ to use empty dictionary instead of empty string, for stricter compliance with Python library reference. Thanks for the patch, Yasushi Masuda
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-30 20:50:27 +00:00
Russell Keith-Magee 6d1335c058 Fixes #2966 -- Added extra_context parameter to direct_to_template generic view to keep it aligned with capabilities of other generic views. Thanks, wam-djangobug@wamber.net.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-30 14:30:43 +00:00
Russell Keith-Magee 5ec32a1c2d Fixes #2965 -- Added i18n for joiner used in validation error messages. Thanks, ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-30 13:54:28 +00:00
Russell Keith-Magee cb93c0d0da Fixes #2964 -- Fixed typo in regex in docstring for redirect_to. Thanks, wam-djangobug@wamber.net.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-30 13:49:45 +00:00
Adrian Holovaty 88a2f53b85 Split django.newforms into forms, fields, widgets, util. Also moved unit tests from docstrings to a standalone module in tests/regressiontests/forms, to save docstring memory overhead, keep code readable and fit our exisitng convention
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-28 20:34:37 +00:00
Adrian Holovaty 4d596a1f64 Added django.newforms -- work-in-progress of the new framework for forms/validators/manipulators
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-28 19:02:26 +00:00
Adrian Holovaty 4baeadb9a2 Fixed #2956 -- Made 'django-admin.py startproject' tolerant of filesystem arrangements that cannot accept file-permission changes. Thanks for the patch, masonsimon+django@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-27 02:19:32 +00:00
Adrian Holovaty 48234a0925 Fixed #2961 -- Added 'opencomment' and 'closecomment' options to {% templatetag %} templatetag. Thanks for the patch, Jeong-Min Lee
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-27 01:58:13 +00:00
Jacob Kaplan-Moss ed27ff9aa9 Fixed ngettext bug in comments post view
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-25 21:56:17 +00:00
Georg Bauer 94386f6109 fixed #2942: updated 'ja' translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-25 16:05:07 +00:00
Adrian Holovaty 6fa3498d9f Reverted [3919] because it requires mod_python 3.2.10+
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-25 02:55:51 +00:00
Adrian Holovaty 3536f89108 Fixed #2932 -- Added more details to the warning message in 'manage.py reset'. Thanks for the patch, pb@e-scribe.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 22:21:55 +00:00
Adrian Holovaty 60b46d72ac Fixed #648 -- Added comment syntax to template system: {# #}. Thanks for the patch, mccutchen@gmail.com and Hawkeye
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 21:30:38 +00:00
Adrian Holovaty fa49edc7bd Fixed #2890 -- Added default values of False for auth.User is_staff and is_superuser. Thanks for the suggestion, dummy@habmalnefrage.de
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 20:45:28 +00:00
Adrian Holovaty 6b384e828d Fixed #2826 -- Added .is_authenticated() check before login() in comments views
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 17:00:03 +00:00
Adrian Holovaty 9c4918e16d Fixed #2865 -- Reverted [3866] (problem with mod_python SERVER_PORT
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 16:54:32 +00:00
Adrian Holovaty 185a5f6614 Fixed #2898 -- Added missing ngettext import to django.db.models.fields.related
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 16:49:19 +00:00
Adrian Holovaty 1c4ac051ce Fixed #2925 -- Added missing exception import to admin.views.auth. Thanks, SmileyChris
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 16:46:46 +00:00
Adrian Holovaty 179d410a7a Fixed #2937 -- Added __eq__, __ne__ and __hash__ for AnonymousUser. Thanks, favo@exoweb.net
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 16:42:03 +00:00
Adrian Holovaty 3f9ebe6cc5 Fixed #2943 -- Changed admin select filter box to work properly with multi-byte characters in verbose_name. Thanks, mtsuyuki@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 16:37:51 +00:00
Adrian Holovaty b0a8a75fc3 Fixed #2955 -- Fixed incorrect verbose-name display in admin delete_stage message. Thanks for the patch, mattimustang@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 16:35:04 +00:00
Adrian Holovaty 8a8472d300 Changed django.core.handlers.modpython ModPythonRequest.is_secure() to use req.is_https(). Thanks, Jeremy Dunck
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 16:07:39 +00:00
Russell Keith-Magee c3c090ab13 Fixes #2915 -- Fixed typo in validation error message. Thanks, Matt Riggott.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-17 00:45:46 +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
Georg Bauer 0107d59571 fixed #2851: updated turkish language files
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3904 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-16 16:22:15 +00:00
Russell Keith-Magee fbbbf8b9a1 Fixes #2737 -- Added code to allow None as a query value for __exact queries, raising an error otherwise. __exact=None is interpreted as the SQL 'value = NULL'. This fixes some minor problems with queries on unsaved objects with related object sets, and stops queries with a value of None being outright ignored (even if they reference an unknown attribute).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-14 02:48:05 +00:00
Georg Bauer f83e439efa fixed #2876: updated japanese translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-10 11:53:12 +00:00
Georg Bauer 69396ea816 fixed #2887: updated czech translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-10 11:51:45 +00:00
Jacob Kaplan-Moss aaa3411a0a Made the !NoReverseMatch exception fail silently within templates (so that model.permalink doesn't cause templates to break for a broken permalink function).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-09 23:24:48 +00:00
Russell Keith-Magee afd9b87711 Fixed problem with debug message arguments.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-09 05:55:04 +00:00
Russell Keith-Magee 8f91717c82 Modified sql_index function names to match pattern established by initial_data functions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-03 13:58:33 +00:00
Russell Keith-Magee f5087775b3 Refs #1828 -- Added creation of indexes as a step in syncdb. This is an interim solution; the long term solution requires a non-trivial refactoring of syncdb, install and the get_* calls in management.py. Thanks to mdt@emdete.de for the original report, and to Simon Greenhill for prodding me to an interim fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3893 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-03 13:46:11 +00:00
Russell Keith-Magee b08a8dbb65 Cleaned up and clarified some log messages and docstrings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-03 13:23:49 +00:00
Russell Keith-Magee d886e71f2b Factored out per-model index generation code.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-03 13:05:10 +00:00
Russell Keith-Magee 67eabb9299 Modified the default verbosity to be 1 (normal), and added some syncdb messages at verbosity 2.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-03 12:57:05 +00:00
Russell Keith-Magee b5a7122408 Added ability to use --noinput flag for application reset.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-03 10:01:50 +00:00
Russell Keith-Magee bf6257f1ee Altered the order of arguments to the test function to match common practice in the rest of management.py.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-03 09:53:12 +00:00
Russell Keith-Magee fa4bb1b093 Clarified documentation to indicate that authenticating a user doesn't imply that they are active. Reinforced the fact that has_perm only returns true if user is active, and fixed a minor bug to that effect.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-30 01:21:03 +00:00
Russell Keith-Magee 14fb13da7e Disabled access to the admin site for inactive accounts, and clarified documentation regarding User.is_active. Thanks to Enrico <rico.bl@gmail.com> for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-29 13:37:58 +00:00
Adrian Holovaty c0127f015b Folded BaseHandler.get_technical_error_response() into BaseHandler.get_response() to save the overhead of a function call, and because that logic didn't need to be abstracted.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-28 02:37:41 +00:00
Adrian Holovaty f22cd4ec05 Folded BaseHandler.get_friendly_error_response() into BaseHandler.get_response() to save the overhead of a function call, and because that logic didn't need to be abstracted.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3878 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-28 02:34:48 +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 beeb719c12 Folded django.core.handlers.modpython.populate_apache_request into ModPythonHandler.__call__() to save the overhead of a function call, and because that logic didn't need to be abstracted.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-28 02:07:00 +00:00
Adrian Holovaty 15e7805ae4 Changed BaseHandler.get_response() to take a single parameter (an HttpRequest object) rather than a URL and the HttpRequest object, which is redundant
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-28 01:56:02 +00:00
Malcolm Tredinnick 0cc1815170 Fixed Python 2.3 compatibility problem in [3872].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-27 02:50:46 +00:00
Malcolm Tredinnick a834f213bd Fixed omission in [3872].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-27 02:47:19 +00:00
Malcolm Tredinnick 6068f3e4cb Reintroduced the changes from [3855] with more flexible handling of version
strings. Refs #2188, #2827.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-27 02:42:31 +00:00
Luke Plant 8b216eb865 Improved detection of whether a URL is internal or not for the purpose
of broken link e-mails (referred links from images.google were being
misclassified).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 18:49:28 +00:00
Adrian Holovaty 96f0b7bd21 Fixed #2805 -- Removed some whitespace from the two sitemap XML templates.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 16:27:24 +00:00
Adrian Holovaty a07aafe007 Removed one more legacy bit from [3855]. Refs #2827.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3868 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 16:14:06 +00:00
Adrian Holovaty 38d80f8894 Fixed #2827 -- Reverted [3855]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 16:11:13 +00:00
Adrian Holovaty b019331f44 Fixed #2782 -- Fixed incorrect request.META['SERVER_PORT'] for mod_python.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 16:00:52 +00:00
Adrian Holovaty 2170110df9 Fixed #2704 -- Fixed error in create_superuser. It was failing for invalid usernames. Thanks for reporting, jmu
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 15:28:07 +00:00
Malcolm Tredinnick 6b4eb8bb70 Removed an unnecessary import from r3857. I'd forgotten that _() was put into
the global namespace.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 13:59:10 +00:00
Malcolm Tredinnick 1f8cc30f5f Fixed #2748 -- Turned daily_cleanup.py into something that will run against the
current version of Django.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 13:08:16 +00:00
Russell Keith-Magee cb829267b8 Corrected line that was somehow merged out prior to committing changeset [3858].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 12:55:44 +00:00
Russell Keith-Magee 0d19b2eaae Refs #2243 -- Fixed manipulator handling of raw_id_admin m2m edit_inline fields.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 12:53:15 +00:00
Malcolm Tredinnick ae0bea8d50 Fixed a problem with editing inline objects.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 12:49:49 +00:00
Malcolm Tredinnick 876a3ed602 Fixed #2587 -- Removed some escaping from the summary fields.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 11:58:56 +00:00
Malcolm Tredinnick 4e76727fec Fixed #2188 -- Raise an error when using long CharFields in combination with
older MySQL versions. Thanks, Fraser Nevett <mail@nevett.org> .


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 10:46:34 +00:00
Malcolm Tredinnick 5371ee1743 Fixed #2194 -- Tweaked error message for unique_together validator to display
all verbose field names. Patch from dackze+django@gmail.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 10:19:40 +00:00
Malcolm Tredinnick e149c8bb87 Fixed #2823 -- Fixed Python 2.3 compatibility problem pointed out by Alex Dedul.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 10:08:03 +00:00
Malcolm Tredinnick 9c0568e21e Fixed #2208 -- Allow empty arguments to be passed to filters. Thanks, mattmcc.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 07:26:07 +00:00
Malcolm Tredinnick a27f12f388 Fixed #2265 -- Fixed problem with using iterators for "choices" attribute.
Thanks, Alex Dedul.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 06:33:32 +00:00
Malcolm Tredinnick be053df693 Fixed #2300 -- Added required "value" attribute to CheckboxSelectMultipleField
form field. Converted the submitted data for the same field back into something
we can work with. Thanks, lerouxb@gmail.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 04:37:10 +00:00
Malcolm Tredinnick 11416e4a54 Fixed #2362 -- Corrected the way we retrieve an object so that it works for
one-to-one fields.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 04:11:30 +00:00
Malcolm Tredinnick 789f30258a Fixed #2817 -- Fixed formatting problem in admin help string. Thanks,
Maximillian Dornseif.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 03:46:33 +00:00
Malcolm Tredinnick 9b034d2746 Fixed #2816 -- Marked a couple more translatable strings. Thanks, ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 03:42:27 +00:00
Malcolm Tredinnick 4ed82677be Fixed #2783 -- Fixed one-to-one fields to work with any primary key data type
in the related model. Thanks, Joel Heenan.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 02:58:36 +00:00
Malcolm Tredinnick 1fc62f0fd6 Fixed #2760 -- Fixed FloatField validator right (take two!) for negative
float amounts.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 01:57:26 +00:00
Russell Keith-Magee 83501405c2 Added '1' and '0' as allowed text input for BooleanFields. This was required to acommodate XML serializers when using MySQL.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-26 00:36:04 +00:00
Adrian Holovaty 7cfe56524b Proofread new django-admin 'adminmedia' option from [3811] and [3812]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 17:50:36 +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
Adrian Holovaty 227626dcd0 Fixed typos and improved documentation for permission_required decorator addition from [3779]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 17:33:17 +00:00
Adrian Holovaty 33a9a8f21a Altered [3778] change to match our coding/text style (django.middleware.common)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 17:25:39 +00:00
Russell Keith-Magee 205cb040d4 Removed some stray debug that was accidentally left in r3830.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 14:17:51 +00:00
Russell Keith-Magee 175337605d Fixes #1816, #2243 -- Removed a stale remnant of pre-magic removal code in manipulators that modify m2m object that are edited inline. Thanks to dolemite@wuli.nu and coconutstudio@yahoo.com for the original reports, Tyson Tate for a clean test case, and Jay Parlar for helping out with a solution.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 14:06:14 +00:00
Georg Bauer a64cb2e4a6 some more new translation strings for german translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 13:57:36 +00:00
Georg Bauer 182b5c5b5c fixed #2731: updated password change form to allow translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 13:53:41 +00:00
Georg Bauer 0d24c93b34 fixed #2812: updated simplified chinese translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 13:50:26 +00:00
Russell Keith-Magee 0c41869e6c Made ``pk`` a generic expansion for the primary key, rather than just an expansion for __id__exact.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 13:49:01 +00:00
Georg Bauer f6ec6d24ab fixed #2808: updated danish translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 13:48:41 +00:00
Georg Bauer fda8593f4e updated german translation to new strings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 13:47:32 +00:00
Georg Bauer 845cc95caa updated english basic translation file (for two new date formats)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 13:38:09 +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 6dacb3d10b Fixed #2729 -- Handle initial SQL with different line-ending styles (Windows
vs. Unix vs. Mac). Thanks, Simon Greenhill.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 07:36:46 +00:00
Malcolm Tredinnick f1c63992f7 Fixed #2745 -- Made the __repr__ methods for modpython and wsgi request more
robust in the face of bad input, since they are needed for error handling.
Based on a patch from md@hudora.de.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 07:25:12 +00:00
Malcolm Tredinnick 5b490bba93 Fixed #2771 -- Tweaked Django's doctest module so that it also works with
Python 2.5. Thanks, ymasuda.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 02:33:28 +00:00
Malcolm Tredinnick b4e5a96ccc Fixed #2772 -- Made SQLite support work correctly with Python 2.5 standard
module (as well as pysqlite2 for earlier Python versions). Patch from
ymasuda[at]ethercube.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 01:53:34 +00:00
Malcolm Tredinnick e0cec60a14 Fixed #2727 -- Fixed problem with serialising error messages from validation.
Thanks, Ivan Saglaev.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-24 12:16:15 +00:00
Malcolm Tredinnick a6a4e9b244 Fixed #2674 -- Added stricter date validation so that things like 2006-11-31
are caught. Thanks, Gary Wilson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-24 12:09:32 +00:00
Malcolm Tredinnick b05e5501a4 Fixed #2677 -- Removed the need to import sre and hence avoid a
DeprecationWarning. Thanks, Tom Tobin.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-24 11:44:04 +00:00
Malcolm Tredinnick 8f7ab8efed Avoid displaying the profanities list in the debug output. Makes it a bit more
"safe for work".


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-24 10:30:15 +00:00
Malcolm Tredinnick ff47dc6ba0 Fixed #2600 -- Added an option to allow serving admin media from a custom path
with dev server. Thanks, adurdin@gmail.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-24 08:17:47 +00:00
Malcolm Tredinnick 35a13d4b6b Fixed #2791 -- Added __contains__ method (for "a in dict" checks) to MergeDict.
Thanks, Ned Batchelder.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23 13:55:04 +00:00
Malcolm Tredinnick 28fad23a3f A corrected version of r3805.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23 13:53:02 +00:00
Malcolm Tredinnick 12273fa947 Reverting r3805 whilst I track down a potential problem with it.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23 13:04:37 +00:00
Malcolm Tredinnick 6a12d767d4 Fixed #2613 -- Fixed an easily triggered memory error in file uploads for WSGI.
Thanks Jeong-Min Lee.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23 12:41:19 +00:00
Malcolm Tredinnick 00734bca7e Fixed #2599 -- Fixed rendering problem in comma-separated integer fields.
Thanks, Christopher Lenz.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23 12:11:37 +00:00
Malcolm Tredinnick 539438a231 Fixed #2579 -- Fixed a problem with empty raw_id_admin form fields. Thanks to
Brendan McAdams and zakj@nox.cx for some good diagnostic work on this one.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23 12:06:38 +00:00
Malcolm Tredinnick 6cdd341dab Fixed #2425 -- Call validate() as part of generating SQL in order to catch a
few more errors. Thanks, Simon Greenhill.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23 11:13:43 +00:00
Malcolm Tredinnick e8b572b912 Fixed #2508 -- Added back support for custom edit_inline classes. Thanks,
jkocherhans.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23 10:02:16 +00:00
Malcolm Tredinnick bd4c22be0b Fixed #2454 -- Make "ifchanged" tag work more predictably inside nested
for-loops. Thanks, dummy@habmalnefrage.de.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23 09:49:58 +00:00
Malcolm Tredinnick 670e8ab704 Fixed #2456 -- Added backslash escaping to addslashes, which is necessary once
you start escaping other things. Thanks, tom@eggdrop.ch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23 08:41:09 +00:00
Malcolm Tredinnick 93597d051d Fixed #2418 -- Fixed obsolete method call in PermLookupDict.__repr__. Thanks,
DarkElf109@ibendit.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-23 08:35:10 +00:00
Malcolm Tredinnick aa30761d51 Fixed #2789 -- Corrected typo from r3788.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-22 13:33:43 +00:00
Malcolm Tredinnick d8b84cac91 Fixed #2515 -- Allow passing of options to JSON serializer. Thanks, nesh.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-22 13:26:07 +00:00
Malcolm Tredinnick 96bc9ec79d Fixed #2520 -- Fixed a problem with invalid SQL being generated by admin
interface in certain circumstances. Patch from favo@exoweb.net.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-22 13:10:46 +00:00
Malcolm Tredinnick c3d7aad6d0 Fixed #2560 -- Add close() support to HttpResponse iterators. Thanks, Ivan
Sagalaev.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-22 12:32:00 +00:00
Malcolm Tredinnick dc39762fde Fixed #2578 -- Give a more accurate error message for admin.list_display_links
at model validation time. Patch from Christopher Lenz.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-22 12:22:32 +00:00
Malcolm Tredinnick 9e05fc1598 Fixed #2770 -- Fixed a database connection leak in
django.contrib.auth.handlers.modpython.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-22 12:01:15 +00:00