Commit Graph

4895 Commits

Author SHA1 Message Date
Julien Phalip 9ea4dc90b9 Small improvement to the `contrib.messages` doc introduction. 2012-08-04 15:46:15 -07:00
Florian Apolloner 62ae711cec Added a missing space to the description of the `cut` filter. 2012-08-04 23:58:31 +02:00
Alex Gaynor 5f9b2be559 Merge pull request #210 from pydanny/ticket_18632
Ticket 18632 Cleanup of CBV edit/edit mixin documentation.
2012-08-04 13:16:24 -07:00
Daniel Greenfeld 1fefd91e1e For #210, cleaned up text and formatting. 2012-08-04 13:01:40 -07:00
Tim Graham 84c3c9097d Merge pull request #153 from webjunkie/patch-1
Fixed #18110 -- Improve template cache tag documentation
2012-08-04 12:50:42 -07:00
Tim Graham 46589d0c6d Merge pull request #244 from mbrochh/master
Fixed small typo in class based view docs.
2012-08-04 12:29:42 -07:00
Tim Graham 865ff32b84 Fixed #16980 - Misc updates to the auth docs. Thanks Preston Holmes for the patch. 2012-08-04 15:24:40 -04:00
Claude Paroz 542c20b382 Fixed #18713 -- Fixed custom comment app name in comments docs
Thanks Pratyush for the report.
2012-08-04 17:38:18 +02:00
Claude Paroz 121fd109de Fixed #5524 -- Do not remove cleaned_data when a form fails validation
cleaned_data is no longer deleted when form validation fails but only
contains the data that did validate.
Thanks to the various contributors to this patch (see ticket).
2012-08-04 14:22:23 +02:00
Simon Meers 10f979fd92 Fixed #18700 -- Added URL reversal for i18n set_language view. 2012-08-04 20:57:12 +10:00
Tim Graham b496be331c Fixed #15932 - Documented how to supress multiple reverse relations to the same model.
Thanks Claude Paroz for the patch.
2012-08-03 16:27:45 -04:00
Aymeric Augustin d01eaf7104 [py3] Removed uses of sys.maxint under Python 3.
Also fixed #18706: improved exceptions raised by int_to_base36.
2012-08-03 18:51:28 +02:00
Aymeric Augustin 5aec69ed29 Documented the trick used in 9908201d7f. 2012-08-03 15:40:29 +02:00
Tim Graham 083a3a4e39 Fixed #13904 - Documented how to avoid garbage collection messages in GIS.
Thanks Claude Peroz for the patch.
2012-08-03 05:17:52 -04:00
Tim Graham 2a16eb0792 Fixed #17704 - Updated the StackedInline section in Tutorial 2; thanks xbito for the draft patch. 2012-08-02 19:22:49 -04:00
Tim Graham 07e10fbe9f Fixed #16941 - Clarified naturaltime output when the time is more than a day old.
Thanks antoviaque for the patch.
2012-08-02 07:54:07 -04:00
Tim Graham 39541be3bc Fixed #18581 - Updated admin actions screenshots. Thanks Kevin London. 2012-08-02 07:52:16 -04:00
Martin Brochhaus 6f229d2d7a Update docs/topics/class-based-views/index.txt
Fixed a small typo:

"We can use create" should be "We can create"
2012-08-02 19:29:19 +08:00
Simon Meers d7816c563b Fixed #18472 - Added warning regarding set_language / i18n_patterns. 2012-08-02 20:45:55 +10:00
Simon Meers c59fff707a Reinstated Pinax link that was still in use by others. 2012-08-02 20:27:53 +10:00
Tim Graham ebbc414d17 Fixed #16168 - Added note regarding type requirements when overridng ModelForm fields.
Thanks Pieter Swinkels for the patch.
2012-08-01 07:59:28 -04:00
Tim Graham 964979e8ec Fixed #18122 - Clarified section title regarding applying permissions to generic views. 2012-07-31 16:13:52 -04:00
Tim Graham 8d3e501502 Fixed #17131 - Added per object permission notes to docs.
Thanks dchandek for the suggestion and mateusgondim for the patch.
2012-07-30 18:10:21 -04:00
Justin Bronn c0748a621c Updated my bio. 2012-07-29 16:53:56 -07:00
Tim Graham 690ed57946 Fixed #18476 - Added use of {% url %} tag to tutorial.
Thanks Claude Paroz for the patch.
2012-07-29 18:14:26 -04:00
Tim Graham 07d70e9b26 Fixed #18656 -- Fixed LocaleMiddleware link; thanks mitar for the report. 2012-07-28 13:31:41 -04:00
Tim Graham 00d5e632fa Fixed #18630 -- Updated version in docs/intro/install.txt; thanks Kevin London. 2012-07-28 13:17:33 -04:00
Aymeric Augustin ab6cd1c839 [py3] Updated dict-like data structures for Python 3.
The keys/items/values methods return iterators in Python 3, and the
iterkeys/items/values methods don't exist in Python 3. The behavior
under Python 2 is unchanged.
2012-07-25 22:58:48 +02:00
Rafik Draoui 04e8ef5a83 Updated example of customized ModelAdmin in documentation for 1.4
The change_view method of django.contrib.admin.ModelAdmin takes an
extra `form_url` argument in Django 1.4.
2012-07-25 21:33:38 +01:00
Florian Apolloner 7d06f975fe Fixed #18614 -- Added missing imports in code samples. 2012-07-25 22:32:53 +02:00
Florian Apolloner 51a010135c Merge pull request #220 from dirn/staticfiles-docs-typo
Fix typo in staticfiles app documentation
2012-07-25 13:20:44 -07:00
Florian Apolloner 4865274bc1 Merge pull request #224 from reclosedev/patch-1
Documentation: Fix link to uWSGI deployment
2012-07-25 13:18:11 -07:00
Alex Gaynor 5ee8c3ef0c Merge pull request #230 from pjdelport/cleanup
Cleanup
2012-07-25 13:07:10 -07:00
Alex Gaynor 98c7ad444c Merge pull request #228 from nklas/master
Documentation: Fixed a typo in docs/releases/1.4.txt
2012-07-25 13:06:58 -07:00
Alex Gaynor c4be14bd32 Merge pull request #232 from yohanboniface/ticket18667
Ticket 18667: fix typo in CBV doc
2012-07-25 12:56:08 -07:00
James Bennett 9d246e0f9f Merge pull request #231 from kevin1024/master
Documentation fix - Change the word "brackets" to "parentheses"
2012-07-25 12:54:09 -07:00
Aymeric Augustin 69f4856f23 Fixed a typo in the admin reference docs.
Thanks Yohan Boniface for the report.
2012-07-25 10:57:30 +02:00
Yohan Boniface 206c248f1e Ticket 18667: fix typo in CBV doc 2012-07-25 10:44:43 +02:00
nklas c7ac44e64b Update docs/topics/signals.txt
Fixed a typo.
2012-07-25 13:20:26 +07:00
Kevin McCarthy c3a05d8794 Changed the word "brackets" to "parentheses"
I want to change the word "brackets" to "parentheses" because when I think
of brackets, I think of [], and when I think of parentheses, I think of (),
and when I originally read this, I found the word confusing.
2012-07-24 16:55:08 -10:00
Ramiro Morales 50837434db Clarified default name of M2M relationship DB table. 2012-07-24 22:44:28 -03:00
Piet Delport f1128e5474 Fix typo. 2012-07-25 01:21:16 +02:00
Ramiro Morales f758bdab5e Fixed #18271 -- Changed stage at which TransactionTestCase flushes DB tables.
Previously, the flush was done before the test case execution and now
it is performed after it.

Other changes to the testing infrastructure include:

* TransactionTestCase now doesn't reset autoincrement sequences either
  (previous behavior can achieved by using `reset_sequences`.)
  With this, no implicit such reset is performed by any of the provided
  TestCase classes.

* New ordering of test cases: All unittest tes cases are run first and
  doctests are run at the end.

THse changes could be backward-incompatible with test cases that relied
on some kind of state being preserved between tests. Please read the
relevant sections of the release notes and testing documentation for
further details.

Thanks Andreas Pelme for the initial patch. Karen Tracey and Anssi
Kääriäinen for the feedback and Anssi for reviewing.

This also fixes #12408.
2012-07-24 17:24:16 -03:00
nklas 6006c1f076 Fixed a small typo. 2012-07-25 01:45:56 +07:00
Aymeric Augustin ebc89a800a Fixed a broken link in the Python 3 docs.
Thanks ptone for the report.
2012-07-22 19:48:10 +02:00
Roman Haritonov cc65f4ec8d Documentation: Fix link to uWSGI deployment 2012-07-22 18:54:47 +04:00
Aymeric Augustin 00ace01411 [py3] Documented coding guidelines for Python 3. 2012-07-22 10:29:07 +02:00
Aymeric Augustin 8b01909841 [py3] Bundled six for Python 3 compatibility.
Refs #18363.
2012-07-22 09:29:44 +02:00
Andy Dirnberger a7928dedc8 Fix typo in staticfiles app documentation
In the documentation for the `static` template tag, a `::` was used prior to a `code-block`. Doing so caused the `code-block` line to render as code. Changing the `::` to `:` corrects the display.
2012-07-18 14:34:08 -04:00
Mike Grouchy a2e927b7ed BaseCache now has a no-op close method as per ticket #18582
Also removed the hasattr check when firing request_finished signal for
caches with a 'close' method. Should be safe to call `cache.close`
everywhere now
2012-07-18 14:16:55 -04:00
Alex Gaynor 6d0dbd88f6 Update my bio. 2012-07-18 08:04:29 -07:00
Jannis Leidel 810fd236fa Updated my bio. 2012-07-18 14:19:06 +02:00
Florian Apolloner adad6c3afe Added myself to internals/committers.txt. 2012-07-18 13:45:42 +02:00
Alex Gaynor 110c729309 Merge pull request #215 from mgrouchy/add-interpreter-options
Adds interpreter option to shell command as per ticket #18639
2012-07-17 11:04:59 -07:00
Mike Grouchy f2abfe1e48 Adds interpreter option to shell command as per ticket #18639
Specify python interpreter interface ipython or bpython with the -i,
--interface options
argument.
 ex// python manage.py shell -i bpython
 ex// python manage.py shell --interface bpython

Like all other options, defaults to default python interpreter when your
selected choice isn't available.

updated documentation where appropriate
2012-07-17 13:45:35 -04:00
Anssi Kääriäinen 29132ebdef Fixed #17788 -- Added batch_size argument to qs.bulk_create()
The qs.bulk_create() method did not work with large batches together
with SQLite3. This commit adds a way to split the bulk into smaller
batches. The default batch size is unlimited except for SQLite3 where
the batch size is limited to 999 SQL parameters per batch.

Thanks to everybody who participated in the discussions at Trac.
2012-07-17 15:24:41 +03:00
Anssi Kääriäinen aeda55e6bf Fixed #3881 -- skip saving session when response status is 500
Saving session data is somewhat likely to lead into error when the
status code is 500. It is guaranteed to lead into error if the reason
for the 500 code is query error on PostgreSQL.
2012-07-16 20:57:55 +03:00
Daniel Greenfeld b90caf014c Changed myapps.models.py to myapps/models.py 2012-07-15 19:29:19 -07:00
Daniel Greenfeld dea554bd9d Added mention in MRO section about method/attribute inheritence. Added simple examples to Generic editing views, added index to Generic editing views and Editing mixins, added missing template_name_suffix attribute to Generic editing views. 2012-07-15 17:30:39 -07:00
Claude Paroz cdcdd131da Dropped support for GDAL < 1.5
GDAL 1.5 has been released in December 2007.
2012-07-15 21:10:32 +02:00
Aymeric Augustin bf9d5eff4c Fixed #18626 -- rst syntax collision. 2012-07-15 11:25:13 +02:00
Aymeric Augustin fb46f243b4 Fixed #18625 -- Removed old-style use of url tag
from the documentation.
2012-07-15 11:19:50 +02:00
Alex Gaynor 8b3c2f2c51 Deprecate two methods (which I seriously doubt anyone ever used, but they were documented so...) because they cannot be implemented efficiently on top of collections.SortedDict in Python 2.7 and up. 2012-07-14 16:08:42 -07:00
Aymeric Augustin c13a98968e Fixed a misplaced Sphinx reference. 2012-07-14 12:32:39 +02:00
Claude Paroz b6215f6810 Updated links for MacOSX python installers 2012-07-13 17:49:50 +02:00
Preston Holmes 18b9dc4154 Fixed #18601 -- Specified that Python minimum version is 2.6.5
This is due to a bug in previous Python 2.6 versions related to
unicode keyword arguments.
2012-07-13 17:33:13 +02:00
Aymeric Augustin 8c670ee347 Fixed #18617 -- Highlighted that the app_directories template loader depends on the order of INSTALLED_APPS.
Thanks evildmp for the patch.
2012-07-12 23:02:58 +02:00
Claude Paroz e806f047f3 Removed old gis install instructions for obsolete distros 2012-07-12 19:44:15 +02:00
Adrian Holovaty c9a1f9d1fc Merge pull request #197 from StefanKjartansson/master
Fixed typo in docs
2012-07-11 15:05:48 -07:00
mitnk fe443b11de fixed a typo in timezones docs. 2012-07-11 10:57:26 +08:00
Stefan Kjartansson 5664338e22 typo in "django/docs/topics/python3.txt" 2012-07-10 15:27:50 +00:00
Tim Graham 590de18add Fixed #18577 - Clarified middleware initialization.
Thanks Lukasz Balcerzak for the patch.
2012-07-08 19:26:53 -04:00
Tim Graham d44aa98184 Fixed #18173 - Corrected ModelAdmin documentation for get_changelist.
Thanks Keryn Knight for the report and vanessagomes for the patch.
2012-07-08 18:35:17 -04:00
Aymeric Augustin 5e94ef293c Fixed #18374 -- Explained "corrupt image" error
Thanks fabian and charettes.
2012-07-08 11:53:45 +02:00
Claude Paroz 249c445446 Fixed #18164 -- Precised startapp template context content 2012-07-07 23:08:43 +02:00
Aymeric Augustin d94cfdcfae Fixed #18589 -- Typo in generic CBV docs.
Thanks cpthomas for the report.
2012-07-07 17:42:04 +02:00
Aymeric Augustin bbc590697a Removed Django 1.0-specific sections. 2012-07-07 16:44:55 +02:00
Aymeric Augustin 29ca3d3c4b Fixed #18587 -- Typo in management command example
Thanks Frank Wiles.
2012-07-07 16:00:03 +02:00
Jannis Leidel 0a68a2994b Fixed #18254 -- Added ability to the static template tags to store the result in a contextt variable. Many thanks to Andrei Antoukh for the initial patch. 2012-07-07 15:30:25 +02:00
Adrian Holovaty 70ac570157 Merge pull request #183 from rpedigoni/master
Fixed typo in 1.5 release notes
2012-07-06 12:45:05 -07:00
Adrian Holovaty 4e8084a4cb Merge pull request #187 from evildmp/docs_typos
Added a missing \ in uwsgi docs. Thanks, evildmp.
2012-07-06 12:44:34 -07:00
Claude Paroz 4c417cc9eb Fixed #18576 -- Added missing import in tutorial02
Thanks jaaruiz at yahoo.com for the report.
2012-07-06 13:58:49 +02:00
Daniele Procida 83da36ebfb restored a missing \ in uwsgi docs 2012-07-06 10:10:27 +01:00
Tim Graham e4a1407a9c Fixed #17997 - Documented that the debug server is now multithreaded by default.
Thanks trey.smith@ for the report and vanessagomes for the patch.
2012-07-05 08:39:05 -04:00
Renato Pedigoni 3caf53524c fixed typo 2012-07-04 18:34:55 -03:00
Luke Plant bee498f3a2 Added 'format_html' utility for formatting HTML fragments safely 2012-07-03 22:20:12 +01:00
Luke Plant f33e150369 Documented utils.html.escape and conditional_escape 2012-07-03 22:20:12 +01:00
Claude Paroz 784d0c261c Replaced 'return' by 'raise' in custom model field docs
Thanks Simon Charette for noticing it. Refs #11162.
2012-07-02 10:16:42 +02:00
Tim Graham 7313468f85 Fixed #17436 - Added warning about overriding Model.__init__()
Thanks zsiciarz for the draft patch.
2012-07-01 18:04:16 -04:00
Anssi Kääriäinen f572ee0c65 Fixed #16047 -- Restore autocommit state correctly on psycopg2
When the postgresql_psycopg2 backend was used with DB-level autocommit
mode enabled, after entering transaction management and then leaving
it, the isolation level was never set back to autocommit mode.

Thanks brodie for report and working on this issue.
2012-07-01 19:36:43 +03:00
Tim Graham 9974069620 Fixed #16882 - Clarified why one should not use 'init_command' after initial database creation. 2012-07-01 07:25:24 -04:00
Tim Graham c68f4c514c Fixed #18493 - Added instructions to locate the Django source files to the t
Thanks Claude Paroz for the draft patch.
2012-07-01 06:55:46 -04:00
Tim Graham c5fb8299ef Fixed #17705 - Updated TabularInline image and doc in tutorial 2.
Thanks xbito for the draft patch.
2012-06-30 18:20:34 -04:00
Raúl Cumplido 55ffcf8e7b Fixed #18145 -- Improved documentation of unique_together type fields 2012-06-30 17:16:40 -04:00
Claude Paroz 03896eb5df Fixed #17026 -- Improved wording of contrib.messages' storage backends section 2012-06-30 22:21:23 +02:00
Claude Paroz da200c5e35 Fixed #16519 -- Deprecated mimetype kwarg of HttpResponse __init__
This keyword was already deprecated in the code (supported for
backwards compatibility only), but never formally deprecated.
Thanks Paul McMillan for the report and yasar11732 for the initial
patch.
2012-06-30 21:27:47 +02:00
Claude Paroz c446bdee84 Fixed #17024 -- Added import statements in tutorial code sample 2012-06-30 20:52:49 +02:00
Tim Graham 5d81ad1af1 Fixed #17168 - Noted TransactionMiddleware only works with "default" database alias.
Thanks codeinthehole for the draft patch.
2012-06-30 10:25:51 -04:00
Claude Paroz db87016b1a Fixed #12493 -- Deprecated auto-correction of TEMPLATE_DIRS 2012-06-30 15:06:42 +02:00
Claude Paroz 596e15293c Fixed #11162 -- Mentioned ValidationError in custom model field docs 2012-06-30 14:30:32 +02:00
Claude Paroz b9ecbedb31 Fixed #18528 -- Fixed custom field value_to_string example
Thanks anuraguniyal for the report.
2012-06-29 15:10:41 +02:00
Aymeric Augustin 54b1519dfd Fixed a formatting issue in the CBV docs. 2012-06-28 17:18:50 +02:00
Claude Paroz 4f53e77f07 Fixed #18306 -- Removed most of GeoDjango-specific deployment docs 2012-06-28 13:42:36 +02:00
Claude Paroz 8a5d1a6b93 Updated obsolete links in the documentation 2012-06-28 10:49:07 +02:00
Tim Graham c8928b91b5 Fixed #17511 - Removed reference to deprecated "reset" management command in FAQ; thanks voxpuibr@ for the report. 2012-06-27 18:54:42 -04:00
Tim Graham 1cf8287e3a Fixed #18369 - Fixed argument name in render() function; thanks qsolo825@ for the report. 2012-06-27 17:40:29 -04:00
Claude Paroz ada961b0d2 Fixed #18527 -- Removed superfluous backslash in CBV docs
Thanks ramilzay at gmail.com for the report.
2012-06-27 18:13:14 +02:00
Anssi Kääriäinen b6c356b7bb Fixed #17485 -- Made defer work with select_related
This commit tackles a couple of issues. First, in certain cases there
were some mixups if field.attname or field.name should be deferred.
Field.attname is now always used.

Another issue tackled is a case where field is both deferred by
.only(), and selected by select_related. This case is now an error.

A lot of thanks to koniiiik (Michal Petrucha) for the patch, and
to Andrei Antoukh for review.
2012-06-26 18:08:42 +03:00
Gabriel Grant d69f1d71c4 Fixed typo in JSONResponseMixin example. 2012-06-25 08:48:32 +02:00
Claude Paroz 19a810b18c Fixed #14917 -- Hinted that view should redirect after form post success 2012-06-23 18:47:52 +02:00
Dmitry Medvinsky d4da08375b Fixed #18454 -- Added ability to pass a list of signals to `receiver`.
Added ability to use receiver decorator in the following way:

    @receiver([post_save, post_delete], sender=MyModel)
    def signals_receiver(sender, **kwargs):
        ...
2012-06-23 16:31:16 +02:00
Bojan Mihelac 946d3d9f84 Fixed url translation docs.
``include`` calls shouldn't have a $ sign at the end of the url pattern.
2012-06-23 16:14:56 +02:00
jnns c864b36ba1 Updated TEMPLATE_CONTEXT_PROCESSORS defaults in the docs.
django.core.context_processors.tz was missing from default
TEMPLATE_CONTEXT_PROCESSORS in the template api documentation.
2012-06-23 16:02:15 +02:00
Alex Gaynor ea9536b17f Note that Jython has an alpha with 2.7 support. 2012-06-22 19:00:40 -07:00
Florian Apolloner 7f225880e4 Corrected the `instance_dict` description for form wizards. 2012-06-22 15:46:49 +02:00
Tim Saylor f8ef93a657 Fixed a documentation typo on the widget page. 2012-06-19 10:37:53 +02:00
Chris Beaven c57ba67331 Fixed #14502 again -- saner verbatim closing token
Previously, the closing token for the verbatim tag was specified as the
first argument of the opening token. As pointed out by Jannis, this is
a rather major departure from the core tag standard.

The new method reflects how you can give a specific closing name to
{% block %} tags.
2012-06-19 10:49:33 +12:00
Gabe Jackson ffa6d95f65 Fixed #18154 -- Documentation on closing File objects and best practices 2012-06-19 09:56:10 +12:00
Daniel Hepper aee9eecb92 Fixed #18444 -- Replace hard coded "View on Site" URLs 2012-06-18 18:12:29 +02:00
Julien Phalip 79ef3901da Fixed the path to the admin's compress.py script in the doc. 2012-06-16 16:23:03 -07:00
Julian Bez 3c0877938f Fixed #18110 -- Improve template cache tag documentation 2012-06-14 17:42:55 +03:00
Jannis Leidel c4c7fbcc0d Fixed #18451 -- Vastly improved class based view documentation.
Many thanks to Daniel Greenfeld, James Aylett, Marc Tamlyn, Simon Williams, Danilo Bargen and Luke Plant for their work on this.
2012-06-11 10:40:23 +02:00
Claude Paroz b0d8085c67 Added note about including fixtures hashing algorithm
Refs #18157.
2012-06-09 21:14:13 +02:00
Claude Paroz 17d6cd9029 Fixed #18157 -- Documented that setting PASSWORD_HASHERS can speed up tests 2012-06-09 20:41:46 +02:00
Claude Paroz 514e827022 Fixed pagination example wrt new next_page_number behavior 2012-06-09 18:07:30 +02:00
Claude Paroz fc40a6504b Fixed #17159 -- Validated returned number of next|previous_page_number
Thanks mehta.apurva at gmail.com for the report and the initial patch
and neaf for the complete patch.
2012-06-09 17:55:24 +02:00
Anssi Kääriäinen a035d9d650 Cleaned whitespace errors introduced in previous commit 2012-06-08 23:52:43 +03:00
Simon Charette b6d533af4d Fixed #18399 – Added a way to get ContentTypes for proxy models
Added kwargs for_concrete_model and for_concrete_models to ContentType
methods get_for_model() and get_for_models(). By setting the flag to
False, it is possible to get the contenttype for proxy models.
2012-06-08 23:07:58 +03:00
Adrian Holovaty c63c62a18a Fixed #18440 -- Pointed out that ReportLab is not thread safe. Thanks, jens@lundstroem.com 2012-06-08 11:46:45 -05:00
Anssi Kääriäinen 18aed863b4 Added myself to committers 2012-06-08 15:22:58 +03:00
Aymeric Augustin 7ae66517c1 Fixed an error in a git command. 2012-06-08 12:14:01 +02:00
Audrey Roy 7ab6e32843 Revised the text in the 'Processing the data from a form' section. 2012-06-08 12:13:52 +02:00
Audrey Roy 3c05b500a5 Revised the text in the 'Using a form in a view' section. 2012-06-08 12:03:52 +02:00
Aymeric Augustin d2ad3b0f96 Clarified the purpose of the pull requsets docs
One is for the community, the other for the core team.

Thanks Reinout van Rees for the report.
2012-06-08 11:53:54 +02:00
Aymeric Augustin 1f203f84d0 Explained an alternative way to fetch a branch.
This avoids adding each contributor as a remote.

Thanks Fruneau for the report.
2012-06-08 11:40:33 +02:00
Aymeric Augustin 329bb9296f Proof-read the new contributing guide.
Many thanks to Daniele Procida.
2012-06-08 11:26:22 +02:00
Aymeric Augustin 06ea10e1f1 Fixed #18125 -- Explained caveat with filters
Thanks ebrelsford AT gmail.com and oinopion.
2012-06-08 10:25:42 +02:00
Luke Plant f269f30544 Small corrections to committing-code docs 2012-06-08 00:02:52 +01:00
Aymeric Augustin 33999d9871 Fixed #18445 -- Added a links in the docs.
Thanks Audrey Roy for the patch.
2012-06-07 22:11:24 +02:00
Aymeric Augustin 6a66fc08b3 Fixed #17933 -- Added a missing label to the docs. 2012-06-07 19:47:32 +02:00
Aymeric Augustin 90fb6a4648 Fixed #18436 -- Updated contributing docs for git.
Most of the credit for this large patch goes to Anssi Kääriäinen.
Many thanks to all the people who contributed to the discussion.
2012-06-07 18:54:43 +02:00
Claude Paroz 5e6ded2e58 Fixed #18363 -- Added Python 3 compatibility layer.
Thanks Vinay Sajip for the support of his django3 branch
and Alex Gaynor, kezabelle, YorikSar for the review.
2012-06-07 18:36:53 +02:00
Adrian Holovaty 87ff89d12d Fixed #17933 -- Added intro note to writing-documentation.txt
Based on initial patch by Thomas Westfeld
2012-06-07 11:32:28 -05:00
Claude Paroz 4a103086d5 Fixed #18269 -- Applied unicode_literals for Python 3 compatibility.
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
2012-06-07 18:08:47 +02:00
jakul 0e36948f62 fix bad locale names 2012-06-07 17:24:48 +02:00
Aymeric Augustin c28e700c7e Removed references to changes made in 1.2.
Thanks Florian Apolloner for the patch.
2012-06-07 15:02:35 +02:00
Aymeric Augustin 10a9c260fc Merge pull request #117 from juanriaza/master
Fixed #18380 -- Improved installation instructions for MySQLdb.
2012-06-07 04:40:38 -07:00
Juan Riaza bac6a68064 Fixed #18380 -- Improve installation instructions for MySQLdb 2012-06-07 13:35:04 +02:00
Aymeric Augustin 875c762517 Fixed #16916 -- Documented default headers for the test client.
Thanks sailorfred AT yahoo.com for the report and raulcd
for the initial version of the patch.
2012-06-07 12:51:48 +02:00
Aymeric Augustin 17f3e9258e Fixed #18397 -- Avoided referencing lawrence.com.
This commit includes multiple small related changes, see the ticket
for a full discussion.
2012-06-07 11:50:20 +02:00
Aymeric Augustin 4ce5a5fe78 Fixed #18396 -- Changed Spatialite download URLs.
Thanks gabrielcw AT gmail.com for the report.
2012-06-07 11:19:10 +02:00
Aymeric Augustin b48432201b Fixed #18411 -- Clarified HttpRequest doc slightly.
Thanks torkel.bjornson AT gmail.com for the report.
2012-06-07 11:04:15 +02:00
Aymeric Augustin 4464bbba15 Fixed #14502 -- Added a verbatim template tag.
Thanks SmileyChris for the patch.
2012-06-07 09:59:14 +02:00
Jacob Kaplan-Moss 7edf231d46 Replaced documentation snippets using "gender" with less sensitive examples. 2012-06-06 13:52:53 +02:00
Claude Paroz eb286aa22f Delayed encoding of password and salt in password checking.
Applied the rule that string encoding should happen as late as
possible. This is also a preparation for Python 3 compatibility.
2012-06-06 10:53:16 +02:00
Aymeric Augustin 29a80354ab Added alt attribute to img tags in docs.
This is a good practice for accessibility.
Thanks Jessica McKellar for the report.
2012-06-06 10:32:03 +02:00
Honza Kral fedac99c85 Fixed #15926 -- Added option --no-initial-data to syncdb and flush.
Thanks msiedlarek, jpaugh64 and vlinhart!
2012-06-05 16:46:15 +02:00
Luke Plant 840ffd80ba Noted that SECURE_PROXY_SSL_HEADER is needed by CSRF protection.
Both false positives and false negatives of HttpRequest.is_secure can be
dangerous.
2012-06-04 21:41:05 +01:00
Luke Plant 0199bdc0b4 Rewrote security.txt SSL docs, noting SECURE_PROXY_SSL_HEADER. 2012-06-04 21:41:05 +01:00
Adrian Holovaty 6799ffad9a Merge pull request #99 from danielroseman/master
Docs: "Form in a view" example doesn't use RequestContext
2012-06-04 13:13:14 -07:00
Claude Paroz f65e412abd Fixed #18259 -- Specified that ROOT_URLCONF might be needed.
When using the template system in standalone mode and if the url
template tag is used, ROOT_URLCONF has to be defined.
Thanks techtonik for the report.
2012-06-02 11:38:23 +02:00
Daniel Roseman 5c59e43aef Use render shortcut in form example. 2012-05-31 15:33:45 +01:00
Claude Paroz f2b6763ad7 Fixed #18387 -- Do not call sys.exit during call_command.
Moved sys.exit(1) so as failing management commands reach it
only when running from command line.
2012-05-27 20:38:47 +02:00
Claude Paroz fb871f66a8 Added entry in 1.5 release notes about dumpdata improvements. 2012-05-26 16:15:45 +02:00
Claude Paroz 45284a90a5 Fixed #17929 -- Improved tutorial wording and capitalization.
Thanks rmattb for the report and the patch.
2012-05-25 21:49:47 +02:00
Aymeric Augustin e73838b6dd Fixed #17371 -- Made the test client more flexible
The OPTIONS, PUT and DELETE methods no longer apply arbitrary
data encoding (in the query string or in the request body).
2012-05-25 19:03:15 +02:00
Aymeric Augustin 1e6c3368f2 Fixed #18177 -- Cached known related instances.
This was recently fixed for one-to-one relations; this patch adds
support for foreign keys. Thanks kaiser.yann for the report and
the initial version of the patch.
2012-05-24 13:25:01 +02:00
Aymeric Augustin 3b2993ed04 Fixed #18353 -- Inconsistency in date-based CBVs. 2012-05-24 13:02:19 +02:00
Claude Paroz 6219591f2e Fixed #18244 -- Documented that formset.has_changed is a 1.4 addition. 2012-05-22 13:56:03 +02:00
Claude Paroz 115d522c84 Fixed #18167 -- Gave advice on checking Django version in the tutorial.
Thanks smuss for the initial patch.
2012-05-22 13:43:58 +02:00
Claude Paroz cafa5bf4f4 Replaced print statement by print function in new install instructions. 2012-05-22 13:22:45 +02:00
Carl Meyer 6ed7d40727 Fixed #18115 - added warning about overlaid install.
Setup.py now warns if it detects that Django is being installed over top
of a previous installation that was never removed. This should only
happen when installing with ``python setup.py install``, as pip
automatically uninstalls before installing a new version and
easy_install installs as an egg directory.

Also generally updated the installation doc.
2012-05-21 17:28:58 -06:00
Aymeric Augustin b0c1e5c081 Documented next/previous_week. Refs #10890. 2012-05-20 11:58:00 +02:00
Aymeric Augustin 4b58e94f27 Followed a best practice in the time zones docs.
Prevented localize from swallowing non existent or ambiguous
datetimes.
2012-05-19 23:33:38 +02:00
Claude Paroz 38408f8007 Marked bytestrings with b prefix. Refs #18269
This is a preparation for unicode literals general usage in
Django (Python 3 compatibility).
2012-05-19 17:43:34 +02:00
Claude Paroz 822d6d6dab Fixed #18325 -- Wrapped self.stdout/stderr in OutputWrapper class 2012-05-19 13:51:54 +02:00
Glen Robertson 9a7261f688 Fixed typo on GeoQuerySet.geohash method. 2012-05-18 14:56:40 -07:00
Stratos Moros 5d80d30a23 remove mention of djangoproject.com from cbv topic
The class based views topic mentions that the djangoproject.com weblog
is built using the date-based generic views, but looking at the code,
it actually uses the deprecated pre-1.3 function based generic views.
2012-05-18 13:25:15 +03:00
Jeremy Cowgar c23d306df8 Added load i18n code to the base wizard form template documentation as it uses the trans tag. 2012-05-17 18:53:57 -04:00
Aymeric Augustin 82a76ef67d Mentioned the previous commit in the release notes 2012-05-17 14:03:19 +02:00
Adrian Holovaty aa757ac22d Merge pull request #43 from techtonik/patch-1
Fixed #18267 -- document `settings.configured` property.
2012-05-16 08:12:48 -07:00
anatoly techtonik 59d2b8aa16 Fix issue #18267 - document `settings.configured` property. 2012-05-16 16:13:39 +03:00
Jannis Leidel 5f75ac91df Fixed #17896 -- Added file_hash method to CachedStaticFilesStorage to be able to customize the way the hashed name of a file is created. Thanks to mkai for the initial patch. 2012-05-16 13:21:50 +02:00
Andrei Antoukh 365853da01 Fixed #4102 -- Allow update of specific fields in model.save()
Added the ability to update only part of the model's fields in
model.save() by introducing a new kwarg "update_fields". Thanks
to all the numerous reviewers and commenters in the ticket
2012-05-12 10:29:41 +03:00
Claude Paroz 0611e1fed2 Fixed #18301 -- Fixed url name in password reset example.
Thanks nicknnn for the report.
2012-05-11 20:15:30 +02:00
Aymeric Augustin 367379581f Fixed #18281 -- Misleading wording in the tutorial.
Thanks bhp for the report.
2012-05-11 12:43:43 +02:00
Aymeric Augustin d171b3cc0b Fixed #16335 -- Clarified an unintuitive behavior.
The DTL will perform dict lookup before method lookup, which yields
an unexpected result for defaultdicts.
2012-05-10 22:34:03 +02:00
Aymeric Augustin 46648b641d Fixed #17798 -- Tweaked the CA localflavor.
Thanks shelldweller.
2012-05-10 22:19:01 +02:00
Aymeric Augustin 73f7d34699 Fixed #17950 -- Warned about usability limits of ModelChoiceField.
Thanks poirier for the report.
2012-05-10 22:01:11 +02:00
Aymeric Augustin c970bcf368 Fixed #18257 -- Typo in contenttypes docs. 2012-05-10 21:32:52 +02:00
Claude Paroz 169b1a404c Replaced foo.next() by next(foo).
This new syntax for next() has been introduced in Python 2.6 and is
compatible with Python 3.
2012-05-10 20:15:49 +02:00
Aymeric Augustin ecdd0914b1 Updated time zone FAQ with timezone.localize. 2012-05-06 09:50:30 +02:00
Claude Paroz d7dfab59ea Replaced cStringIO.StringIO by io.BytesIO.
Also replaced StringIO.StringIO by BytesIO in some other appropriate
places. StringIO is not available in Python 3.
2012-05-05 21:41:44 +02:00
Alex Gaynor 1583d40224 Fixed the syntax used for the Python repl examples in docs and docstrings. 2012-05-05 09:54:30 -05:00
Claude Paroz 865cd35c9b Made more extensive usage of context managers with open. 2012-05-05 14:06:36 +02:00
Claude Paroz ec5423df05 Fixed #18270 -- Corrected variable name in password reset example.
Thanks schnippi for the report.
2012-05-04 08:20:50 +02:00
Ramiro Morales e9a56606e7 Fixed broken URLs introduced in 1adc87cd32. 2012-05-03 12:42:56 -03:00
Ramiro Morales 1adc87cd32 Updated some URLs in the documentation to point to the new repository. 2012-05-03 11:53:17 -03:00
Alex Ogier 227cec686e Fixed #18214 -- Clarified the docs about serializable objects. 2012-05-03 08:57:22 +02:00
Claude Paroz aaa3382fdc Fixed #18246 -- Replaced bash-specific syntax in geodjango postgis helper script.
Thanks jose for the report.
2012-05-01 20:33:50 +02:00
Aymeric Augustin 80c0cbf1c9 Clarified warning about date-based generic views. 2012-05-01 11:29:55 +02:00
Aymeric Augustin 78ba9670af Fixed #18217 -- Time zone support in generic views
Introduced a distinct implementation depending on the type of the
date field (DateField or DateTimeField), and applied appropriate
conversions is the latter case, when time zone support is enabled.
2012-04-30 20:48:19 +02:00
Claude Paroz 596cb9c7e2 Replaced print statement by print function (forward compatibility syntax). 2012-04-30 20:45:03 +02:00
Aymeric Augustin fe43ad5707 Fixed a small formatting error. 2012-04-30 17:50:32 +02:00
Kyle Fuller 96af691835 docs: It's rsync_project not rysnc_project 2012-04-30 12:52:37 +01:00
Aymeric Augustin af71ce06ea Minor fixes in the custom template tags docs. 2012-04-29 21:44:31 +02:00
Claude Paroz 3904b74a3f Fixed #18013 -- Use the new 'as' syntax for exceptions.
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
2012-04-29 20:57:15 +02:00
Claude Paroz eefb00f301 Fixed #18220 -- Removed the CACHE_BACKEND setting, as per official deprecation timeline.
Thanks Ramiro Morales for the review.
2012-04-29 20:47:36 +02:00
Adrian Holovaty e7d99aa0fe Edited docs/releases/1.5.txt 2012-04-29 13:33:54 -05:00
Aymeric Augustin cec6bd5a59 Fixed #18023 -- Removed bundled simplejson.
And started the deprecation path for django.utils.simplejson.

Thanks Alex Ogier, Clueless, and other contributors for their
work on the patch.
2012-04-29 19:58:00 +02:00
Anssi Kääriäinen 584e2c0337 Prevent Oracle from changing field.null to True
Fixed #17957 -- when using Oracle and character fields, the fields
were set null = True to ease the handling of empty strings. This
caused problems when using multiple databases from different vendors,
or when the character field happened to be also a primary key.

The handling was changed so that NOT NULL is not emitted on Oracle
even if field.null = False, and field.null is not touched otherwise.

Thanks to bhuztez for the report, ramiro for triaging & comments,
ikelly for the patch and alex for reviewing.
2012-04-29 19:25:46 +03:00
Aymeric Augustin 3e8b40f479 Fixed #17992 -- Added a public API for localtime.
Thanks Bradley Ayers for the report.
2012-04-29 15:37:23 +02:00
Scott Klein 5c3e88060e Updated some antique references in "Is Django stable?" 2012-04-28 15:16:46 -03:00
Aymeric Augustin b49bc5c990 Removed a svn-specific configuration for Sphinx. 2012-04-28 15:03:16 +02:00
Adrian Holovaty bcdc99dda2 Updated docs/intro/whatsnext.txt to reference Git instead of SVN 2012-04-27 22:57:23 -05:00
Adrian Holovaty 8df8e516ab Updated docs/topics/install.txt to note github URL instead of code.djangoproject.com 2012-04-27 22:26:16 -05:00
Claude Paroz be12c9e908 Fixed #18038 -- Removed the 'supports_inactive_user' backwards-compatibility flag. Thanks Aymeric Augustin for the initial patch and Ramiro Morales for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-26 17:15:40 +00:00
Claude Paroz 1858e47672 Fixed #18033 -- Removed function-based generic views, as per official deprecation timeline. Rest in peace! Thanks Anssi Kääriäinen for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-25 19:17:47 +00:00
Claude Paroz ea9dc9f4b0 Fixed #18060 -- Corrected the import path of an example in custom management commands docs. Thanks smuss for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-25 06:37:16 +00:00
Claude Paroz eb351ac9cb Fixed #18037 -- Changed behaviour of url and ssi template tags to the new syntax, as per official deprecation timeline. Thanks Ramiro Morales and Jannis Leidel for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-24 19:55:52 +00:00
Claude Paroz 530ab32e9f Fixed #18187 -- Completed example and details about custom command options. Thanks purple for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-23 18:05:12 +00:00
Claude Paroz d93b2a8d8d Fixed #18186 -- Fixed ReportLab Web site links. Thanks pablog for the report and the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17928 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-22 17:18:14 +00:00
Alex Gaynor bc8b9bd438 Fixed #18159 -- added an import statement to the docs. Thanks to Jeff Hui for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-22 15:58:53 +00:00
Alex Gaynor 3c5ff9d703 Fixed #5893 -- Added a flag to FilePathField to allow listing folders, in addition to regular files. Thank you to Brian Rosner, for encouraging me to first contribute to Django 4 years ago.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-22 14:44:08 +00:00
Ramiro Morales 83fc965171 Added documentation notes about lack of database savepoints support when using MySQL+MyISAM.
Refs #15507, #18116 and r17341, r17921.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-21 22:52:03 +00:00
Claude Paroz 64bc22be94 Reworded the 'Set up a database' section of the installation docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-21 12:35:06 +00:00
Ramiro Morales 4536359887 Fixed #18116 -- Raised minimum MySQL version officially suported to 5.0.3.
Thanks Carl, Claude and Anssi for discussion and patch review.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-21 03:04:10 +00:00
Claude Paroz 3d5d0be499 Fixed #18156 -- Updated signature of ModelAdmin change_view in docs to reflect r17466. Thanks arthurprat for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-20 12:58:32 +00:00
Anssi Kääriäinen d5b93d3281 Fixed #10494 -- Added kwargs to QuerySet.get() error message in the case no objects were found.
Thanks brondsem for the report, Szymon Pyzalski for the patch and oinopion for review.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-20 11:09:32 +00:00
Chris Beaven a901654a96 Very minor Python formatting change to template documentation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-20 01:31:07 +00:00
Luke Plant 718f149bb2 Added more explicit warnings about unconfigured reStructured Text usage in docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-19 15:00:55 +00:00
Claude Paroz 38d7a3a0fe Fixed #18316 -- Fixed pre-1.3 PermWrapper location in docs. Thanks Adrien Lemaire for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-16 11:38:43 +00:00
Claude Paroz 157f823819 Fixed #18024 -- Reworded sentence in models documentation. Thanks Preston Holmes for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-15 21:25:23 +00:00
Aymeric Augustin 5116c51b40 Clarified that Django randomizes session keys. Refs #11555, #13478, #18128.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-15 16:34:13 +00:00
Claude Paroz 749243941c Fixed #18041 -- Removed support for Markdown versions < 2.1, following the 1.5 deprecation timeline. Thanks Ramiro Morales for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-14 12:35:31 +00:00
Aymeric Augustin a9187e5447 Fixed a typo in an example in the timezone docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-14 06:40:53 +00:00
Aymeric Augustin be1082b3fe Fixed #18078 -- Linked more prominently to the removed features in the release notes. Thanks ptone for the text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-14 06:40:20 +00:00
Claude Paroz 57a12ca0ac Fixed #18118 -- Improved documentation for contrib.auth.hashers utility functions. Thanks Mathieu Agopian for the report and Ramiro Morales for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-13 11:38:52 +00:00
Claude Paroz 844e56e21a Fixed #18039 -- Changed geometry transform without a SRID raise a GEOSException.
This was planned in the official deprecation timeline for 1.5.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-12 16:35:28 +00:00
Claude Paroz cbc411571a Fixed #18107 -- Replaced a deprecated import path for GeoIP in docs. Thanks jonash for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-11 21:35:08 +00:00
Alex Gaynor f5a9e5e928 Fixed #18099 -- corrected a typo in the initial data docs. Thanks to Bradley Ayers for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-11 02:03:59 +00:00
Aymeric Augustin 93240b7d90 Fixed #17229 -- Allow 'True', 'False' and 'None' to resolve to the corresponding Python objects in templates.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-10 20:49:45 +00:00
Claude Paroz 916d705538 Fixed #18095 -- Added missing 'cc' mention in EmailMessage recipients() description. Thanks Stéphane Raimbault for the report and the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17891 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-10 20:00:18 +00:00
Julien Phalip 6f7aa51b2c Fixed #17864 -- Added Hong Kong localflavor. Thanks to mrkschan and Adrien Lemaire.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-09 17:25:02 +00:00
Claude Paroz 36ab8ae270 Fixed #17672 -- Precised MacPorts GeoDjango install instructions to install gdal with geos support. Thanks chosak for the report and the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-09 10:00:32 +00:00
Julien Phalip 93d1fdb130 Fixed #17877 -- Ensured that extra WHERE clauses get correctly ANDed when they contain OR operations. Thanks to Marek Brzóska for the report, to eleather for the test case and to Adrien Lemaire for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-09 00:43:08 +00:00
Claude Paroz 5c53e30607 Fixed #18035 -- Removed deprecated AdminMediaHandler, as per official deprecation timeline. Thanks Jannis Leidel and Ramiro Morales for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-08 21:13:32 +00:00
Claude Paroz 393aeb79b8 Added gettext target to sphinx makefiles.
This have been copied from sphinx-quickstart result in latest sphinx versions.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-07 22:35:57 +00:00
Claude Paroz 8663bc1103 Fixed #16074 -- Added ContextMixin to class-based generic views to handle get_context_data. Thanks emyller, Luke Plant, Preston Holmes for working on the ticket and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-06 21:24:33 +00:00
Ramiro Morales b4a9827133 Fixed #18074 -- Fixed description of dumpdata command --database option.
Thanks aruseni for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-06 18:55:42 +00:00
Claude Paroz 723445f40e Fixed #16233 -- Added link to multiple databases docs from custom sql alias section. Thanks charlax for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-06 09:17:37 +00:00
Claude Paroz 60ceeda9d5 Fixed #18009 -- Cleaned up a comment about removal of the old contrib.syndication Feed class. Thanks Keryn Knight for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-02 19:50:28 +00:00
Claude Paroz cb2fafe574 Fixed #18045 -- Corrected the documented default value of SESSION_COOKIE_HTTPONLY setting. Missing bit of r17135.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-01 17:13:55 +00:00
Ramiro Morales b41ebcf1b9 Fixed #18040 -- Removed so-called project-level locale trees from the list of paths the translation loading process takes in account.
Deprecated in Django 1.3. Removed completely for Django 1.5.

Thanks Claude for the review.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 22:24:24 +00:00
Ramiro Morales f38cf60c35 Advanced version identifiers for 1.5 development cycle.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 19:39:28 +00:00
Claude Paroz 89b66efafc Fixed #17983 -- Re-fixed the ln syntax by adding a trailing slash to the destination directory.
The -t argument is not a POSIX standard. Thanks Aymeric Augustin for pointing the problem.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 18:55:23 +00:00
Claude Paroz 7b89e0fc57 Fixed #17983 -- Use a non-ambiguous syntax of the ln command in install docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 18:24:43 +00:00
Alex Gaynor 79ce1be26b Fix a reST error.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 16:30:36 +00:00
Claude Paroz d2e273e295 Fixed #18029 -- Removed leftover mod_python files forgotten in r17835.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 14:50:54 +00:00
Aymeric Augustin 9ed6e08ff9 Removed deprecated URLField.verify_exists.
The deprecation schedule was slightly accelerated because of possible security ramifications.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 13:55:03 +00:00
Aymeric Augustin d38690796c Removed the deprecated reset and sqlreset management commands.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 12:38:11 +00:00
Aymeric Augustin d66035c4a6 Removed documentation for SMTPConnection, which was removed at r15978.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 12:08:39 +00:00
Claude Paroz a1ffb02107 Fixed #18029 -- Removed mod_python as of deprecation process. Thanks Aymeric Augustin for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 10:34:11 +00:00
Claude Paroz 23d3459761 Fixed #17965 -- Definitely dropped support for Python 2.5. Thanks jonash for the initial patch and Aymeric Augustin for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 08:24:29 +00:00
Claude Paroz 27322df995 Fixed #17999 -- Restored the links to examples from models documentation. Refs #17605.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-30 17:59:12 +00:00
Claude Paroz 5dad221558 Added stub release notes for 1.5
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-30 09:33:51 +00:00
Aymeric Augustin eb163f37cb Use the class decorator syntax available in Python >= 2.6. Refs #17965.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-30 09:08:29 +00:00
Claude Paroz 31e84e40f8 Fixed #17870 -- Documented that EmailField default max_length of 75 does not comply with RFCs 3696/5321. Thanks Rotund for the report and the patch and Russell Keith-Magee for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-29 18:39:21 +00:00
Ramiro Morales 782c1a770e Fixed #17999 -- Added a 'See also' paragraph to OneToOneField doc section.
Thanks creecocde for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-29 15:25:27 +00:00
Claude Paroz 9ddbed6f15 Fixed 17993 -- Removed quotes around module parameter for wider compatibility. Thanks roberto@unbit.it for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-28 20:28:13 +00:00
Claude Paroz f95baa1d8a Added missing indentation in models topic documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-27 09:07:03 +00:00
Aymeric Augustin 00ec03fd44 Fixed #17733 -- Discouraged setting TIME_ZONE to None when USE_TZ is True. Thanks berdario for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-26 14:17:13 +00:00
Paul McMillan 5d4fb5cfea Fix lintian error in manpages.
Fixes a lintian I: message about improper use of minus instead
of a hyphen.

The Debian/Ubuntu maintainers have been keeping this as a diff,
and couldn't be bothered to contribute it upstream.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-25 19:04:11 +00:00
Claude Paroz 2577d58e9d Fixed #17963 -- Fixed internal links in the 1.4 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 19:44:52 +00:00
Alex Gaynor 14c42b8e95 Bump the version in a docs example.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 18:05:31 +00:00
James Bennett 2591fb8d4c Bump trunk to 1.4.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 16:53:23 +00:00
Jacob Kaplan-Moss a033d4992c Edited Django 1.4 release notes:
* Remove the "UNDER DEVELOPMENT" parts.
* Added an overview, explicitly mentioning time zone support.
* Spell/grammar check.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 16:51:01 +00:00
Julien Phalip 1101739668 Fixed #17936 -- Fixed a code sample in the admin `SimpleListFilter` documentation. Thanks to anonymous for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-21 05:57:22 +00:00
Claude Paroz 163c8def82 Fixed an indentation issue in GeoDjango installation docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-19 21:02:35 +00:00
Claude Paroz 6afc1d1a6b Fixed #17893 -- Added GeoDjango installation instructions for Ubuntu 11.10. Thanks jpaulett for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-19 20:44:51 +00:00
Claude Paroz c7cc4cfb9e Fixed #16138 -- Made FormMixin get_initial return a copy of the 'initial' class variable. Thanks hanson2010, wilfred@potatolondon.com and agriffis for their work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-17 22:31:03 +00:00
Claude Paroz f13328f776 Fixed #17926 -- Removed mention of XMLField in docs (missing deletion from r15982). Thanks aburgel for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-17 22:13:20 +00:00
Claude Paroz b452439a6e Fixed #17915 -- Switched GeoModelAdmin default WMS layer URL from Metacarta to OSGeo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-17 20:13:06 +00:00
Claude Paroz c8c59c812c Fixed #13267 -- Updated GeoDjango tutorial for the 1.4 release. Thanks samueladam for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-16 21:41:19 +00:00
Claude Paroz ecf75e5957 Fixed #17841 -- Clarified caching note about authentication backends. Thanks auzigog for the proposal and lukegb for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-16 19:30:00 +00:00
Claude Paroz 232c99cee1 Added Django-Python version matching table in FAQ.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-16 18:41:31 +00:00
Claude Paroz 8ef60df067 Fixed #17607 -- Added homebrew section in Mac OS X-specific install instructions for GeoDjango. Thanks estibistec for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17743 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-15 13:16:27 +00:00
Claude Paroz f946b12c06 Fixed #17900 -- StreamHandler output defaults to stderr. Thanks c4m3lo for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-15 07:56:01 +00:00
James Bennett e6ae858811 Bump trunk to 1.4 RC 2.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-15 03:29:49 +00:00
James Bennett dad1f5c21e Fixed #17605: Restored deleted query documentation that used to live in doctests. Thanks zsiciarz for work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17737 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 22:16:46 +00:00
Paul McMillan 14df122f86 Fixed #17837. Improved markdown safety.
Markdown enable_attributes is now False when safe_mode is enabled. Documented
the markdown "safe" argument. Added warnings when the safe argument is
passed to versions of markdown which cannot be made safe. Deprecated
versions of markdown < 2.1. Many thanks to ptone for the patch.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 19:06:23 +00:00
Claude Paroz 21fb1c59c3 Updated some outdated external URLs in docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 07:41:02 +00:00
Aymeric Augustin 4b14546215 Fixed #17895 -- Made override_settings send the setting_changed signal both when a setting is overridden and when it's restored.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-13 23:02:31 +00:00
Claude Paroz 2a0f4578ef Fixed #17584 -- Updated create_template_postgis-debian.sh script for PostgreSQL 9.1 installs. Thanks akaihola for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-13 22:21:38 +00:00
Julien Phalip 01c8862abd Fixed #17891 -- Documented a small backwards incompatibility in the `password_reset` auth view. Thanks to danfairs and lukegb.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17705 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-13 21:49:48 +00:00
Claude Paroz 3dc946e49e Fixed #17236 -- Clarified that anonymous session data are retained after login. Thanks krzysiumed for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-13 19:23:52 +00:00
Claude Paroz 78638a9a51 Replaced http by https in djangoproject.com links
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-13 17:53:31 +00:00
Claude Paroz f5afa22abd Add myself to committers
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-13 17:35:00 +00:00
Jannis Leidel 0ee801e360 Fixed #17857 -- Stopped CachedStaticFilesStorage from creating absolute URLs unnecessarily. Thanks, tgecho.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-13 03:48:11 +00:00
Karen Tracey 37d0488910 Add a note to the backwards-incompatible changes section of 1.4 release notes about the change related to loading fixtures with incomplete data for auto_now and auto_now_add fields. Refs #12753. Thanks ptone.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-13 00:15:43 +00:00
Adrian Holovaty d694f17536 Made some small edits to localization docs from [17690]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17693 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-12 23:05:16 +00:00
Jannis Leidel db512b4d8c Fixed the localization docs a little to point to the correct Transifex URL. Also reworded it a bit to follow the site's new UI.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-12 22:00:44 +00:00
Adrian Holovaty ebc6fc9354 Added note to releases/1.4.txt about contrib.auth user password hash-upgrade sequence. Thanks, ericholscher
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-12 20:14:58 +00:00
Adrian Holovaty dd246a62c7 Edited some docs and docstrings until [17685]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-12 20:05:48 +00:00
Carl Meyer b2dcec228a Fixed broken link.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-12 17:22:22 +00:00
Ramiro Morales aba9ebcaee Fixed a couple of typos in testing document.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-11 19:49:19 +00:00
Aymeric Augustin e1a31aadb0 Fixed an inappropriate repetition. Thanks DanGer for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-11 11:49:38 +00:00
Ramiro Morales c4527b1df7 Fixed Sphinx warnings when building docs introduced in r17665.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-10 17:24:11 +00:00
Timo Graham 54a1fa74bf Fixed #17842 - Typo in uWsgi docs; thanks mitnk.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-10 10:03:33 +00:00
James Bennett 878ec9e646 Bump for 1.4 RC 1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-05 17:22:23 +00:00
Chris Beaven 8c9b032ea0 Fixes #17327 -- Add --database option to createsuperuser and change password management commands
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-05 04:17:55 +00:00
Chris Beaven 5ccc6f17b8 Fixed #16939 -- Inaccurate implementation of {% comment %} presented in custom template tag 'howto' guide. Thanks sebastian for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-05 03:25:27 +00:00
Aymeric Augustin a78e61b5e9 Fixed a ReST error. Thanks md4d for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-04 20:32:12 +00:00
Aymeric Augustin cfd0cd1bc9 Documented a limit of the SQLite backend, in relation with the bulk_create function. Refs #17788.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-04 17:34:22 +00:00
Aymeric Augustin 60a62bf6f2 Fixed a typo in the sitemaps docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-04 09:33:28 +00:00
Aymeric Augustin 21c38f9c34 Linked to the FAQ from the release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-03 22:54:55 +00:00
Aymeric Augustin 503c85affc Fixed a typo in the time zone docs. Thanks Ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-03 22:41:21 +00:00
Aymeric Augustin af3791fa7f Fixed #17738 -- Extended the time zone documentation with a FAQ. Thanks Anssi for the questions and Jannis for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-03 22:02:23 +00:00
Ramiro Morales 149e541034 Added a blurb about new SimpleTestCase class to release notes.
Also, tweaked the cross-referencing of `django.test` symbols.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-03 21:50:49 +00:00
Aymeric Augustin 7ce1ad7c03 Made django.utils.timezone.localtime a private API -- it's too specific to the template engine.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-03 19:57:25 +00:00
Aymeric Augustin 3576c99f74 Fixed #17808 -- Explained why fixtures can trigger RuntimeWarnings after enabling time zone support, and how to fix them.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-03 10:13:35 +00:00
Aymeric Augustin c0e73a4909 Fixed #9995 -- Updated the installation instructions to recommend pip. Also fixed ReST errors. Refs #9112.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-03 09:11:54 +00:00
Adrian Holovaty 2ade1e916f Edited stuff from [17543] to [17629]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 17:16:52 +00:00
Carl Meyer 3ed0b6ed64 Fixed #17799 - Documented that the execute() method of a management command is not suitable for calling the command from code; call_command should be used instead. Thanks kacah222 for the report and claudep for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 17:13:53 +00:00
Jannis Leidel fcaf8eae14 Fixed #17046 -- Added a check if the username passed to User.objects.create_user is empty or not. Thanks, kwadrat.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 16:56:20 +00:00
Jannis Leidel 40b248acc7 Fixed #17723 -- Mentioned the changes done in r17547. Thanks, ryankask.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 16:56:11 +00:00
Jannis Leidel d93a2ef887 Fixed #17568 -- Mentioned ``reverse_lazy`` in the ``LOGIN_REDIRECT_URL`` settings docs. Thanks, zsiciarz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17626 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 16:56:04 +00:00
Carl Meyer 7b624c6c32 Fixed #17794 - Added a bunch of cross-reference links to the DB queries topic documentation. Thanks guettli for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17624 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 16:45:06 +00:00
Carl Meyer 8cadf1d79a Fixed #17790 - Made the Ajax CSRF jQuery example work with jQuery in compatibility mode, too. Thanks Jonathan Hayward for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 16:06:11 +00:00
Paul McMillan a255d39338 Fixed 17764. Improved auth docs.
Thanks mbt for the report and patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 05:03:52 +00:00
Paul McMillan 84dd83f018 Fixes #17578. Improve setup instructions for Windows users.
Thanks Pariksheet Nanda for the report and zsiciarz for the patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 04:27:46 +00:00
Paul McMillan 2a4e49595a Fixed #17766. Clarified HttpOnly flag on session cookie.
Thanks ptone for the patch!


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 04:22:16 +00:00
Carl Meyer 60119d4f49 Refs #17800 - Added release notes and deprecation note about SECRET_KEY requirement.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 04:04:56 +00:00
Carl Meyer b05abd8314 Fixed broken link to python-markdown in contrib.markup docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-01 19:32:48 +00:00
Timo Graham d2988ce0f4 Fixed #17767 - Added signed cookie session backed to session engine settings docs; thanks Preston Holmes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-01 01:06:22 +00:00
Luke Plant de9942a667 Fixed #17668 - prefetch_related does not work in in_bulk
Thanks to gurets for the report, and akaariai for the initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-28 19:34:04 +00:00
Aymeric Augustin 2ddfcfbec6 Clarified the fact that the signal_changed signal isn't used by Django itself (yet). Refs #17787.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-27 22:52:07 +00:00
Ramiro Morales 7061da514a Added a diagram of the hierarchy of our TestCase subclasses to the testing docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-27 19:04:33 +00:00
Luke Plant 0447cc1231 Added versionadded info for ensure_csrf_cookie decorator
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-27 14:40:36 +00:00
Luke Plant 59b2439e7e Fixed ReST typo in CSRF docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-27 14:40:27 +00:00
Aymeric Augustin e0d78f898f Fixed #17715 -- Updated the tutorial for time zone support, plus a few other improvements.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-26 21:17:58 +00:00
Aymeric Augustin 26d12af6fd Fixed #17772 -- typo in the release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-26 20:48:48 +00:00
Timo Graham 5a013cebd9 Fixed #17073 - focused uwsgi docs to Django integration; thanks Preston Holmes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17586 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-24 23:24:30 +00:00
Timo Graham ce4cd788ef Fixed #17757 - Typo in docs/intro/overview.txt; thanks kaushik1618.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-24 22:53:48 +00:00
Timo Graham e4f468b940 Fixed #17749 - Documented better way of overriding ModelAdmin; thanks chrisdpratt and claudep.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-24 22:50:36 +00:00
Aymeric Augustin 6daad896fb Reverted r17577 because it's actually possible to use a time zone that isn't the system time zone without pytz, thanks to the TZ environment variable.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-22 21:42:50 +00:00
Aymeric Augustin 8842183448 Noted that TIME_ZONE must be the server time zone when time zone support is enabled and pytz isn't installed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-22 21:13:36 +00:00
Aymeric Augustin 5b560ec0c0 Fixed a few typos in the aggregation functions reference.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-21 18:28:35 +00:00
Chris Beaven 0e54c23caf Fixed #17660 -- Standardize extends tag token parsing
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-21 02:59:05 +00:00
Timo Graham 7d7d2d354c Fixed #16758 - Added a warning regarding overriding default settings; thanks cyclops for the suggestion & Aymeric Augustin for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-20 19:08:22 +00:00
Timo Graham 9e62428c28 Fixed #17390 - Added a note to topics/auth.txt regarding how to decorate class-based generic views; thanks zsiciarz for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-20 18:57:51 +00:00
Aymeric Augustin cfd0cb0064 Fixed #17319 -- Made the example for set_language less error-prone. Thanks Anna Dolma Alonso for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-19 09:19:38 +00:00
Aymeric Augustin 1d78897c5d Fixed #17166 -- Documented how FIXTURE_DIRS works in the inital data how-to, and edited related bits in the settings reference.
Performed minor edits for consistency while I was there.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-19 09:02:52 +00:00
Aymeric Augustin 9d0bf66273 Fixed #17316 -- Mentionned that the MultipleProxyMiddleware provided as an example must run rather early.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-19 08:09:20 +00:00
Aymeric Augustin 7a7ec73efe Fixed #16452 -- Clarified that the DATE/DATETIME/TIME_INPUT_FORMATS settings have no effect when USE_L10N is True. Thanks Travis Brooks.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-19 08:00:06 +00:00
Aymeric Augustin 0fe4218427 Fixed #17573 -- Documented MySQL's switch to InnoDB as default storage engine. Thanks Lenz Hirsch for the report and Claude Paroz for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-19 07:39:05 +00:00
Timo Graham 03aa030f07 Fixed #17706 - Improved short description example in Tutorial 2; thanks xbito and claudep.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-18 21:50:48 +00:00
Timo Graham 25a68c6574 Fixed #17685 - Typo in BaseDateListView.get_dated_items(); thanks ejb.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-18 21:40:00 +00:00
Julien Phalip b039bd3fb0 Fixed #16618 -- Corrected the admin interface's breadcrumbs in the tutorials' screenshots. Many thanks to Claude Paroz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17543 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-18 09:32:18 +00:00
Adrian Holovaty c1bdfd6f6f Changed various non-breaking space characters from [17478] to use the code representation rather than the actual character, which is too hard to overlook because it just looks like a space
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-17 20:23:42 +00:00
Carl Meyer 2a1a0f47bb Fixed typo in GIS testing docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-17 20:09:40 +00:00
Adrian Holovaty 7981efe04f Documentation (and some small source code) edits from [17432] - [17537]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-17 20:04:11 +00:00
Adrian Holovaty 9fa536dc4f Added note to coding-style.txt about how we should NOT be religious about line lengths.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-17 20:03:40 +00:00
Aymeric Augustin 9d7b5558ee Fixed a few typos and updated an example in the URLs docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 21:59:22 +00:00
Aymeric Augustin 5b37a02ba3 Used Sphinx markup for PEPs and fixed a typo in the 1.4-beta-1 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 18:27:42 +00:00
Alex Gaynor 19e1a3556f Fix a reST foul up.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 04:32:42 +00:00
James Bennett 50c64ed379 Accommodate new version numbering scheme.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 04:01:58 +00:00
James Bennett 46671e9b68 Bump version numbers for 1.4 beta 1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 02:12:20 +00:00
James Bennett e5e45d8afc Update beta release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 02:10:48 +00:00
Paul McMillan c05930c858 Added an explicit warning about cookie session store to release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 02:08:11 +00:00
Gabriel Hurley ea8af819ab Corrected a sentence fragment in the release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 02:06:59 +00:00
Paul McMillan 6072e108e2 Fixed #17693. Input validation and tests for base36 conversion utils. Thanks Keryn Knight for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 00:58:49 +00:00
Julien Phalip 41256d2341 Fixed #17652 -- Removed all mentions to Windmill from the docs as that project doesn't integrate well with Django at this time.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-15 17:33:51 +00:00
Jannis Leidel 803de60c08 Stopped the collectstatic management from being wastful with file handlers. Refs r17519.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-14 09:55:09 +00:00
Jannis Leidel bd13cfa917 Added a note to the release notes about the new format strings added in r17473.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-13 20:57:44 +00:00
Timo Graham 2df1847c9b Fixed #16653 - Added example of kwargs support for resolve(); thanks krzysiumed for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17517 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-12 17:10:31 +00:00
Aymeric Augustin d1f8555500 Fixed #16150 -- Added 'feed_url' and clarified 'link' in the Feed reference docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17516 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-12 15:18:24 +00:00
Aymeric Augustin 03c80067c6 Fixed #17451 -- Mentioned the new JavaScript lexer in the release notes. Refs #7704.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17515 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-12 15:10:08 +00:00
Aymeric Augustin 61fe50fdd6 Added documentation for r17418. Refs #17481.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17513 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-12 14:29:30 +00:00
Ramiro Morales 4b81d790a8 Updated SpatiaLite GeoDjango test setup instructions for version 3.0.
Also, fixed documentation typos introduced in r17496.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-11 18:01:53 +00:00
Timo Graham 44452b11eb Fixed #17618 - Documented that variable names in template must not start with an underscore; thanks guillemette and krzysiumed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-11 12:47:35 +00:00
Ramiro Morales 8a986cb5bc Fixed small errors in GeoDjango tutorial, enhanced code pygmentation in install document.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-11 01:48:45 +00:00
Ramiro Morales c406b554c7 Added, documented support for SpatiaLite 3.0 to GeoDjango.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17496 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-11 00:40:18 +00:00
Ramiro Morales ad8022f89a Updated a couple of links in GeoDjango install doc.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17491 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-10 02:34:06 +00:00
Ramiro Morales fc14996c8d Made a couple of tweaks to lazy translation docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17490 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-10 01:45:03 +00:00
Ramiro Morales 8d381acb24 Made some small tweaks to GeoDjango docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17489 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-10 01:40:43 +00:00
Jannis Leidel 4dbeb4bca4 Fixed #17515 -- Added ability to override the template of custom admin FilterSpec classes. Thanks, saxix and Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-09 18:59:05 +00:00
Jannis Leidel ec5e2f0ccc Fixed #17460 -- Extended the HIDDEN_SETTINGS constant in with a few more sensible names of settings to hide in the debug view. Many thanks to chomik, lpiatek and tomaszrybak.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17481 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-09 18:58:45 +00:00
Jannis Leidel 75c60e8053 Fixed #17217 -- Use non breaking spaces for format localization in which spaces are used. Thanks, Claude Paroz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-09 18:58:17 +00:00
Jannis Leidel a6b6c6e171 Fixed #16416 -- Added two new date formatting options for timezones and ISO week numbers. Thanks, poirier.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-09 18:57:31 +00:00
Jannis Leidel e445b66fd8 added German (Switzerland) localflavor formats
added documentation on the limitations of the German (Switzerland)
localflavor formats
Based on a patch by sspross (#16188)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-09 18:57:22 +00:00
Jannis Leidel 75a9c8a5ef Fixed #10793 -- Stopped caching paginator instances in sitemap classes to prevent stale sitemaps. Thanks, gnosek, krzysiumed and adam_przybyla.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-09 18:56:49 +00:00
Aymeric Augustin f9ec6bd3df Documented the new version numbering scheme introduced in r17357.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-09 08:37:33 +00:00
Aymeric Augustin 175e6d77df Fixed #11745 -- Grouped commands by application in the output of `manage.py help`. Made 'version' consistent with 'help' while I was in the area, and added tests. Thanks Jannis for the feedback and review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-07 18:46:29 +00:00
Ramiro Morales 09ad6d1b88 Fixed a couple of minor errors in the django-admin(1) Unix man page.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-06 02:00:19 +00:00
Timo Graham 0ccbb5356a Fixed #17571 - Fixed documentation of skipUnlessDBFeature; thanks EnTeQuAk for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-05 15:53:09 +00:00
Timo Graham 9f95d79cee Fixed #17510 - Typo in docs/topics/class-based-views.txt; thanks andrew and noria.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-05 15:41:33 +00:00
Jannis Leidel 62dc16dcd8 Fixed #17625 -- Mention in the management command docs that modules with an underscore prefix are ignored and not dissplayed in the list of commands.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-04 18:27:14 +00:00
Jannis Leidel 52d72a5a3e Fixed #17182 -- Changed best practice documentation for Form.clean to use super() instead of relying on self.cleaned_data. Thanks, DrMeers.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-04 16:05:30 +00:00
Jannis Leidel faeee611d6 Fixed #17517 -- Added `--name` option to startproject and startapp management commands to be able to render files without a file extension. Thanks, Florian Apolloner.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-04 13:01:30 +00:00