Jannis Leidel
f0cd656ee0
Fixed #14933 -- Added ability to SelectDateWidget to cope with new alternative month names added in [14900]. Thanks, alek and Claude Peroz.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 00:44:54 +00:00
Justin Bronn
d66ab474f3
Fixed #10420 -- GeoDjango tests are run as part of Django tests when using spatial database backends with `runtests.py`.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 23:42:12 +00:00
Luke Plant
363177ea32
Small performance tweak - avoid loading django.core.management in DB backend code
...
django.core.management (and dependencies) will usually not be needed in a web context.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 21:32:59 +00:00
Jannis Leidel
af5ad1116c
Rectified bugs that were accidentally committed in r14997. Thanks for the heads-up, Alex Gaynor.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15011 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 19:19:04 +00:00
Jannis Leidel
745c255a19
Fixed #14249 -- Added support for inactive users to the auth backend system. Thanks, Harro van der Klauw.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 19:18:12 +00:00
Russell Keith-Magee
b3d2091681
Fixed #12816 -- Added a render() shortcut.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 17:18:41 +00:00
Jannis Leidel
d4ef841495
Fixed #14301 -- Further refine changes made in r14216 to support non-ASCII characters in email addresses. Thanks, Claude Peroz and Andi Albrecht.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15006 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:26:49 +00:00
Russell Keith-Magee
673e6fc7fb
Fixed #11675 -- Added support for the PyLibMC cache library. In order to support this, and clean up some other 1.3 caching additions, this patch also includes some changes to the way caches are defined. This means you can now have multiple caches, in the same way you have multiple databases. A huge thanks to Jacob Burch for the work on the PyLibMC backend, and to Jannis for his work on the cache definition changes.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:19:19 +00:00
Jannis Leidel
3cf8502d35
Fixed #4976 -- Stopped humanize template tags to raise a TypeError if passed a value of ``None``. Thanks, Simon G. and Adam Vandenberg.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:07:43 +00:00
Jannis Leidel
75f16982d8
Fixed #13782 -- Added CSS for errors in textareas and multiple fields in one line. Thanks, julien.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:07:09 +00:00
Jannis Leidel
98e1a71ceb
Fixed #14900 -- Added ability to override the paginator class used in a ModelAdmin. Thanks, Adam Vandenberg.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14997 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 14:57:29 +00:00
Jannis Leidel
7655cd8eac
Fixed #13743 -- Fixed CommentsAdmin to not blow up if the delete_selected action is disabled. Thanks, Daniel Lindsley.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 14:56:48 +00:00
Russell Keith-Magee
e299ac0cae
Reverting r14994 (at request of SmileyChris) because of some backwards compatibility issues that need to be resolved.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 06:05:40 +00:00
Chris Beaven
b60d5df072
Fixes #13252 -- Use the natural key instead of the primary key when serializing
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 04:40:08 +00:00
Ramiro Morales
c2657d8923
Fixed #14921 -- Tweak changes made in r14861 for the Oracle backend so the test runner can actually create the test DB. Thanks Karen for the report.
...
In Oracle, the name of a DB as handled by Django hasn't a counterpart anyway. So use the 'production DB name' as it was done before.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 01:36:09 +00:00
Chris Beaven
df6ad35c56
Fixed #7153 -- _resolve_lookup now does a better job of resolving callables and correctly catches all silent_variable_exceptions
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19 23:47:24 +00:00
Russell Keith-Magee
314fabc930
Fixed #14908 -- Added a 'takes_context' argument to simple_tag. Thanks to Julien Phalip for driving the issue and providing the final patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19 15:00:50 +00:00
Russell Keith-Magee
7adffaeaf6
Fixed #14655 -- Made formsets iterable. This allows a slightly more natural iteration API (`for form in formsets`), and allows you to easily override the form rendering order. Thanks to Kent Hauser for the suggestion and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19 13:41:43 +00:00
Russell Keith-Magee
059d9205d4
Fixed #14920 -- Fixed some test failures caused by caching contenttypes that were loaded during a contenttype fixture test. Thanks to Karen for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19 13:01:51 +00:00
Alex Gaynor
bc27405fc5
Fixed #14871 , #14872 -- ZAIDField didn't handle alll EMPTY_VALUES correctly and ZAPostCodeField didn't respect *args or **kwargs (such as required=False). Also converted South African localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit.
...
Fixing ZA localflavor clean() #14872
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 20:33:44 +00:00
Alex Gaynor
d01cb6ed17
Fixed #14864 , #14864 -- ROCIFField didn't accept values starting with RO, as it was supposed to, and ROCNPField, ROIBANField, and ROPhoneNumberField didn't handle all EMPTY_VALUES correctly. Also converted Romanian localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit.
...
Fixing RO localflavor clean() #14864
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 20:32:54 +00:00
Alex Gaynor
f9e6ca1026
Fixed #14860 -- PLPESELField, PLNIPField, and PLREGONField didn't handle all EMPTY_VALUES correctly. Also converted teh Polish localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 20:32:31 +00:00
Alex Gaynor
f8caeefff1
Fixed #14859 -- ITSocialSecurityNumberField and ITVatNumberField didn't handle all EMPTY_VALUES gracefully. Also converted the Italias localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 20:31:49 +00:00
Alex Gaynor
6a362d3684
Fixed #14750 -- ILPostalCodeField didn't handle all EMPTY_VALUES correctly. Also converted the Israeli localflavor testcases to use the new, less verbose format. Thanks to Idan Gazit.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 20:31:22 +00:00
Chris Beaven
3ae9117c46
Fixes #7817 and #9456 .
...
- The include tag now has a 'with' option to include to provide extra context
vairables to the included template.
- The include tag now has an 'only' option to exclude the current context
when rendering the included template.
- The with tag now accepts multiple variable assignments.
- The with, include and blocktrans tags now use a new keyword argument format
for variable assignments (e.g. `{% with foo=1 bar=2 %}`).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 02:50:26 +00:00
Ramiro Morales
87315cc22d
Fixed #2411 -- Fixed some XHTML validation errors in admindocs pages. Thanks to James Wheare for the report and to Simon Greenhill for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-16 12:11:20 +00:00
Jarek Zgoda
689234890c
Fixed #14906 : lost context-based translations for Polish
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-15 14:48:19 +00:00
Jarek Zgoda
f7f7587958
Polish translation update
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-14 11:53:18 +00:00
Jannis Leidel
6ec348fb41
Fixed #13726 -- Further refine changes made in r12384 and r13069 for using non-English source languages in JavaScript translation catalogues. Thanks, Ramiro.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:52:52 +00:00
Jannis Leidel
2478f8588e
Updated date format strings of languages that require alternate month names. Refs #14570 because it uses the new format character added for this purpose. Thank you, shell_dweller.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:52:21 +00:00
Jannis Leidel
7292af8542
Fixed #14570 -- Added new date format character for alternative month names using the new context capabilities. Also add context to Associated Press style month names (refs #9988 ). Thanks to Claude and shell_dweller.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:51:28 +00:00
Luke Plant
dc8c4f0879
Reverted [13998] because it never worked.
...
Refs #5425 , #14844
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:20:02 +00:00
Jannis Leidel
05eb53603c
Fixed #14187 -- Added support for bpython to shell management command. Thanks, Jeremy Dunck.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 23:03:24 +00:00
Jannis Leidel
47a5153da4
Fixed #12735 , #14892 and #11542 -- Fixed support for the latest IPython (development) version in the shell management command and added a hook to implement additional shell runners (by subclassing django.core.management.commands.shell.Command, extending the ``shells`` attribute and implement a method with the same name).
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 23:03:03 +00:00
Jannis Leidel
9ab85e05e2
Fixed #4030 -- Added ability to translate language names. Thanks to Antti Kaihola and Ramiro Morales for the initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 23:02:45 +00:00
Jannis Leidel
5fa1169f33
Fixed #14821 -- Documented the differences in formatting syntax in formats modules. Thanks, Claude.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14893 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 23:02:10 +00:00
Jannis Leidel
1aca34cde2
Fixed #14868 -- Added CSS rule to prevent long text from overflowing the "recent actions" box on the admin index page. Thanks, Chris Adams.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:59:47 +00:00
Jannis Leidel
674c671cae
Fixed #14731 -- Respect ordering when creating the default permissions. Thanks, chipx86.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14891 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:59:28 +00:00
Jannis Leidel
867e935c51
Fixed #14446 -- Prevented the password reset confirmation view to be cached. Thanks, Paul and Gabriel.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:59:03 +00:00
Jannis Leidel
d8165ce156
Fixed #14312 -- Raising an ``IncorrectLookupParameters`` if the page number given to an admin change list exceeds the number of the last page. Thanks, mk.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:58:47 +00:00
Jannis Leidel
a03a8adb3e
Fixed #14268 -- Start the deprecation of the reset and sqlreset management command. Thanks, Carl.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:58:25 +00:00
Jannis Leidel
3d35ac7868
Fixed #14158 -- Fixed SelectMultiple._has_changed to not assume same order of data anymore. Thanks, akaariai and dmoisset.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:57:58 +00:00
Jannis Leidel
34daa0804c
Fixed #14144 -- Made sure custom validators are called in ModelMultipleChoiceFields. Thanks, matiasb.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:57:37 +00:00
Jannis Leidel
dad28e8557
Fixed #14103 -- Take USE_ETAGS setting into account when patching the response headers. Thanks, trbs and Eric Holscher.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:57:17 +00:00
Jannis Leidel
8dfd3dfd49
Fixed #14805 -- Capitalize "Google" in sitemaps docs. Thanks, Adam.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:56:52 +00:00
Jannis Leidel
d0257a1558
Fixed #14041 -- Added ability to override the template of the sitemaps views. Thanks, julien.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:56:29 +00:00
Jannis Leidel
b3520da9ac
Fixed #13862 -- Added an ordering option to InlineModelAdmin and cleaned up documentation for it a bit. Thanks, Simon Meers, rasca and cogat.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:56:01 +00:00
Jannis Leidel
1e7bb904df
Fixed #13856 -- Float admin's top links on the right for RTL languages.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:55:33 +00:00
Jannis Leidel
966d3562d4
Fixed #13649 -- Extended admin stylesheets to also cover disabled buttons in the admin. Thanks, Sebastian Noack.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:55:10 +00:00
Jannis Leidel
2c2209b473
Fixed #13607 -- Auto-initialize admin's date hierarchy links intelligently. Thanks, Simon Meers.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:54:50 +00:00
Jannis Leidel
88ff656731
Fixed #12955 -- Use the size attribute of the file instead of len() to support uploads larger than 2GB. Thanks, swiedenroth and isagalaev.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14878 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:54:22 +00:00
Jannis Leidel
6261593b99
Fixed #11990 -- Show the correct URLconf in the technical 404 template even if it was overridden, e.g. in a middleware. Thanks, mattbennett.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:54:04 +00:00
Jannis Leidel
462d3115a3
Fixed #5672 -- Allow the separator in the get_text_list utility function to be translated. Thanks, Claude.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:53:49 +00:00
Alex Gaynor
575962c213
Fixed #14499 -- ATSocialSecurityNumberField now responds to all EMPTY_VALUES correctly. Also converted Austrian localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 04:33:50 +00:00
Chris Beaven
2e909489d7
Add FormMixin.get_form_kwargs method to abstract some common logic in a tidier
...
way. Tidy up (and amend) documentation about FormMixin and ModelFormMixin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-10 03:51:30 +00:00
Chris Beaven
ff8711a825
Fixes #14873 -- A paginated ListView with a List instead of queryset produces an error.
...
Additional minor change in functionality: the page is now not considered paginated if the objects do not span multiple pages according to the paginator. This will only affect views with a custom paginator method which uses orphans.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-09 02:34:14 +00:00
Ramiro Morales
c58d25cf8d
Fixed a couple of typos and small errors from r14696 and r14822.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-09 00:26:59 +00:00
Ramiro Morales
e0d8c5fca2
Fixed error introduced in r14666 that results in the message reporting the test DB name to be created being shown actually after the real action when the operation fails.
...
Implemented that by factoring out calculation of test DB name to an internal method.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-08 23:48:28 +00:00
Alex Gaynor
a4898dc50b
Fixed the world's ugliest syntax (that's not an actual error) that snuck in with [14857].
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-08 18:37:00 +00:00
Alex Gaynor
2a46323124
Fixed #14870 -- don't catch AttributeErrors in database router methods, instead check that the method itself exists. Thanks to jonash for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-08 18:31:57 +00:00
Ian Kelly
b8c368feb2
Replaced an ImportError with ImproperlyConfigured in the Oracle backend.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-08 07:56:43 +00:00
Russell Keith-Magee
e0dcd7666a
Fixed #12815 -- Added TemplateResponse, a lazy-evaluated Response class. Thanks to Simon Willison for the original idea, and to Mikhail Korobov and Ivan Sagalaev for their assistance, including the draft patch from Mikhail.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-07 13:57:01 +00:00
Jannis Leidel
5fadc86200
Fixed #14851 -- Swapped an argument order to fix compatibility with Python<2.6. Thanks for report and patch, mk.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 21:54:49 +00:00
Russell Keith-Magee
29c4a578af
Fixed #10863 -- Added HTML support to mail_managers() and mail_admins(), and used this to provide more and prettier detail in error emails. Thanks to boxed for the suggestion, and to Rob Hudson and Brodie Rao for their work on the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 14:21:51 +00:00
Russell Keith-Magee
4a1f2129d0
Fixed #12398 -- Added a TypedMultipleChoiceField. Thanks to Tai Lee.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 04:47:19 +00:00
Russell Keith-Magee
ee48da2405
Fixed #14773 -- Modified MultipleObjectMixin to allow for custom paginators. Thanks to piquadrat for the report and initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 04:32:36 +00:00
Russell Keith-Magee
23a19240da
Fixed #14833 -- Skip the sitemaps localization test if i18n isn't enabled. Thanks to Julien Phalip for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 02:07:46 +00:00
Russell Keith-Magee
b11c21d69a
Fixed #14799 -- Provided a full solution for test database creation order problems.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 00:44:34 +00:00
Ramiro Morales
23f69af454
Fixed #12201 -- Added a lineno attibute to template Token so e.g. we can report line numbers in errors during i18n literals extraction. Thanks madewulf for the report and Claude Paroz for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 17:42:54 +00:00
Russell Keith-Magee
adfd7f8172
Fixed #14797 -- Corrected the handling of get_form_class() when a custom queryset has been defined, but a model hasn't. Thanks to Gabriel Grant for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 11:20:52 +00:00
Russell Keith-Magee
324658ef26
Fixed #14803 -- Corrected an inconsistency in redirection handling between old-style generic views and class-based views. Thanks to gg for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 11:20:30 +00:00
Russell Keith-Magee
ac91d5ef08
Fixed #14807 -- Ensure that boolean values aren't localized as T.rue and Fa.lse because of the thousand separator. Thanks to vanschelven for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 07:44:00 +00:00
Alex Gaynor
5bc0ec4ec4
Removed all usages of deprecated TestCase methods (self.fail*). This removed most of the Warnings emitted (with -Wall) during the test suite.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 07:28:12 +00:00
Russell Keith-Magee
6770c36262
Fixed #14737 -- Moved the docstring comment for the cache_page decorator so it gets picked up as a docstring. Thanks to adamv for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 06:49:51 +00:00
Russell Keith-Magee
5b8ef18dcc
Fixed #14795 -- Ensure that get_all_permissions() returns the right result (i.e., all permissions) for superusers. Thanks to jay.halleaux@gmail.com for the report, and Brett Haydon for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 05:59:56 +00:00
Russell Keith-Magee
52c77803d2
Normalized the name order of arguments. There's no actual bug here, other than potential confusion for anyone reading the code. Thanks to Aram Dulyan for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 05:59:38 +00:00
Russell Keith-Magee
79adb51514
Fixed #12694 -- Added template block to make it easier to add new tools to the change_list and change_form templates. Thanks to andybak for the suggestion, and Simon Meers for the final patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 05:35:15 +00:00
Russell Keith-Magee
ae7213b593
Fixed #14563 -- Added Turkish localflavor. Thanks to serkank for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 05:25:24 +00:00
Russell Keith-Magee
34a386378f
Fixed #13190 -- Improved error handling for the case where no authentication backends are defined. Thanks to Joel3000 for the report, and Łukasz Rekucki for the final patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 04:47:59 +00:00
Russell Keith-Magee
b5754e60b4
Fixed #14663 -- Corrected Norwegian locale format strings. Thanks to nfg for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 04:28:17 +00:00
Russell Keith-Magee
19afc46c33
Fixed #12158 -- Corrected Swedish translation for "Go". Thanks to skorpan for the report, and claudep for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 04:27:45 +00:00
Russell Keith-Magee
f964a3b1ee
Fixed #14819 -- Corrected typo in serializer docstring. Thanks to stringify for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 04:27:05 +00:00
Alex Gaynor
d68598e022
Fixed #14700 -- ensure that a raw query is only executed once per iteration.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14785 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-03 20:25:59 +00:00
Ian Kelly
5475da1c32
Added a regression test for r14781. Also fixed a bug where connection.vendor was effectively always 'unknown', causing all vendor-specific tests to be skipped.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14783 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-03 18:15:54 +00:00
Ian Kelly
cbf9d6e0bb
Fixed the Oracle environment variables not getting set correctly under Cygwin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-03 00:54:39 +00:00
Luke Plant
1c9a506d21
Fixed a use of old url template tag in an admin template.
...
This was missed from r14643. I grepped for other instances and this was the
only one missing that I could find.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 14:26:42 +00:00
Justin Bronn
0f879195a6
GeoDjango test suite housekeeping. Moved data into fixtures for `relatedapp` and `distapp` tests, and made both use Django's `TestCase`; moved functionality out of `GeoDjangoTestSuiteRunner` to allow future re-use in `runtests.py` (refs #10420 ); compressed test app fixtures and cleaned up imports.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 05:58:21 +00:00
Jannis Leidel
fb391b8b98
Fixed #8217 -- Correctly sort files in FilePathFields on older Python versions. Thanks, bernd and davidb.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 00:49:15 +00:00
Jannis Leidel
7421f7269e
Fixed #11161 -- Added plural forms to all supported languages. Fixed other errors in the translation files that prevented them to pass the msgfmt check in preparation for the move to Transifex. Refs #14735 , too.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 00:48:56 +00:00
Jannis Leidel
16c21bc45a
Fixed #14735 -- Corrected plural formulation in admin search form template. Thanks, Claude.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 00:44:55 +00:00
Jannis Leidel
cc64fb5c4b
Fixed #8342 -- Removed code from the admin that assumed that you can't login with an email address (nixed by r12634). Also refactored login code slightly to be DRY by using more of auth app's forms and views.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 00:44:35 +00:00
Jannis Leidel
07705ca129
Fixed #5298 -- Added extra_context to contrib auth views.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 00:43:52 +00:00
Jannis Leidel
3d5bb27945
Added an additional check for the availability of the STATIC_* settings to make sure upgrading a pre-1.3 project doesn't raise a misleading error. Thanks for the report, Florian Apolloner.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 00:43:36 +00:00
Jannis Leidel
a172ed00af
Fixed #9568 -- Hide nav-global div in admin login template in case it's used admin/base_site.html or admin/base.html. Thanks, AmanKow.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 00:43:19 +00:00
Ian Kelly
1f68dc4ad4
Fixed #11706 : Added an Oracle connection option to disable the use of RETURNING INTO in INSERT statements.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-01 23:36:56 +00:00
Chris Beaven
dceaa82dec
Fixed #14809 -- broken login related tests after r14733.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-01 22:25:17 +00:00
Alex Gaynor
21f5dc467e
Fixed a bug in date queries with GIS backends introduced in [14715].
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-01 17:53:22 +00:00
Jacob Kaplan-Moss
2fa22a4b64
Ensured that the test suite creates the default DB before any others.
...
Refs #14799 . Technically this fixes the problem, but I'm far from convinced
it's the perfect solution, so I'm leaving the ticket open. I'm committing
this now because it's the minimum required to get the test suite running
again, but this commit can -- and probably should -- be reverted in favor of
a more holistic fix later on.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-30 22:14:03 +00:00
Ramiro Morales
0714b0f390
Fixed #14812 -- Made parsing of the If-Modified-Since HTTP header more robust in presence of malformed values when serving static content. Thanks shaohua for the report, and alexey.smolsky@gmail.com for a similar report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14753 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-30 21:27:26 +00:00
Chris Beaven
d3f5f219f5
Fixes #10427 -- Abstract the value generation of a BoundField
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-28 02:50:31 +00:00
Chris Beaven
e74edb4d53
Fixes #11025 -- ability to specify LOGIN_URL as full qualified absolute URL.
...
auth.views.login now allows for login redirections for different schemes
with the same host (or no host even, e.g. 'https:///login/ ')
auth.decorators.login_required can now use lazy urls (refs #5925 )
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-27 22:43:33 +00:00
Russell Keith-Magee
0be14b0b96
Fixed #12248 -- Refactored django.template to get code out of __init__.py, to help with avoiding circular import dependencies. Thanks to Tom Tobin for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-27 05:47:30 +00:00
Alex Gaynor
678f626c24
Fixed a suite of errors in the ORM -- a) fixed calling values_list().values_list() and changing whether the results are flat, b) fixed an issue with fields on the left-hand side of what becomes the HAVING clause not being included in the GROUP BY clause, and c) fixed a bug with fields from values() calls not being included in the GROUP BY clause. This fixed the recent test failures under postgresql.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 14:24:08 +00:00
Jannis Leidel
6a32e253f6
Fixed #7735 -- Added support for IPv6 adresses to runserver and testserver management command. Thanks to Jason Alonso and Łukasz Rekucki for the report and initial patches.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 13:33:53 +00:00
Jannis Leidel
132afbf8ee
Fixed #5612 -- Added login and logout signals to contrib auth app. Thanks SmileyChris and pterk.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 13:33:27 +00:00
Jannis Leidel
81323cb119
Fixed #14730 -- Fixed unclosed anchor tag in Mongolian translation. Thanks for the report, ankhbayar.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 13:32:58 +00:00
Jannis Leidel
ab578bfe63
Fixed #14721 -- Made the THOUSAND_SEPERATOR a unicode string in a few locales. Thanks, Claude Paroz.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 13:32:32 +00:00
Russell Keith-Magee
78be884ea7
Fixed #3304 -- Added support for HTTPOnly cookies. Thanks to arvin for the suggestion, and rodolfo for the draft patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 13:30:50 +00:00
Chris Beaven
aff9ff9bf5
Fixes #14715 -- More informative ValueError for safe_join util. Thanks btubbs.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 02:28:07 +00:00
Russell Keith-Magee
4ddde2f8d5
Fixed #14415 -- Corrected the process of creating and destroying test databases to prevent accidental deletion of the source database. Also improves the mirroring process to prevent some cross-connection effects. Thanks to Shai Berger for the help diagnosing and testing.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14696 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-25 12:37:28 +00:00
Luke Plant
073412b411
Fixed #14700 - speed up RawQuerySet iterator.
...
This moves constant work out of the loop, and uses the much faster *args
based model instantiation where possible, to produce very large speed ups.
Thanks to akaariai for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-24 15:26:29 +00:00
Chris Beaven
4c51986790
Fixes #3529 -- more explicit documentation about Context.update. Thanks for the patch, ggetzie.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-24 00:36:36 +00:00
Luke Plant
ff7c243b4c
Fixed #14697 - speeded up model instance creation by moving work outside of loops
...
Thanks to akaariai for the report and initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-23 13:54:58 +00:00
Russell Keith-Magee
2efb4757af
Fixed #14752 -- Corrected date parsing in WeekArchiveView when using %W as a week format. Thanks to msundstr for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14684 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-23 01:46:48 +00:00
Alex Gaynor
3498849532
Fixed #14424 -- corrected a NameError when instantiating a RelatedFieldWidgetWrapper.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-22 21:55:29 +00:00
Alex Gaynor
07ba3220ba
Fixed #14754 -- corrected using an aggregate in an F expressions when that queryset is later used in a subquery. Thanks to master for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-22 18:00:01 +00:00
Honza Král
dc334a2ba8
Fixed #3400 -- Support for lookup separator with list_filter admin option. Thanks to DrMeers and vitek_pliska for the patch!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 19:29:15 +00:00
Alex Gaynor
274aba3b9b
Fixed #11108 -- added ModelAdmin.delete_model, a hook with which to perform custom pre-post delete behavior. Thanks to Florian Apolloner for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 19:00:40 +00:00
Alex Gaynor
0cf1c96d06
Removed some deprecated code that survived [14138].
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 18:08:00 +00:00
Alex Gaynor
f5f18a38ab
Fixed #14749 -- added support for using Django's file object as context managers. Thanks to Florian Apolloner for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 17:51:41 +00:00
Honza Král
aee9db9b3e
Preventing problems possibly introduced by r14662
...
acquire a lock before entering a try block that ends with the lock's
release. Thanks for the catch Alex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 17:34:21 +00:00
Honza Král
65b380e74a
Fixed #11418 -- formset.cleaned_data no longer raises AttributeError when is_valid is True. Thanks mlavin!
...
This also introduces a slightly backwards-incompatible change in
FormSet's behavior, see the release docs for details.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 17:27:01 +00:00
Ramiro Morales
752bd8bf75
Added printing of the name of test database being created/destroyed, at verbosity level 2. Refs #14415 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 17:18:26 +00:00
Ramiro Morales
6774207394
Fixed #14453 -- Changed handling of microseconds part in typecast_timestamp() DB backend helper function to be more correct. Thanks philipn for the report and fix.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 15:08:53 +00:00
Honza Král
f27e6f0dd1
Fixed #14533 -- Make django signals more thread-safe. Thanks milosu for the patch!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 14:54:23 +00:00
Honza Král
14abb7c52c
Fixed #14741 -- CZ Localflavor clean() incorrectly called super.__init__. Thanks for the report and patch idangazit!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 14:06:32 +00:00
Honza Král
70b3ac1f07
Few improvements to FormPreview, thanks Andy!
...
This commit adds several new hooks in backwards-compatible way:
* get_initial to specify initial data based on request
* get_auto_id to enable different AUTO_ID values
* get_context for overriding and extending default context contents
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 13:47:38 +00:00
Chris Beaven
b8a78804b5
Fixes #13804 -- URLField validation failure for a url containing '://' on the path and no scheme
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 10:08:28 +00:00
Chris Beaven
f6ead36969
Fixed #4552 -- minor tidy up of the {% for %} tag's comma splitting
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 08:03:58 +00:00
Carl Meyer
9b432cb67b
Fixed #5768 -- Added support for ManyToManyFields and reverse relations in values() and values_list(). Thanks to mrmachine for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 02:28:25 +00:00
Justin Bronn
7592d68541
Now possible to run the GeoDjango test suite with a minimal settings file. Refs #10420 , #14439 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 23:54:59 +00:00
Luke Plant
d4c6abcbd1
Documented migration path for change object_list -> ListView regarding different context variables
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 20:38:52 +00:00
Russell Keith-Magee
7ff5580d95
Fixed #14389 , #9666 -- Started the migration path to make the first argument to url and ssi template tags syntactically consistent with other tags. Thanks to Sean Brant for the draft patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 06:22:28 +00:00
Russell Keith-Magee
591ad8afbf
Fixed #14512 -- Added documentation on how to apply decorators to class-based generic views. Thanks to Łukasz Rekucki for his work on the issue.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 05:10:13 +00:00
Ramiro Morales
0e26f58dae
Corrected change in behavior regarding the page shown after the 'Save' button is pressed when adding a user through the admin.
...
It had been introduced in trunk (r13503) and between 1.2.1 and 1.2.2 (r13504). The original fix intended to correct a similar problem introduced between 1.1 and 1.2 (r12218) this time in the 'Save and add another' button.
We have now tests for the three buttons present in the Add User admin form to avoid future regressions.
Thanks to Juan Pedro Fisanotti and Cesar H. Roldan for their work.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 22:45:51 +00:00
Russell Keith-Magee
99d247f4cb
Fixed #13795 -- Added a site-wide cache prefix and cache versioning. Thanks to bruth for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 15:39:35 +00:00
Alex Gaynor
49d831380f
Corrected the way databases were compared. This allows running the test suite with two in memory SQLite databases.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 08:08:08 +00:00
Carl Meyer
008f333bac
Fixed pk uniqueness validation for new objects created outside of a ModelForm. Also removed need for ModelForm to poke at Model._state.adding, keeping it an internal ORM concern.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-18 23:29:58 +00:00
Carl Meyer
38ba3775ec
Fixed #14234 -- Re-validating a model instance added via ModelForm no longer throws spurious PK uniqueness errors. Thanks to David Reynolds and Jeremy Dunck.
...
Also moved Model._adding to Model._state.adding to reduce instance namespace footprint.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-18 22:43:46 +00:00
Jannis Leidel
9b6535b894
Fixed #7077 and #7431 -- Use getpass.getuser instead of pwd.getpwuid to determine the current system user's username in the createsuperuser management command to enable the feature on Windows. getpass.getuser automatically falls back to the previous method.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 20:28:33 +00:00
Alex Gaynor
fc47f8c65a
Fixed #14257 -- removed ManyToManyField.isValidIDList which was completely dead code (unused since magic-removal). Thanks to andrewsk for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 17:00:40 +00:00
Alex Gaynor
0eb31d3dc9
Fixed #14423 -- corrected incorrect SQL being generated when a nullable, inherited field was used in an exclude. Thanks to PhiR_42 for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 16:46:50 +00:00
Jannis Leidel
17b329ae08
Fixed #10004 and #12320 -- Enabled the makemessages management command to collect comments for translators that start with the "Translators" keyword. Thanks for the report and patches, martinb and Claude Paroz.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:37:33 +00:00
Jannis Leidel
96af304747
Fixed #10636 -- Added check to make sure the ADMIN_MEDIA_PREFIX setting is properly set before serving files with the AdminMediaHandler.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:36:42 +00:00
Jannis Leidel
33d8fcde8a
Fixed #14693 , #14709 -- Backwards incompatible change to rectify the confusion around the STATICFILES_URL and STATICFILES_ROOT settings.
...
* Two new global settings that will be used by -- **but are not limited to** -- the staticfiles app: STATIC_ROOT and STATIC_URL.
* Moving the 'django.contrib.staticfiles.templatetags.staticfiles' template tag to the core ('django.templatetags.static') and renaming it to 'get_static_prefix'.
* Moving the context processor 'django.contrib.staticfiles.context_processors.staticfiles' to the core ('django.core.context_processors.static') and renaming it to 'static'.
* Paths in media definitions will use STATIC_URL as the prefix if the value is not None, and falls back to the previously used MEDIA_URL.
Thanks again to the community for constructive criticism and Carl and Russ for sanity-inducing discussions on IRC.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:36:26 +00:00
Ramiro Morales
5666bca678
Fixed #11369 -- Corrected verbose_name_plural model Meta option to be consistent with verbose_name when using abstract model inheritance. Thanks Beetle_B for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 12:09:21 +00:00
Alex Gaynor
4276b5197b
Fixed #12687 -- fixed an issue with aggregates and counts in conjunction with annotations where the QuerySet was provably empty.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14586 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 02:57:14 +00:00
Adrian Holovaty
5844cdca38
Small grammar fix in 'user-uploaded files' comment from [14560]
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 23:48:08 +00:00
Ramiro Morales
f3d0704783
Fixed #14691 -- Made ForeignKey.validate() use the right database. Thanks Marco Paolini for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 22:09:13 +00:00
Luke Plant
b84838aef4
Fixed #14576 - FormWizard.done() method doesn't get passed the last form in the list
...
Thanks to cyberdelia for report and test, and steph for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 14:37:00 +00:00
Luke Plant
f6363bc628
Fixed potential circular import problem.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 23:35:16 +00:00
Ramiro Morales
b6ec268e23
Fiexed #3055 -- Validate that models target of a GenericRelation have a GenericForeignKey field.
...
Thanks jason for diagnosing the problem and Marcos Moyano for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 23:21:39 +00:00
Luke Plant
0324151bec
Fixed #14685 - incompatible code in contrib.sessions.models
...
Thanks to PaulM for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 22:23:46 +00:00
Ramiro Morales
74f46c0ae2
Fixed #10650 -- Clarified description of MEDIA_ROOT in setting files. Thanks jjconti, tvon, vak, Muhammad Alkarouri and thiggins for their work.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 15:42:54 +00:00
Jannis Leidel
ff63a5bdec
Fixed #14632 -- Skip a messages test if auth app is not in INSTALLED_APPS. Thanks, gregmuellegger.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:43:13 +00:00
Jannis Leidel
9b7be918ed
Fixed #12325 -- Allows zero values for moderate_after and close_after fields of comment moderators. Thanks, Gabriel Hurley.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:42:56 +00:00
Jannis Leidel
109f42a981
Fixed #14670 -- Made GenericTabularInline aware of changes made in r13708. Thanks, gregmuellegger.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:42:31 +00:00
Jannis Leidel
e9f3899b20
Refactored runserver command and moved code related to staticfiles to a subclass that is enabled if staticfiles app is installed.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:41:55 +00:00
Jannis Leidel
1ed62706e7
Fixed a few typos introduced in r14533.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:41:24 +00:00
Ian Kelly
87a8046f90
Made the oracle backend throw the same ValueError as the mysql backend when a timezone-aware datetime is passed in. This fixes a datatypes test failure.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14544 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 18:39:30 +00:00
Ian Kelly
e0e347c2d3
Fixed a misapplied test skip feature in the oracle backend from r14139.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14543 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 17:51:31 +00:00
Ian Kelly
ee6bec6c09
Fixed #11101 : Rewrote the sequence reset SQL for Oracle to prevent it from performing an implicit commit that caused all fixtures to be automatically committed, causing a large number of test failures.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 01:44:22 +00:00
Jannis Leidel
70edd4e103
Reverted deprecation of media context processor (from r14293) to separate static files and media files a bit more.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 21:44:33 +00:00
Jannis Leidel
8e96584f63
Fixed #14524 , #14582 , #14617 , #14665 and #14667 -- Tweaked staticfiles app.
...
* Updated StaticFilesHandler and AdminMediaHandler
to make use of the 404 handler if needed.
* Updated runserver management command to serve static files
only in DEBUG mode (or if specified the --insecure option)
and if the staticfiles app is in INSTALLED_APPS. Also added
an option to disable serving completely (--nostatic).
* Added check in debug mode if STATICFILES_* settings are
different to MEDIA_* settings.
* Removed a faulty PendingDeprecationWarning in AdminMediaHandler
that is triggered every time runserver is used.
* Fixed an issue with the modification time checks when
running collectstatic.
* Extended and refined documentation.
Thanks to everyone for input, especially to Carl Meyer, Ted Kaemming and
Adam Vandenberg for patches.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 21:43:49 +00:00
Alex Gaynor
34b5739216
Remove the executable flag from uploadhandler.py, it wasn't. Thanks to Florian for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 17:51:14 +00:00
Luke Plant
02fc6276d7
Fixed #14508 - test suite silences warnings.
...
Utility functions get_warnings_state and save_warnings_state have been added
to django.test.utils, and methods to django.test.TestCase for convenience.
The implementation is based on the catch_warnings context manager from
Python 2.6.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 15:06:20 +00:00
Luke Plant
7beca4d3e5
Made the deprecation warning for reponse.template more useful by pointing to the caller.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 15:04:37 +00:00
James Bennett
c5fef1d767
Bump version number and download URL for 1.3 alpha 1.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 07:15:30 +00:00
Ramiro Morales
cae746e037
Fixed error introduced in r14512.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14514 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 05:17:31 +00:00
Ramiro Morales
4fb1825e75
Fixed small multi-db compatibility issue in the Oracle backend.
...
Also, converted a couple of constructs to a more Python idiomatic form.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 05:07:32 +00:00
Ramiro Morales
f91b41fe33
Implemented changes made in r14320 in the Oracle backend. Thanks Russell for reviewing the proposed fix.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14510 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 04:36:20 +00:00
Justin Bronn
cab434e011
Fixed #14653 -- Removed vestigal `getstatusoutput` from GeoDjango utils.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14508 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-09 17:39:01 +00:00
Carl Meyer
616b30227d
Fixed #7539 , #13067 -- Added on_delete argument to ForeignKey to control cascade behavior. Also refactored deletion for efficiency and code clarity. Many thanks to Johannes Dollinger and Michael Glassford for extensive work on the patch, and to Alex Gaynor, Russell Keith-Magee, and Jacob Kaplan-Moss for review.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-09 16:46:42 +00:00
Ramiro Morales
9c619ac48b
Fixed some Oracle backend test DB creation code bugs.
...
Made saving of modified settings compatible with multi-db, removed dead and superfluous code.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14489 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 20:58:46 +00:00
Alex Gaynor
96cc7baf0c
Fixed #13684 -- if settings.ROOT_URLCONF isn't defined don't blow up with an UnboundLocalError.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14488 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 16:02:22 +00:00
Justin Bronn
0b2fef5dd3
Fixed brittle test case for `GEOSGeometry.valid_reason`.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14476 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 16:41:53 +00:00
Justin Bronn
6c85a44416
Fix for running GEOS/GDAL tests on Python 2.6 and below.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 16:29:19 +00:00
Ramiro Morales
59d5537a6c
Fixed #14630 -- Increased maximum size of the Oracle tablespace datafile used for tests from 100MB to 200MB.
...
This allows the execution of the full Django test suite without running out of allocated space.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 04:30:17 +00:00
Alex Gaynor
56ae68c92f
Removed the use of a deprecated unittest method.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14465 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 00:43:20 +00:00
Alex Gaynor
e2a0de0b93
Fixed a test failure introduced in [14461].
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 16:37:00 +00:00
Alex Gaynor
abaa3ed4bd
Fixed #13935 , added support for using QuerySet.dates across related fields. Thanks to valyagolev for his work on the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 16:03:05 +00:00
Jannis Leidel
127506aeac
Fixed #11966 -- Made it possible to use a percent sign in a translation message id. Thanks for the patch, Claude Paroz.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 14:06:24 +00:00
Luke Plant
6feef0c13e
Fixed #14612 - Password reset page leaks valid user ids publicly.
...
Thanks to PaulM for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14456 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 12:36:55 +00:00
Luke Plant
7d4a3991f3
Fixed a test setup and isolation bug that was causing PasswordResetTest to fail when run individually
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14455 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 12:31:57 +00:00
Jannis Leidel
efc5384a32
Fixed #6476 -- Added option to makemessages management command to disable wrapping of long lines. Thanks to pytechd for the initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 12:08:37 +00:00
Russell Keith-Magee
c906b270f5
Fixed #14602 -- Added an extra check to wsgi.input handling to prevent AppEngine from choking. Thanks to Waldemar Kornewald for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 12:03:38 +00:00
Jannis Leidel
83aeb3c768
Fixed #9988 -- Added support for translation contexts. Thanks, Claude Paroz.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14450 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 10:48:27 +00:00
Justin Bronn
cabc21ca60
Fixed #14318 -- Added `GEOSGeometry.valid_reason` property. Thanks, Rob Coup.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 01:29:37 +00:00
Alex Gaynor
877033b479
Sped up the create_permissions signal handler (and thus the test suite) by restructuring its queries.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 00:01:54 +00:00
Justin Bronn
d8e311c8d1
Updated OpenLayers (now points to 2.10) and OpenStreetMap JavaScript URLs.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 19:31:14 +00:00
Alex Gaynor
222c732616
Fixed #10728 -- corrected subclassing of Fields who use the SubfieldBase metaclass. Thanks to G2P and George Sakkis for their work on the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 18:40:53 +00:00
Alex Gaynor
352deb0915
Fixed #14559 -- corrected some typos and misleading docstrings. Thanks to Gabriel Hurley for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 18:30:00 +00:00
Carl Meyer
4ba6348a00
Fixed #14598 -- Changed some 'domain.com' uses to 'example.com'
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 16:19:17 +00:00
Russell Keith-Magee
a89e02637b
Fixed #13567 -- Added a 'silent' argument to the cycle tag, so that you can declare a cycle without producing a value in the template. Thanks to anentropic for the suggestion and initial patch, and Łukasz Rekucki for the final patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 13:42:30 +00:00
Russell Keith-Magee
3e62e253d2
Fixed #14594 -- Corrected r14435, which got the logic completely bass ackwards. Thanks to Mark Sundstrom for keeping me honest :-)
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14436 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 08:30:01 +00:00
Russell Keith-Magee
32f650cfcc
Fixed #14594 -- Corrected a problem introduced by r14394 whereby reading POST data when running a WSGI server under CherryPy would hang. Thanks to Mark Sundstrom for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 07:38:06 +00:00
Russell Keith-Magee
1fc7c4aee4
Fixed #14596 -- Light refactoring of the cache backends.
...
* Removes some code duplication,
* Provides a convenient base class for db-like cache backends
* Adds tests for an edge case of culling,
* Marks the memcached tests as "skipped", rather than omitting them.
Thanks to Jonas H for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 05:55:08 +00:00
Alex Gaynor
ed51dd5d64
Avoid an O(n**2) operation where O(n) will suffice. Possibly worth a second or two when running the test suite.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 05:41:46 +00:00
Justin Bronn
1ee4274ff1
Fixed some a stale location and whitespace in GeoIP tests.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-01 22:18:22 +00:00
Justin Bronn
315ae1ce6e
Fixed regression introduced in r13755 that prevented the running of the GEOS/GDAL test suites without configuring Django settings; moved reference geometry data from Python module to compressed JSON fixture; put in workaround in tests for GDAL bug #3783 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-01 21:56:48 +00:00