Adrian Holovaty
d546179c71
Fixed incorrect usage of its in query.py docstring
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-11 20:27:53 +00:00
Luke Plant
8d4b414760
Fixed #15757 - removed remaining instances of get_and_delete_messages
...
Thanks to void for the report, and julien for the bulk of the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-07 22:01:23 +00:00
Ramiro Morales
b7715b4ae6
Fixed #15772 -- Corrected an oversight from r16016 in MySQL GeoDjango DB backend. Thanks JannKleen for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16021 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-06 11:19:37 +00:00
Chris Beaven
4fa9646716
Fixes #11596 -- Make paginator.Page iterable
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-06 09:40:26 +00:00
Ramiro Morales
de5f07513b
Tweaked r16016: Removed a now superflous __init__ method in the Oracle GIS backend DatabaseOperations class.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-05 11:29:16 +00:00
Ramiro Morales
30b3d51599
Fixed #13630 -- Made __init__ methods of all DB backends' DatabaseOperations classes take a `connection` argument. Thanks calexium for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16016 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-05 00:19:17 +00:00
Adrian Holovaty
71bf169ab1
Fixed geodjango postgis/creation.py to use postgresql_psycopg2 instead of legacy postgresql module that was removed recently
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-04 15:43:56 +00:00
Andrew Godwin
4d3ab063b1
Fixed #15613 : Don't send content-length headers for non-regular files. Thanks to jaylett.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16014 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-04 12:39:21 +00:00
Adrian Holovaty
1c7a9a403a
Fixed #15738 -- Removed unnecessary line in contrib.contenttypes tests. Thanks, mitnk
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-04 03:42:46 +00:00
Russell Keith-Magee
fb55a1a77d
Fixed #15747 -- Removed deprecated contrib.gis.db.backend module. Thanks to jonash for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-03 23:50:12 +00:00
Adrian Holovaty
21877c39b4
Fixed #15743 -- Fixed tense in a docstring in db/models/base.py. Thanks, jMyles
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16006 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 21:46:28 +00:00
Adrian Holovaty
eaf5554865
Fixed grammar error in utils/functional.py from [15940]
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 21:45:56 +00:00
Ramiro Morales
ecdcf477f9
Removed support code for deprecated module-based template loaders from debug view postmortem.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 18:48:18 +00:00
Russell Keith-Magee
74f7ad32a5
Fixed #15717 -- Updated databrowse to use class-based generic date views. Thanks to aaugustin for the report and draft patch
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 13:55:03 +00:00
Russell Keith-Magee
e6a5e41cdf
Added missing warnings import
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 13:46:09 +00:00
Russell Keith-Magee
4749159d48
Silenced a DeprecationWarning in formtools caused by testing the deprecated security_hash function
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 13:26:19 +00:00
Russell Keith-Magee
62f37c69b0
Fixed #15739 -- Added support to RedirectView for HEAD, OPTIONS, POST, PUT and DELETE requests
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:45:22 +00:00
Russell Keith-Magee
4c468800ee
Updates to the test suite to allow for newly deprecated and removed features
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:44:47 +00:00
Russell Keith-Magee
603884505f
Advanced deprecations for function-based generic views
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:44:04 +00:00
Russell Keith-Magee
d60ae0b721
Removed deprecated 'no' translation
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:43:43 +00:00
Russell Keith-Magee
86ba75b090
Advanced deprecations in django.utils.translation.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:41:51 +00:00
Russell Keith-Magee
87508fbbf3
Advanced deprecations in django.test.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:41:26 +00:00
Russell Keith-Magee
4d94c0cb38
Advanced deprecations in django.template.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:41:03 +00:00
Russell Keith-Magee
1d4390b26b
Advanced deprecation on CompatCookie.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:40:38 +00:00
Russell Keith-Magee
8db51a70da
Removed deprecated en_format helper function.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:40:14 +00:00
Russell Keith-Magee
eea43f2458
Removed deprecated XMLField.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:39:52 +00:00
Russell Keith-Magee
3eb4acf118
Removed a usage of the depreacted SMTPConnection in test.utils.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:39:31 +00:00
Russell Keith-Magee
8911754555
Deprecated the psycopg-based postgresql database backend.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:39:08 +00:00
Russell Keith-Magee
f9972bcf86
Removed deprecated DB backend functions for creating m2m tables.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:38:25 +00:00
Russell Keith-Magee
af00f29ecb
Advanced deprecations in core.mail, core.commands, core.context_processors and core.handlers.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:37:53 +00:00
Russell Keith-Magee
576606a6f2
Advanced deprecations in core.cache.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:37:15 +00:00
Russell Keith-Magee
24b7d9017d
Advanced deprecations in contrib.syndication.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:36:40 +00:00
Russell Keith-Magee
5d5149cd18
Advanced deprecation of user-based messages and the LegacyFallbackStorage in contrib.messages.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:36:04 +00:00
Russell Keith-Magee
c349aad412
Advanced deprecations in contrib.localflavor.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:35:25 +00:00
Russell Keith-Magee
765458363b
Advanced deprecations in contrib.gis.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:34:50 +00:00
Russell Keith-Magee
c1df35b0fa
Advanced deprecations in contrib.formtools.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:34:15 +00:00
Russell Keith-Magee
fe12415231
Removed deprecated contrib.csrf app.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:33:40 +00:00
Russell Keith-Magee
48edaf17a3
Advanced deprecations in contrib.auth.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:33:01 +00:00
Russell Keith-Magee
98d3a09338
Advanced deprecation for MEDIA_URL and STATIC_URL without a trailing slash.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:32:21 +00:00
Adrian Holovaty
94af19c43f
Changed e-mail to email throughout documentation and codebase. The one exception is translation strings, which I didn't want to disrupt
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-01 16:10:22 +00:00
Jannis Leidel
7099d465ab
Fixed #15724 -- Added update_wrapper import to utils.functional to be a bit more forgiving for 3rd party apps using that import.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-31 08:42:51 +00:00
Jannis Leidel
365f501793
Fixed #15726 -- Fixed the name of a file of the Mexican Spanish translation added in r15433.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-31 08:35:34 +00:00
Justin Bronn
84226c0b84
Fixed `LayerMapping` to support `BigIntegerField` and removed support for `XMLField`.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15961 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 19:23:43 +00:00
Alex Gaynor
9b3aaae255
Removed legacy handing for `settings.DATABAS_*` and using short-form references to the included database backends.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:59:44 +00:00
Alex Gaynor
e57cc90c16
Removed deprecated legacy connection handling for `Field.get_db_*`.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:48:42 +00:00
Luke Plant
16f6acdb89
Deprecated csrf_response_exempt and csrf_view_exempt decorators
...
With the removal of CsrfResponseMiddleware, csrf_response_exempt serves no
purposes, and csrf_exempt and csrf_view_exempt perform the same function.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:35:41 +00:00
Luke Plant
c0caac87f9
Removed Django 1.2 compatibility fallback for session data integrity check hash.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:35:22 +00:00
Luke Plant
5fa11b0035
Removed Django 1.2 compatibility fallback for contrib.comments forms hash.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:35:12 +00:00
Luke Plant
c922a04675
Updated FormPreview to use form_hmac rather than the old security_hash function
...
This ought to have been done in [14218], but although the FormPreview class
was modified, and some tests were added, the crucial lines of code were not
changed (the 'FormPreview.security_hash' method), and tests for the new
behaviour were not added. So it is being changed now. Unlike some of the
other code in that changeset, this does not need to have a compatibility
fallback to cope with existing hashes, because the consequence of a failed
hash is minimal - the user is re-presented with the preview stage of the
form, which will then have a correct hash.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:35:01 +00:00
Luke Plant
fa4bbfcbfb
Removed Django 1.2 compatibility fallback for form wizard hash
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:34:49 +00:00
Luke Plant
25aaa359a2
Removed Django 1.2 compatibility fallback for password reset hash
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:34:38 +00:00
Luke Plant
8823021625
Removed deprecated CsrfResponseMiddleware, and corresponding tests and docs
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:34:26 +00:00
Luke Plant
21ef64e34c
Removed Django 1.1 fallback for CSRF checks.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 17:34:14 +00:00
Justin Bronn
abab0742d0
Fixed integer overflows that occurred when `OFTReal` fields were treated as `OFTInteger`.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 16:56:53 +00:00
Justin Bronn
83246ca8b9
Fixed tests broke in r15926.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 16:46:24 +00:00
Jannis Leidel
37ed6f2681
Re-added a few compatibility modules that were removed in r15927 to lower the impact on 3rd party apps.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-30 08:34:05 +00:00
Luke Plant
6a25d90e49
Removed totally unused setting.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 22:19:14 +00:00
Alex Gaynor
cc3803e147
Remove a license that no long applies to any code, and add a comment for the next person who wants to do some gardening.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 21:27:22 +00:00
Luke Plant
8bb46d8b7c
Fixed #15679 - regression in HttpRequest.POST and raw_post_data access.
...
Thanks to vkryachko for the report.
This also fixes a slight inconsistency with raw_post_data after parsing of a
multipart request, and adds a test for that. (Previously accessing
raw_post_data would have returned the empty string rather than raising an
Exception).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 16:11:40 +00:00
Russell Keith-Magee
728770a5f9
Fixed #15702 -- Corrected problem in test suite introduced by Python 2.4 changes from r15927. Thanks to mk for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 14:22:48 +00:00
Alex Gaynor
e54c0a0c94
Move the Python 2.5 specific tests out of their own special files now that 2.5 is the default. Also add __futre__ import where necessary.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 05:58:43 +00:00
Adrian Holovaty
b4f0c1a775
Removed a Python 2.4 try/except no longer necessary in django.utils.translation.trans_real
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:31:31 +00:00
Adrian Holovaty
579eb97961
Simplified sqlite backend ImproperlyConfigured check now that we don't support Python 2.4
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:27:05 +00:00
Adrian Holovaty
a89ee065a1
Removed no-longer-valid comment about Python 2.3 and 2.4 in formtools/utils.py
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:26:15 +00:00
Adrian Holovaty
7cac1ecbd0
Simplified django.utils.feedgenerator.get_tag_uri now that we don't require Python 2.4
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:25:26 +00:00
Adrian Holovaty
13864703bc
Removed a bunch more Python 2.4 workarounds now that we don't support that version. Refs #15702 -- thanks to jonash for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:11:19 +00:00
Adrian Holovaty
a87be3554f
Removed a bunch of Python 2.4 workarounds now that we don't support it. Refs #15702 -- thanks to jonash for the patch. Splitting this over muliple commits to make it more manageable.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 01:40:43 +00:00
Adrian Holovaty
18ef901e5f
Fixed #6636 -- Added template blocks to admin change_form.html template for fieldsets and inline fieldsets. Thanks, peschler and jpichon
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 01:22:05 +00:00
Adrian Holovaty
15295a852f
Fixed #15647 -- Changed in_bulk() not to type check its input, which now allows for passing any iterable. Thanks, calvinspealman
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-26 17:50:10 +00:00
Adrian Holovaty
471c9aee97
Fixed #9158 -- Changed django-admin.py help to be printed to stdout instead of stderr, so that it's more easily greppable. Thanks, petr.marhoun@gmail.com
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-26 17:45:42 +00:00
Adrian Holovaty
2f9658fc3a
Fixed #15672 -- Fixed bug in core/handlers/wsgi.py where we were referring to the 'request' variable before assigning to it. Thanks for the report, vkryachko
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-26 03:53:37 +00:00
Adrian Holovaty
3e18969bcb
Fixed #15635 -- Converted two legacy old-style raise statements. Thanks, DaNmarner
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-26 03:30:48 +00:00
Adrian Holovaty
8121aa60fd
Fixed #15642 -- Removed redundant imports in http/__init__.py. Thanks, jammon
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-26 03:13:22 +00:00
Karen Tracey
3e7ce3c750
Ensure stdin is a tty before handing it to termios, so as to prevent prolems when running under IDEs.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-24 12:36:33 +00:00
James Bennett
7c08f4c635
Bump everything for 1.3.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-23 05:06:31 +00:00
Jannis Leidel
2cb2674048
Copied "Norwegian Bokmål (nb)" translation to old "Norwegian (no)" translation for backwards compatibility.
...
This change slightly extends what was decided in #11068 (to not update the "no" translation due to complicated maintenance, but only "nb"). Thanks, Transifex!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-20 22:16:35 +00:00
Jannis Leidel
ada8e2a6fa
Pulled translation updates from Transifex again.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-20 22:16:14 +00:00
Jannis Leidel
7c738cd3e8
Fixed #15618 -- Fixed regression introduced in r15848 regarding not properly deleting messages cookies when honoring SESSION_COOKIE_DOMAIN. Thanks, Julien.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-20 11:27:03 +00:00
Karen Tracey
f5b22ed997
Fixed #15565 : Ensure terminal echo is on after reloader reloads (something turns it off on some systems if reload happens while at a pdb prompt). Thanks for the report zimnyx.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-19 22:09:38 +00:00
Ramiro Morales
775a6e694f
Fixed #15632 -- Ignore unrelated content in template multi-line comment blocks when looking for tokens that identify comments for translators. Thanks andrew AT ie-grad DOT ru for the report and Claude Paroz for spotting the problem and helping to fix it.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-19 12:56:38 +00:00
Russell Keith-Magee
1a6d98dab9
Fixed #13686 -- Ensure that memcache handling of unicode values in add() and set_many() is consistent with the handling provided by get() and set(). Thanks to nedbatchelder for the report, and to jbalogh, accuser and Jacob Burch for their work ont the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-19 02:42:40 +00:00
Jannis Leidel
16ad1d951a
Refined exception message to make sure we don't confuse users.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-18 18:46:48 +00:00
Russell Keith-Magee
fa852966c6
Fixed #15368 -- Ensure that raw unittest TestCase instances can be invoked individually by the test runner. Thanks to SmileyChris for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-18 01:17:48 +00:00
Ramiro Morales
5347bbd514
Fixed plural forms formula for the Croatian (hr) localization by manually overriding the header of affected .po files and re-generating .mo files, this seems to be a quirck in Transifex export to PO functionality. Thanks bmihelac fot the report. Refs #15634 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 22:56:10 +00:00
Adrian Holovaty
6091f0ead3
Fixed #15621 -- Fixed potentially confusing error message in db backend loading. Thanks, keegan_csmith
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 16:57:37 +00:00
Russell Keith-Magee
a0878b5f95
Fixed #15627 -- Use constant time comparison for password checks. Thanks to hvdklauw for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 11:51:07 +00:00
Russell Keith-Magee
7ab5ce6cf1
Fixed #15628 -- Made the admin error email more useful when there isn't a request associated with the message. Thanks to hynek for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 10:33:08 +00:00
Russell Keith-Magee
354aa941b6
Fixed #15622 -- Clear content type cache to avoid problems with subsequence TransactionTestCases. Thanks to zyga for the report
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 08:41:25 +00:00
Russell Keith-Magee
b49ee91eb3
Fixed #15142 -- Force test views to be non-cached so that projects with caching middleware enabled don't cause test failures. Thanks to jsdalton for the report and patch
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 08:07:40 +00:00
Russell Keith-Magee
1af33427cb
Fixed #15623 -- Corrected province codes for Canadian localflavor. Thanks to shelldweller for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 00:59:30 +00:00
Russell Keith-Magee
c2ae6b2af7
Fixed #15569 -- Corrected the numbering updates to inlines when rows are added and deleted. Thanks to sbaechler for the report, to Arthur de Jong and mk for the work on the patch, and to Karen Tracey for the last minute testing help.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 00:44:12 +00:00
Justin Bronn
d60a8777c1
Add `setUp` and `tearDown` methods to the geographic feed and sitemap tests to ensure `Site` exists for tests.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 18:22:52 +00:00
Justin Bronn
4da019ea19
Fixed #15194 -- Add OSGeo4W DLL library names to GEOS and GDAL interfaces. Thanks, master for ticket and initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 04:44:26 +00:00
Adrian Holovaty
ad55bb0f87
Changed django/db/utils.py load_backend() to call sorted() instead of .sort(). Saves us a line of code. Taken from patch for #15621
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 04:26:38 +00:00
Adrian Holovaty
304a50d8ca
Fixed #15603 -- Changed the traceback error e-mails not to use HTML by default. It's now configurable with an 'include_html' parameter to AdminEmailHandler. Thanks, kmtracey
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 04:13:57 +00:00
Adrian Holovaty
ccc972e750
Fixed #15618 -- CookieStorage storage in messages framework now honors SESSION_COOKIE_DOMAIN. Thanks for the report and patch, lamby
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 03:50:51 +00:00
Adrian Holovaty
f71384a52b
Fixed #15229 -- Improved URLValidator to accept ftp:// links. Thanks, codefisher and crayz_train
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 03:38:34 +00:00
Justin Bronn
ebd5682989
Fixed #15533 -- Now use 3857 as spherical mercator projection instead of deprecated 900913 on platforms that support it. Thanks to cnorthwood for bug report and Christopher Schmidt for OpenLayers JavaScript workaround.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 02:58:35 +00:00
Jannis Leidel
10e1f5d1d2
Refined changes to Polish localization format file made in r13298 and r13327 by using non-breaking space. Refs #13577 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 22:13:36 +00:00
Jannis Leidel
d83cf4066c
Fixed mistake introduced in r15838 regarding naming of Mexican Spanish.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 22:13:29 +00:00
Jannis Leidel
b46cbc49c2
Fixed #15608 -- Added Nicaraguan Spanish locale (format file only). Thanks, fitoria.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 22:13:24 +00:00
Luke Plant
243d0bec19
Fixed #15617 - CSRF referer checking too strict
...
Thanks to adam for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:37:09 +00:00
Jannis Leidel
ad4118be44
Fixed #15598 -- Updated static URL helper to be no-op on non-local prefixes. Thanks, traff.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:13:21 +00:00
Jannis Leidel
5050e30507
Fixed #15563 -- Update the LANG_INFO dictionary with newly added translations az, es-mx and ur. Thanks, lasko.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:13:18 +00:00
Jannis Leidel
1df1f2aa1c
Pulled sites translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:13:13 +00:00
Jannis Leidel
d31cf12be1
Pulled sessions translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:12:38 +00:00
Jannis Leidel
4380fc2832
Pulled redirects translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:12:07 +00:00
Jannis Leidel
364cf89e06
Pulled messages translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:11:36 +00:00
Jannis Leidel
e5ccf0b9ba
Pulled localflavor translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:11:04 +00:00
Jannis Leidel
f193c17979
Pulled humanize translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:10:24 +00:00
Jannis Leidel
71e6f9b84d
Pulled gis translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:09:41 +00:00
Jannis Leidel
25f975a729
Pulled formtools translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:09:10 +00:00
Jannis Leidel
f7c8ce1d39
Pulled flatpages translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:08:36 +00:00
Jannis Leidel
e950cbf386
Pulled contenttypes translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:08:06 +00:00
Jannis Leidel
1bbe626033
Pulled comments translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:07:32 +00:00
Jannis Leidel
ffe88a7a6c
Pulled auth translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:06:58 +00:00
Jannis Leidel
ddbbb60077
Pulled admindocs translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:06:26 +00:00
Jannis Leidel
24350e45a3
Pulled admin translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:05:50 +00:00
Jannis Leidel
0b468d79b0
Pulled core translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:05:03 +00:00
Russell Keith-Magee
87a100b642
Fixed #15575 -- Corrected handling of pagination in generic views to match documentation and historical behavior. Thanks to Ivan Virabyan for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 08:24:31 +00:00
Russell Keith-Magee
350a56ad49
Fixed #15606 -- Ensured that boolean fields always use the Boolean filterspec. Thanks to Martin Tiršel for the report
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 08:19:39 +00:00
Justin Bronn
1fdbcadd22
Fixed #15378 -- Now properly handle OGR layers that have features with invalid geometries. Thanks, kunitoki for bug report and initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 02:26:37 +00:00
Adrian Holovaty
dd3313bf6d
Fixed #10654 -- Removed 'Does it have syntax errors' from the ImportError in django/conf/__init__.py. Evidently syntax errors raise a SyntaxError. Thanks, gutworth and alexr
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 23:06:06 +00:00
Adrian Holovaty
4e25bc71b1
Fixed #15609 -- Fixed some 'raise' statements to use the newer style syntax. Thanks, DaNmarner
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 23:00:03 +00:00
Justin Bronn
ab7ada16ed
Fixed brittle tests that broke with release of GDAL 1.8.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 21:15:34 +00:00
Carl Meyer
7d71a9e45f
Fixed #9213 - Added check to prevent inactive users from resetting their password. Thanks to John Scott for report and draft patch, and Evgeny Fadeev for final patch with test.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 21:14:10 +00:00
Jacob Kaplan-Moss
fd2f18008c
Fixed #14733 : no longer "validate" .raw() queries.
...
Turns out that a lot more than just SELECT can return data, and this list is
very hard to define up front in a cross-database manner. So let's just assume
that anyone using raw() is at least halfway competant and can deal with
the error messages if they don't use a data-returning query.
Thanks to Christophe Pettus for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 19:49:53 +00:00
Karen Tracey
f1f10a9ce2
Fixed #15597 : When formatting the debug page for inclusion in an e-mail, suppress the note about "seeing this" because DEBUG is True.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 14:58:54 +00:00
Adrian Holovaty
e494f88be0
Fixed #15601 -- Corrected a weird typo. Thanks, jMyles
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 05:45:55 +00:00
Adrian Holovaty
72c5733869
Fixed #15604 -- Changed django.db.models.permalink to use wraps() so that it doesn't eat the docstring. Thanks for the report, sfllaw. Also added tests.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 05:22:39 +00:00
Adrian Holovaty
3a5b87cf6d
Importing django.forms no longer requires DJANGO_SETTINGS_MODULE. Moved django.db.connections import in django.forms.models to the method where it's used.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 04:42:04 +00:00
Luke Plant
e2627d267d
Removed an unused code path.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10 18:42:33 +00:00
Luke Plant
e9d2763947
Fixed #15572 - include with "only" option discards context properties (such as autoescape)
...
Thanks to dfoerster for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10 18:42:24 +00:00
Luke Plant
0a3aae8362
Fixed #15559 - distinct queries introduced by [15607] cause errors with some custom model fields
...
This patch just reverts [15607] until a more satisfying solution can be
found.
Refs #11707
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10 01:15:19 +00:00
Ian Kelly
f17fc56602
Fixed a bunch more tests that were failing in Oracle due to false assumptions about the primary keys of objects.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 23:46:28 +00:00
Ian Kelly
23103bddb9
Fixed another case-sensitivity bug in Oracle introspection. This one was harmless, but it was causing an irritating test failure.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 22:45:20 +00:00
Ian Kelly
5a79b55239
Fixed a case-sensitivity bug in Oracle introspection that was preventing inspectdb from identifying foreign keys.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15785 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 19:40:44 +00:00
Jannis Leidel
f05aab1a43
Modified collectstatic management command to not include STATIC_ROOT in the user prompt since it's misleading when using a non-local storage backend.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 12:34:17 +00:00
Alex Gaynor
6ffe1d1e1f
Removed some dead code, and old/bad constructs from the HttpResponse classes.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 04:09:47 +00:00
Ian Kelly
d9e61a435a
Added a skip for a test that fails in Oracle. Unlike other backends, Oracle does not allow duplicate rows where there is a unique_together constraint for which some but not all of the columns are NULL.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-08 22:41:25 +00:00
Russell Keith-Magee
c260c533e1
Fixed #15570 -- Corrected a flaw in the design of the silent flag on {% cycle %}. Thanks to Brian Neal for the report, and to Andrew and Jannis for the design consult.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-08 13:43:53 +00:00
Chris Beaven
c47b69ba53
Fix the docstring of contrib.staticfiles BaseFinder so it's not misleading.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 22:54:55 +00:00
Russell Keith-Magee
7f363eb6dc
Fixed #15553 -- Updated Macedonian locale. Thanks to vasiliyeah for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 00:31:48 +00:00
Russell Keith-Magee
6bf1c343ca
Fixed #15554 -- Corrected test failure in contenttypes when default site isn't example.com. Thanks to twil for the report, and PaulM for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 00:09:11 +00:00
Russell Keith-Magee
299874cbe1
Fixed #15560 -- Cleaned up some redundant post->put redirections in the class-based generic views. Thanks to maney for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-06 05:55:12 +00:00
James Bennett
5e9deba988
Bump trunk to 1.3 release candidate status.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 05:27:28 +00:00
Jannis Leidel
90564a156c
Fixed Hungarian, Russian, Serbian and Ukranian plural forms introduced in r15680.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:07:11 +00:00
Jannis Leidel
c11140d04b
Fixed plural forms of Irish translation introduced in r15680.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:05:10 +00:00
Jannis Leidel
53b2a25396
Fixed plural forms of Welsh translation introduced in r15680.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:04:31 +00:00
Jannis Leidel
bef353873e
Fixed plural forms of Bosnian translation introduced in r15680.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:03:14 +00:00