mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 11:35:53 +00:00
Code Issues 30 Releases Wiki Activity
8,206 Commits 28 Branches 426 Tags 674 MiB
8f3d6b9404
Commit Graph

417 Commits

Author SHA1 Message Date
Adrian Holovaty
908f0a66e3 Small wording improvements to sitemaps.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-07 22:56:03 +00:00
Adrian Holovaty
e97ec4d142 Fixed #8919 -- Fixed typo in signals.txt. Thanks, jbalogh 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-07 06:18:59 +00:00
Adrian Holovaty
756fa95bd2 Fixed #8727 -- Fixed broken link to Italian SSN page in localflavor.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-06 23:44:42 +00:00
Adrian Holovaty
c402e3b977 Fixed #8858 -- Fixed typo in SQLite version information. Also reworded it to be a bit more future-compatible. Thanks, adamv 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-06 16:54:25 +00:00
Adrian Holovaty
83dd70fddb Fixed #8909 -- Fixed typo in contenttypes docs. Thanks, arien 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-06 16:49:31 +00:00
James Bennett
3239849174 Correct bad target in middleware documentation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-04 09:50:45 +00:00
James Bennett
36b120c23a Fixed #8867: Corrected a couple typos in the signals documentation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-04 07:29:27 +00:00
Jacob Kaplan-Moss
58fad7f9fd Added the last notes about 1.0, including the inevitable (short!) list of known issues. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 23:10:07 +00:00
Jacob Kaplan-Moss
7c2e2d2b5e Added a note about queryset.query being opaque. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 21:47:57 +00:00
Jacob Kaplan-Moss
d7e37b661c Added a note about SQLite versions before 3.3.6. Refs #7570. Thanks, ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 21:10:42 +00:00
Jacob Kaplan-Moss
7b0b992a87 Fixed #8849: added some more "new in 1.0" flags. Thanks, ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 20:55:04 +00:00
Simon Willison
cd5a00b4e4 Fixed #8838 - two typos in model field docs. Thanks, arien 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 15:35:58 +00:00
Malcolm Tredinnick
fd1d986bb1 Fixed #8802 -- Documented MySQL's usage of 1/0 instead of True/False for model 
BooleanFields.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 06:14:13 +00:00
James Bennett
a92d511a17 Fixed #8804: corrected URL example in sitemaps docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 04:42:49 +00:00
Jacob Kaplan-Moss
bc768e2b47 A bunch of cleanups to file documentation. Along the way some references to the old file methods were removed - thanks, varikin. 
Fixes #8642.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 17:33:51 +00:00
Brian Rosner
c1de41f4d2 Fixed #7973 -- Added exclude to BaseModelAdmin to make everything consistent with the form/formset factories. Refs #8071 to make it easier to get at exclude. Thanks julien for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 17:26:24 +00:00
Jacob Kaplan-Moss
b1f5ed00cb Fixed #7943: added documentation on overriding admin templates. Thanks, mwdiers 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 16:47:45 +00:00
Jacob Kaplan-Moss
1156db790a Added a rough draft of the 1.0 porting guide, and an obviously incomplete placeholder for the 1.0 release notes. Thanks to daonb, patrickf, and ramiro for contributions to this porting guide. Refs #8438. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 16:27:47 +00:00
Jacob Kaplan-Moss
64a9469127 Fixed #8753: converted "new in ..." callouts to proper Sphinx "versionadded/versionchanged" directives. Thanks to Marc Fargas for all the heavy lifting here. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 03:40:42 +00:00
James Bennett
c7a10b677d Fixed #8786: Moved phone number field docs to localflavor 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 00:26:28 +00:00
Jacob Kaplan-Moss
3a18002bbd Fixed #8210 and #8664: moved USStateField and PhoneNumberField to django.contrib.localflavor.us. This is a backwards-incompatible change, albeit a minor one; just add an aditional import and go on your way. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 22:15:35 +00:00
James Bennett
a72eae0be7 Fixed #8728: Corrected some broken links in the documentation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 09:45:30 +00:00
James Bennett
82e2f9bb98 Fixed #8698: Updated overview docs for cache middleware to show that it's been split into two classes 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 09:42:15 +00:00
James Bennett
b085ccce6c Fixed #8730: Incorporated (with minor changes) additions/enhancements to one-to-one docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 09:32:41 +00:00
Jacob Kaplan-Moss
4ae746b574 Added a TypedChoiceField which acts just like ChoiceField, except that it 
returns a value coerced by some provided function. Refs #6967.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 20:10:50 +00:00
James Bennett
84ef4a9b1d Fixed #8641: Documented the fact that file-saving methods must receive a File instance 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 10:37:44 +00:00
James Bennett
78ca7a6c07 Fixed #8533: restored model inheritance docs, and updated one-to-one docs to match 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 10:13:32 +00:00
James Bennett
f2c80f93d9 Fixed #8658: Added cross-references to signals docs from Model.save() docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 09:03:18 +00:00
James Bennett
6ba55eee30 Fixed #8679: use full signature of Model.save() in docs and remove no-longer-used 'raw' argument 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 08:55:08 +00:00
James Bennett
5e26fceb83 Fixed #8721: Clarification in docs for form previews 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8753 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 07:54:31 +00:00
James Bennett
d73c9a5671 Fixed #8639; documented the fact that the "startproject" command is invalid when fed an existing project's settings 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 08:59:37 +00:00
James Bennett
0a11c13acf Fix inadvertent formatting introduced in [8732] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 06:02:14 +00:00
James Bennett
b02d2aba1c Fixed #8700: Corrected example in localflavor docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 05:39:34 +00:00
James Bennett
3fc6b10a0e Fixed #8516: Corrected typos in UK localflavor documentation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 05:32:28 +00:00
James Bennett
2c1166e66d Fixed #8545: Corrected typo in request/response docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 05:30:44 +00:00
James Bennett
3a7fc0c797 Fixed #8247: Added explanation to admin docs to point out that AdminSite can be subclassed and instantiated like any other Python class 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 05:29:19 +00:00
Jacob Kaplan-Moss
c068bc184c Merge branch 'url-tag-asvar' 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 19:28:03 +00:00
Brian Rosner
c113133dad Fixed #7893 -- Gave fieldsets dictionary options a better visual display to set aside from other options in the ModelAdmin due to some name clashing causing confusion. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 17:02:06 +00:00
Malcolm Tredinnick
2dba41056f Revived a bunch of missing documentation that got lost in the docs-refactor. 
This describes values_list(), the new cross-model order_by() syntax and the
effects of distinct(), values() and order_by() on each other.

Fixed #8634.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 05:04:26 +00:00
Malcolm Tredinnick
d22ee35ee9 Fixed #8662 -- Fixed the documentation of Model.save() to match the real 
signature so that people overriding it will use the right signature.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 01:44:15 +00:00
Malcolm Tredinnick
c181734fa1 Changed create() and get_or_create() to force an insert (not update an existing value). 
Backwards incompatible if you are using manually-specific primary key values
and relying on the previously documented behaviour that the new values would
always exist in the database (i.e. it would update the existing entry).

Fixed #8419.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 17:18:05 +00:00
Jacob Kaplan-Moss
2e7a87c53c Fixed a typo in comments upgrade guide. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 16:27:19 +00:00
Russell Keith-Magee
5c43a0a43f Fixed #8406: Corrected some expected output to use repr format. Thanks to arien for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 13:40:20 +00:00
Russell Keith-Magee
545cd6d6f0 Fixed #8583: Modified the migration SQL described in the comments upgrade docs to account for a problem found with freecomments using Postgres. Thanks to rajeshd for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 11:43:54 +00:00
Russell Keith-Magee
ab28e72f31 Fixed #8590: Added clarification that you need to install the new comments system before trying to port data. Thanks to julien for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8652 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 11:39:27 +00:00
Russell Keith-Magee
3442821836 Fixed #8595: Removed a note about possible changes to the syntax of the {% url %} template tag. Thanks to julien for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 11:29:00 +00:00
Jacob Kaplan-Moss
ff420b4364 Fixed #8454: added a FILE_UPLOAD_PERMISSIONS setting to control the permissoin of files uploaded by the built-in file storage system. Thanks, dcwatson. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 22:21:14 +00:00
Gary Wilson Jr
c2ba59fc1d Removed oldforms, validators, and related code: 
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
 * Removed oldforms specific bits from model fields:
   * Removed `validator_list` and `core` arguments from constructors.
   * Removed the methods:
     * `get_manipulator_field_names`
     * `get_manipulator_field_objs`
     * `get_manipulator_fields`
     * `get_manipulator_new_data`
     * `prepare_field_objs_and_params`
     * `get_follow`
   * Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
 * Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
 * Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
 * Serialization framework
   * `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
   * Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
 * Removed `django.core.validators`:
   * Moved `ValidationError` exception to `django.core.exceptions`.
   * For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
 * Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
 * Removed an oldforms-style model creation hack (refs #2160).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 07:19:44 +00:00
Malcolm Tredinnick
9de848cec9 Fixed #8544 -- Some more documentation markup fixes from Thejawsi Puthraya. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 05:57:27 +00:00
Malcolm Tredinnick
5577b96ae4 Fixed #8526 -- Corrected the default value for the SESSION_FILE_PATH documentation. Thanks, Piotr Lewandowski. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 05:57:10 +00:00
Malcolm Tredinnick
4091e6525d Fixed #8518 -- Fixed some markup problems in the widget documentation. Thanks, 
Thejawsi Puthraya.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 05:56:57 +00:00
Jacob Kaplan-Moss
52c3c3a349 Fixed an error in comment upgrade SQL. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 19:59:54 +00:00
Jacob Kaplan-Moss
c5cc26ff99 Fixed some Sphinx markup in signals docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 19:23:59 +00:00
Jacob Kaplan-Moss
6f29ad31b5 Fixed #8326: added signals documentation. 
Thanks to MercuryTide's signal whitepaper from 2006 (http://www.mercurytide.co.uk/whitepapers/django-signals/) for inspiration and ideas for organization, and to the folks who got the Signals wiki page together for some of the content.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 19:04:52 +00:00
Jacob Kaplan-Moss
c5c61b261e Fixed #8555: corrected get_comment_form tag documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 15:23:02 +00:00
Malcolm Tredinnick
3111d7f60b Fixed #7201 -- Fixed the timeuntil filter to work correctly with timezone-aware 
times. Patch from Jeremy Carbaugh.

This is backwards incompatible in the sense that previously, if you tried to
compare timezone-aware and timezone-naive values, you got an incorrect result.
Now you get an empty string. So your previously incorrect code returns a
different incorrect result.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 08:08:55 +00:00
Malcolm Tredinnick
f2b389b354 Added documentation to explain the gains and losses when using utf8_bin 
collation in MySQL. This should help people to make a reasonably informed
decision. Usually, leaving the MySQL collation alone will be the best solution,
but if you must change it, this gives a start to the information you need and
pointers to the appropriate place in the MySQL docs.

There's a small chance I also got all the necessary Sphinx markup correct, too
(it builds without errors, but I may have missed some chances for glory and
linkage).

Fixed #2335, #8506.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 01:59:25 +00:00
Malcolm Tredinnick
b47c25ef91 Removed a stray reference to mysql_old in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 00:09:29 +00:00
Jacob Kaplan-Moss
6abe0460c8 Fixed a silly typo in comment settings doc. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 22:34:27 +00:00
Jacob Kaplan-Moss
cba91997a2 Refactored Django's comment system. 
Much of this work was done by Thejaswi Puthraya as part of Google's Summer of Code project; much thanks to him for the work, and to them for the program.

This is a backwards-incompatible change; see the upgrading guide in docs/ref/contrib/comments/upgrade.txt for instructions if you were using the old comments system.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 22:14:22 +00:00
Jacob Kaplan-Moss
7e06b69a3d Removed outdated "adminindex" command -- the same behavior is now far easier and better done in a template, or perhaps a custom AdminSite.index function. Refs #5500. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 18:53:18 +00:00
Russell Keith-Magee
06d49768bd Fixed #7743: Reverted [8483], which was itself a reversion of [8481], after confirmation from Malcolm. Corrected a long standing mistake in the timesince/timeuntil filters when using a parameter for 'now'. Thanks to Andrew Shearer <ashearerw@shearersoftware.com> for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 12:31:10 +00:00
Russell Keith-Magee
ac858a2a61 Fixed #7996: Added a note that you need to register your site with Google in order for the ping_google command to work. Thanks to Jason Broyles (issya) for the suggestion. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-24 09:19:18 +00:00
Russell Keith-Magee
27371e3286 Fixed #8486: Corrected some file attribute names in the request/response docs. Thanks to mrsanders for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8518 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-24 09:01:50 +00:00
Russell Keith-Magee
87170c72f9 Fixed #8475 -- Corrected typo in example code in syndication docs. Thanks to bernd for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-24 07:45:35 +00:00
James Bennett
829a5c1352 Fixed #8512: Corrected typo in form validation documentation. Thanks for the catch, Karen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8511 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-24 07:22:30 +00:00
Jacob Kaplan-Moss
97cb07c3a1 Massive reorganization of the docs. See the new docs online at http://docs.djangoproject.com/. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8506 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-23 22:25:40 +00:00