1
0
mirror of https://github.com/django/django.git synced 2024-12-29 12:36:08 +00:00
Commit Graph

736 Commits

Author SHA1 Message Date
Thomas Stephenson
035b0fa60d Fixed #24716 -- Deprecated Field._get_val_from_obj()
The method duplicates the functionality of Field.value_from_object()
and has the additional downside of being a privately named public
API method.
2015-07-14 09:13:22 -04:00
Alex Gaynor
4e9d5ba4b6 Updated where I live. 2015-07-12 09:33:20 -05:00
Tim Graham
074706c64d Added a link to running the unit tests to new contributors page. 2015-07-10 11:02:25 -04:00
David Wolever
0d71349773 Fixed #22804 -- Added warning for unsafe value of 'sep' in Signer
Thanks Jaap Roes for completing the patch.
2015-07-07 11:44:37 -04:00
Tim Graham
0e3193a386 Updated mock note since Django no longer works with Python 3.2. 2015-07-03 08:24:58 -04:00
Tim Graham
ca58181bac Fixed #25056 -- Documented minimum version of jinja2 for testing. 2015-07-03 08:20:53 -04:00
Trey Hunner
2d0dead224 DEP 0003 -- Added JavaScript unit tests.
Setup QUnit, added tests, and measured test coverage.

Thanks to Nick Sanford for the initial tests.
2015-06-30 21:04:16 -04:00
Trey Hunner
ec4f219ecb Fixed #22463 -- Added code style guide and JavaScript linting (EditorConfig and ESLint) 2015-06-27 16:36:26 -04:00
Tim Graham
aed437d567 Updated release process for new release schedule. 2015-06-25 11:36:17 -04:00
Tim Graham
aaacaeb096 Renamed RemovedInDjangoXYWarnings for new roadmap.
Forwardport of ae1d663b79
from stable/1.8.x plus more.
2015-06-24 16:08:20 -04:00
Ola Sitarska
f1635ba433 Added Ola Sitarska to the team page. 2015-06-22 15:30:20 -04:00
Tomek Paczkowski
e64ed92b44 Added Tomek Paczkowski bio to the team page 2015-06-19 17:20:54 +01:00
Carl Meyer
06747ee790 Tweak my bio. 2015-06-18 10:30:25 -06:00
Tim Graham
7f1168e387 Removed support for Python 3.3. 2015-06-18 08:36:50 -04:00
Tim Graham
ccfb5c7408 Removed obsolete literals_to_xrefs.py script. 2015-06-15 10:22:18 -04:00
Marten Kenbeek
1e82094f1b Fixed #21927 -- Made application and instance namespaces more distinct.
Made URL application namespaces be set in the included URLconf and
instance namespaces in the call to include(). Deprecated other ways
to set application and instance namespaces.
2015-06-08 15:12:20 -04:00
Tim Graham
2fbea621e6 Capitalized "Python" in docs. 2015-06-05 08:24:53 -04:00
Raphael Michel
5c125f63f7 Fixed #24728 -- Renamed mime_type to content_type for syndication feeds
Renamed the mime_type properties of RssFeed and Atom1Feed to
content_type and start deprecation for the old names.
2015-06-04 13:24:18 -04:00
Steadman
dfdcb3ca22 Improved wording in writing documentation docs. 2015-06-04 11:58:32 +01:00
Tim Graham
46ce72e8d2 Added oss-security@lists.openwall.com to security release announcements. 2015-05-25 08:31:51 -04:00
Tim Graham
016d8cfbe2 Removed obsolete distros@vs.openwall.org security notification. 2015-05-21 19:22:58 -04:00
Aymeric Augustin
d9521f66b1 Removed global timezone-aware datetime adapters.
Refs #23820.

Fixed #19738.

Refs #17755. In order not to introduce a regression for raw queries,
parameters are passed through the connection.ops.value_to_db_* methods,
depending on their type.
2015-05-17 09:38:48 +02:00
Claude Paroz
70779d9c1c Fixed #24733 -- Passed the triggering exception to 40x error handlers
Thanks Tim Graham for the review.
2015-05-11 22:02:14 +02:00
Preston Timmons
a2c3c2a1e2 Added my bio. 2015-05-02 15:29:41 -05:00
Dave Hodder
08c980d752 Updated capitalization in the word "JavaScript" for consistency 2015-05-01 13:26:42 -04:00
Preston Timmons
8ae04e7630 Added docs for new template loader api.
Refs #15053.
2015-04-22 14:49:22 -05:00
Preston Timmons
fc21471526 Fixed #15053 -- Enabled recursive template loading. 2015-04-22 14:49:00 -05:00
Claude Paroz
ea27e26b09 Deprecated legacy GeoManager/GeoQuerySet methods 2015-04-22 19:54:17 +02:00
Tim Graham
6b8c969878 Removed docs for removed transaction APIs. 2015-04-14 13:52:45 -04:00
Preston Holmes
072947ad35 Moving myself to past team members section
Reflecting the unfortunate reality.
Still plan to be involved, but feel I need to recognize the degree to
which I'm only on the periphery these days.
2015-04-14 10:40:13 -04:00
Justin Bronn
e8c7f31a96 I'm back in Texas. 2015-04-13 13:42:26 -04:00
Baptiste Mispelon
418f75d55f Refs #24568 -- Added Read the Docs step to the release checklist. 2015-04-09 10:07:20 -04:00
Christopher Luc
e37d52bd5e Fixed #22993 -- Deprecated skipIfCustomUser decorator 2015-04-07 09:45:32 -04:00
Tim Graham
2cf28b6921 Added myself to the list of releasers. 2015-04-04 08:08:53 -04:00
Tim Graham
1e59d779e1 Added the technical board for the 1.9 release cycle.
The current board has been re-elected.
2015-04-04 08:08:35 -04:00
Tim Graham
8c4827ec1d Added link to download page to find supported versions. 2015-04-04 08:00:10 -04:00
Tim Graham
9cc29bbbca Fixed spelling in docs/internals/howto-release-django.txt 2015-04-01 19:05:16 -04:00
Krzysztof Gogolewski
2350b78dab Fixed typo in 1.9 release notes. 2015-04-01 19:00:50 -04:00
Tim Graham
8583a60547 Documented that only wheel files are uploaded to PyPI for prereleases. 2015-04-01 16:41:04 -04:00
Tim Graham
bf63de5824 Fixed typo in docs/internals/howto-release-django.txt 2015-04-01 16:41:04 -04:00
Alex Hill
720ff740e7 Fixed #24215 -- Refactored lazy model operations
This adds a new method, Apps.lazy_model_operation(), and a helper function,
lazy_related_operation(), which together supersede add_lazy_relation() and
make lazy model operations the responsibility of the App registry. This
system no longer uses the class_prepared signal.
2015-03-25 16:48:17 -04:00
Anssi Kääriäinen
8f30556329 Renamed Field.rel attribute to remote_field
Field.rel is now deprecated. Rel objects have now also remote_field
attribute. This means that self == self.remote_field.remote_field.

In addition, made the Rel objects a bit more like Field objects. Still,
marked ManyToManyFields as null=True.
2015-03-25 08:16:12 -04:00
Carolina
118cae2df8 Fixed #23666 -- Recommended Git Bash for running unit tests on Windows. 2015-03-24 10:45:58 -04:00
Claude Paroz
a0c2eb46dd Fixed #23960 -- Removed http.fix_location_header
Thanks Carl Meyer for the report and Tim Graham for the review.
2015-03-18 18:22:50 +01:00
Erik Romijn
f66c2bdc0f Fixed #23903 -- Configured Sphinx to autogenerate django-admin manpage 2015-03-10 08:12:09 -04:00
Tim Graham
c36b60836b Fixed #24451 -- Deprecated comma-separated {% cycle %} syntax. 2015-03-07 07:42:39 -05:00
Sean Wang
eba6dff581 Fixed #24358 -- Corrected code-block directives for console sessions. 2015-02-22 09:35:39 -05:00
Loic Bistuer
bed504d70b Fixed #24351, #24346 -- Changed the signature of allow_migrate().
The new signature enables better support for routing RunPython and
RunSQL operations, especially w.r.t. reusable and third-party apps.

This commit also takes advantage of the deprecation cycle for the old
signature to remove the backward incompatibility introduced in #22583;
RunPython and RunSQL won't call allow_migrate() when when the router
has the old signature.

Thanks Aymeric Augustin and Tim Graham for helping shape up the patch.

Refs 22583.
2015-02-20 21:34:09 +07:00
Tim Graham
d28bcba209 Fixed typo in docs/internals/contributing/triaging-tickets.txt 2015-02-20 07:26:16 -05:00
Tim Graham
dbacbc729a Simplified and updated committing code guidelines. 2015-02-19 20:36:24 -05:00
Tim Graham
0adf766e16 Fixed #23811 -- Added a guide for using git bisect. 2015-02-19 20:18:52 -05:00
Aymeric Augustin
15b711b5ee Deprecated TEMPLATE_DEBUG setting. 2015-02-15 20:47:04 +01:00
Tim Graham
7cf3a5786b Updated docs and runtests.py for removal of tests from contrib. 2015-02-11 10:29:54 -05:00
Tim Graham
a3473454ad Updated docs on running selenium tests. 2015-02-10 12:30:28 -05:00
Tim Graham
6704b52980 Fixed #24269 -- Added docs about the process of managing translations in Django. 2015-02-09 13:07:45 -05:00
Peter Inglesby
a8f1c70dce Fixed docs typo 2015-02-07 18:46:04 +01:00
wrwrwr
cd155c7c71 Fixed #23860 -- Documented import order convention. 2015-02-06 14:48:56 -05:00
Riccardo Magliocchetti
9410d69835 Added cross references to contributing docs. 2015-02-05 10:40:46 -05:00
darkryder
9ec8aa5e5d Fixed #24149 -- Normalized tuple settings to lists. 2015-02-03 14:59:45 -05:00
Preston Timmons
cd4282816d Fixed #18651 -- Enabled optional assignments for simple_tag(). 2015-02-03 10:44:33 -05:00
Tim Graham
c79faae761 Removed versionadded/changed notes for 1.7. 2015-02-01 21:02:40 -05:00
Andrew Godwin
955f70904a Also, I apparently can't spell San Francisco. 2015-01-30 08:55:20 -08:00
Andrew Godwin
277100057d Forgot to update where I live when I moved. 2015-01-30 08:54:29 -08:00
Tim Graham
63412262e5 Fixed #24175 -- Updated docstring convention. 2015-01-29 12:21:44 -05:00
Loic Bistuer
728b6fd9ca Fixed #24219 -- Moved SelectDateWidget together with the other widgets
and deprecated django.forms.extras.

Thanks Berker Peksag and Tim Graham for the reviews.
2015-01-27 22:40:02 +07:00
Florian Apolloner
16ee52d21d Fixed #24205 -- Deprecated Signal.disconnect weak parameter. 2015-01-23 14:37:12 -05:00
Tim Graham
f6019312ba Added Django 2.1 stub to deprecation timeline. 2015-01-19 13:08:24 -05:00
Tim Graham
8e435a5640 Added deprecation docs for legacy lookup support; refs #16187. 2015-01-19 09:42:26 -05:00
Tim Graham
ecf109f215 Added missing items to deprecation timeline/1.7 release notes. 2015-01-18 21:23:06 -05:00
Tim Graham
89e9f81601 Clarified deprecation of forms.forms.get_declared_fields(); refs #19617. 2015-01-18 16:06:56 -05:00
Tim Graham
7468c948b6 Clarified deprecation of test.utils.TestTemplateLoader. 2015-01-18 14:18:53 -05:00
Tim Graham
ba27f89587 Clarified a contrib.sites deprecation and added to 1.7 release notes. 2015-01-18 13:33:19 -05:00
Tim Graham
20e4e8fc79 Added removal of check management command to deprecation timeline. 2015-01-17 19:14:44 -05:00
Tim Graham
d9edd2f68f Fixed #21108 -- Updated how to release docs: prereleases now go to PyPI. 2015-01-16 18:24:10 -05:00
Claude Paroz
b4ac232907 Fixed #24099 -- Removed contenttype.name deprecated field
This finsishes the work started on #16803.
Thanks Simon Charette, Tim Graham and Collin Anderson for the
reviews.
2015-01-16 20:21:34 +01:00
Claude Paroz
a79e6b6717 Fixed #24152 -- Deprecated GeoQuerySet aggregate methods
Thanks Josh Smeaton and Tim Graham for the reviews.
2015-01-16 19:53:02 +01:00
Claude Paroz
f48e2258a9 Fixed #24133 -- Replaced formatting syntax in success_url placeholders
Thanks Laurent Payot for the report, and Markus Holtermann, Tim Graham
for the reviews.
2015-01-12 22:51:22 +01:00
Aymeric Augustin
79deb6a071 Accounted for multiple template engines in template responses. 2015-01-12 21:01:34 +01:00
Aymeric Augustin
a3e783fe11 Deprecated passing a Context to a generic Template.render.
A deprecation path is required because the return type of
django.template.loader.get_template changed during the
multiple template engines refactor.

test_csrf_token_in_404 was incorrect: it tested the case when the
hardcoded template was rendered, and that template doesn't depend on the
CSRF token. This commit makes it test the case when a custom template is
rendered.
2015-01-12 21:01:34 +01:00
Pavel Shpilev
a7c256cb54 Fixed #9893 -- Allowed using a field's max_length in the Storage. 2015-01-12 09:09:18 -05:00
Marc Tamlyn
b5c1a85b50 Fixed #24118 -- Added --debug-sql option for tests.
Added a --debug-sql option for tests and runtests.py which outputs the
SQL logger for failing tests. When combined with --verbosity=2, it also
outputs the SQL for passing tests.

Thanks to Berker, Tim, Markus, Shai, Josh and Anssi for review and
discussion.
2015-01-12 08:16:08 +00:00
Ola Sitarska
d563e3be68 Fixed #23913 -- Deprecated the = comparison in if template tag. 2015-01-11 15:21:01 -05:00
Josh Smeaton
f5c3a8bff5 Added Josh Smeaton bio to team 2015-01-10 13:48:37 +11:00
Markus Holtermann
e174cce9dc Added my bio to the core team. 2015-01-10 00:53:09 +01:00
Tim Graham
7102b99653 Added best practices for versionadded/changed annotations. 2015-01-09 13:23:29 -05:00
Tim Graham
67d6a8c4e6 Fixed #24108 -- Updated Wilson's bio due to new Django Project Web site design. 2015-01-09 10:25:57 -05:00
Daniel Pyrathon
fb48eb0581 Fixed #12663 -- Formalized the Model._meta API for retrieving fields.
Thanks to Russell Keith-Magee for mentoring this Google Summer of
Code 2014 project and everyone else who helped with the patch!
2015-01-06 19:25:12 -05:00
Tim Graham
6288fccfda Updated release instructions with latest process. 2015-01-06 13:51:19 -05:00
Preston Timmons
de9ebdd39c Fixed #24022 -- Deprecated the ssi tag. 2015-01-05 19:35:02 -05:00
Tim Graham
40a8504357 Fixed #23891 -- Moved deprecation of IPAddressField to system check framework.
Thanks Markus Holtermann for review.
2015-01-01 13:30:52 -05:00
Markus Holtermann
a1487deebf Fixed #23359 -- Added showmigrations command to list migrations and plan.
Thanks to Collin Anderson, Tim Graham, Gabe Jackson, and Marc Tamlyn
for their input, ideas, and review.
2014-12-31 14:14:28 -05:00
Tim Graham
09bce0b2cb Fixed #22340 -- Removed DatabaseCreation deprecation from timeline. 2014-12-31 09:37:13 -05:00
Claude Paroz
66f9a74b45 Added ignore_warnings decorator
And removed Ignore*DeprecationWarningsMixin, now obsolete.
Thanks Berker Peksag and Tim Graham for the review.
2014-12-30 18:16:25 +01:00
Aymeric Augustin
9eb4f28e89 Deprecated TEMPLATE_CONTEXT_PROCESSORS. 2014-12-28 17:02:31 +01:00
Aymeric Augustin
d3205e3e2e Deprecated TEMPLATE_DIRS. 2014-12-28 17:02:30 +01:00
Aymeric Augustin
cf0fd65ed4 Deprecated TEMPLATE_LOADERS. 2014-12-28 17:02:30 +01:00
Aymeric Augustin
d3a982556d Deprecated TEMPLATE_STRING_IF_INVALID. 2014-12-28 17:02:30 +01:00
Aymeric Augustin
3dc01aaaaf Deprecated ALLOWED_INCLUDE_ROOTS. 2014-12-28 17:02:30 +01:00
Aymeric Augustin
cf1f36bb6e Deprecated current_app in TemplateResponse and render(_to_response). 2014-12-28 17:02:29 +01:00
Aymeric Augustin
fdbfc98003 Deprecated some arguments of django.shortcuts.render(_to_response).
dictionary and context_instance and superseded by context.

Refactored tests that relied context_instance with more modern idioms.
2014-12-28 17:02:29 +01:00
Aymeric Augustin
92e8f1f302 Moved context_processors from django.core to django.template. 2014-12-28 17:00:07 +01:00
Aymeric Augustin
90805b240f Supported multiple template engines in render_to_string.
Adjusted its API through a deprecation path according to the DEP.
2014-12-28 16:23:02 +01:00
Tim Graham
1729a5250b Removed obsolete item from deprecation timeline.
Initial SQL data will be removed in Django 1.9 so changes to it
aren't relevant.
2014-12-26 13:48:13 -05:00
Tim Graham
6571ed14b6 Fixed #24049 -- Removed obsolete Java notes for Mac OS. 2014-12-24 18:38:07 -05:00
Anssi Kääriäinen
f233bf47dd Fixed #21414 -- Removed RelatedObject and deprecated Field.related. 2014-12-23 10:54:25 -05:00
Claude Paroz
337cd09836 Updated some other external links in the docs 2014-12-19 18:07:52 +01:00
Berker Peksag
9aeb917dad Fixed #23884 -- Moved FlatPageSitemap into django.contrib.flatpages. 2014-12-15 09:45:31 -05:00
Tim Graham
b6ea059b4a Fixed #23957 -- Started deprecation toward requiring session verification.
Thanks Carl Meyer for review.
2014-12-05 07:37:34 -05:00
Tim Graham
82e4f956e3 Fixed #23289 -- Added mock as a test dependency. 2014-12-01 16:08:25 -05:00
Tim Graham
3131e9cef5 Fixed #23923 -- Promoted Django's deprecation warnings to errors in runtests.py 2014-11-29 10:27:04 -05:00
Jannis Leidel
6302893112 Updated formtools docs to point at new package outside the Django repo.
Refs #23677.
2014-11-26 09:41:52 -05:00
Berker Peksag
9a30acad8a Fixed #21587 -- Added a warning for changing default of RedirectView.permanent. 2014-11-25 09:22:18 -05:00
wrwrwr
e22c64dfc0 Fixed #23742 -- Added an option to reverse tests order.
This is useful for debugging side effects affecting tests that
are usually executed before a given test. Full suite and pair
tests sort cases more or less deterministically, thus some test
cross-dependencies are easier to reveal by reversing the order.

Thanks Preston Timmons for the review.
2014-11-24 19:24:11 -05:00
wrwrwr
ca801b8c8f Improved line breaking in runtests docs. 2014-11-24 17:38:28 -05:00
Tim Graham
94e2d3913d Added deprecation of template dirs parameter to timeline. 2014-11-24 09:17:57 -05:00
Tom V
a3aeba0f95 Fixed typo in docs/internals/release-process.txt. 2014-11-21 11:47:31 -05:00
Carl Meyer
08fbbaa45b Deprecated calling a SQLCompiler instance. 2014-11-18 19:47:16 -07:00
Aymeric Augustin
fab26cf5e0 Removed support for function-based template loaders.
They were deprecated in Django 1.2 but not all the supporting code was
removed in Django 1.4. Since the remaining code was unlikely to be
functional (pun intended) e.g. it would crash unless the loader
function had an is_usable attribute, this commit completes the removal
immediately instead of starting another deprecation path.
2014-11-16 22:18:33 +01:00
Aymeric Augustin
1851dcf377 Deprecated function-based loaders. 2014-11-16 21:41:42 +01:00
Aymeric Augustin
2577ae6a08 Moved all template loaders under django.template.loaders.
Reformatted the code of base.Loader according to modern standards.

Turned the test template loader into a regular locmem.Loader -- but
didn't document it.

Added a normal deprecation path for BaseLoader which is a public API.

Added an accelerated deprecation path for TestTemplateLoader which is
a private API.
2014-11-16 21:28:26 +01:00
Erik Romijn
de912495ab Added reminder to committing docs to test a PR with Jenkins first. 2014-11-16 13:32:40 +01:00
Tim Graham
c38db4d7e0 Designated Django 1.8 as the next LTS. 2014-11-16 09:03:20 +01:00
Josh Smeaton
f59fd15c49 Fixed #14030 -- Allowed annotations to accept all expressions 2014-11-15 14:00:43 +00:00
wrwrwr
f9213a85c3 Fixed #23775 -- Added docs for --bisect and --pair runtests options.
Thanks Baptiste Mispelon for review.
2014-11-12 20:46:34 +01:00
Tim Graham
f5fe9f29c8 Added "Features removed in 1.8" section to release notes. 2014-11-05 09:08:09 -05:00
Simon Charette
f2ddc439b1 Fixed #23656 -- Made FormMixin.get_form's form_class argument optional.
Thanks Tim Graham for the review.
2014-10-30 19:10:52 -04:00
Tim Graham
349471eeb9 Fixed spelling errors in docs. 2014-10-28 10:15:52 -04:00
a1tus
2d75515a4c Fixed #23444 -- Deprecated django.contrib.admin.helpers.InlineAdminForm.original_content_type_id 2014-10-23 09:49:24 -04:00
Berker Peksag
22c85bf1a8 Fixed versionchanged indentation in unit-tests.txt. 2014-10-23 08:03:41 -04:00
Berker Peksag
303a848631 Fixed IRC channel name in submitting-patches.txt.
The development channel is #django-dev.
2014-10-16 16:56:37 +03:00
Curtis
c6ea678c2e Added my bio to team docs. 2014-10-11 07:44:50 -04:00
Jaap Roes
115c307184 Fixed #23613 -- Deprecated django.utils.checksums 2014-10-10 09:22:20 -04:00
Collin Anderson
15d350fbce Updated my bio.
This better reflects why I was invited to the team.
2014-10-09 08:45:19 -04:00
Tom Christie
e9b85fd626 Added my bio to the core team. 2014-10-07 08:22:57 -04:00
Collin Anderson
1edaa55201 Added my bio to the core team. 2014-10-06 12:28:55 -04:00
Michael Manfre
49e693c813 Added my bio to team.txt 2014-09-24 22:45:03 -04:00
Corey Farwell
37b13033c6 Removed sudo from pip commands in docs. 2014-09-22 15:49:48 -04:00
Tim Graham
a0dfef02df Moved some people to "past team members". 2014-09-16 13:12:33 -04:00
Tim Graham
82a5ce801b Fixed typo in docs/internals/roles.txt and added words to spelling_wordlist. 2014-09-16 08:38:51 -04:00
Simon Meers
021f963e23 Move my bio to "Past team members" section whilst I'm inactive. 2014-09-15 20:41:58 +10:00
Tim Graham
9c8c28f6f4 Added ops team to roles.txt. 2014-09-12 15:25:21 -04:00
Tim Graham
0b5bd398fa Added the inaugural technical board. 2014-09-06 19:13:29 -04:00
Paul McMillan
e5febfb3c3 Move Gabriel Hurley to "Past Team Members" 2014-09-06 10:44:17 -07:00
Paul McMillan
a4ab0495cc Update bio for Paul McMillan to remove dead links 2014-09-06 10:32:10 -07:00
Alex Gaynor
0707fbc73f Convert myself to an emeritus member 2014-09-06 10:20:56 -07:00
Tim Graham
5c5011ce68 Fixed #23414 -- Updated version numbers in release process doc.
Thanks jaap3 for the report.
2014-09-05 15:44:41 -04:00
Tim Graham
1101467ce0 Limited lines to 119 characters in django/
refs #23395.
2014-09-05 09:22:16 -04:00
Marc Tamlyn
e9103402c0 Fixed #18757, #14462, #21565 -- Reworked database-python type conversions
Complete rework of translating data values from database

Deprecation of SubfieldBase, removal of resolve_columns and
convert_values in favour of a more general converter based approach and
public API Field.from_db_value(). Now works seamlessly with aggregation,
.values() and raw queries.

Thanks to akaariai in particular for extensive advice and inspiration,
also to shaib, manfre and timograham for their reviews.
2014-09-03 20:36:03 +01:00
James Bennett
58eb4ce002 Merge pull request #3120 from alex/use-sha256
Document that we should also offer sha256 checksums for packages
2014-09-02 14:01:09 -05:00
evildmp
7a8f405bba Update Daniele Procida's bio 2014-08-29 16:22:55 +01:00