Commit Graph

472 Commits

Author SHA1 Message Date
Tim Graham e0837f2cb1 Fixed #25508 -- Modified QuerySet.__repr__() to disambiguate it from a list. 2015-10-06 12:38:34 -04:00
Tim Graham 8a5a002f2f Made a couple tutorial corrections for Django 1.9. 2015-10-01 15:18:43 -04:00
Tim Graham 1515b6a8b3 Removed an old note (Django 1.4-era) from the tutorial. 2015-10-01 14:51:22 -04:00
Tim Graham de99f558d8 Fixed #25462 -- Removed Model.__unicode__() in favor of @python_2_unicode_compatible. 2015-09-25 13:28:12 -04:00
Mariusz Felisiak 6f1b09bb5c Made assorted improvements to the Oracle documentation. 2015-09-18 09:47:32 -04:00
Tim Graham 862de0b254 Fixed #25356 -- Removed default_app_config from startapp template.
Also discouraged its use outside the intended use case.
2015-09-07 15:23:11 -04:00
elky b929d2d09d Fixed #25200 -- Updated tutorial screenshots for new admin theme. 2015-09-07 08:36:55 -04:00
Alasdair Nicol 19f98946f2 Fixed #25358 -- Improved variable name for question in tutorial. 2015-09-07 08:13:34 -04:00
Tim Graham bda408f60b Fixed #25153 -- Moved 'polls' first in tutorial's INSTALLED_APPS. 2015-08-19 18:59:42 -04:00
Claude Paroz 64982cc2fb Updated Wikipedia links to use https 2015-08-08 12:02:32 +02:00
Caio Ariede ec9004728e Fixed #25175 -- Renamed the postgresql_psycopg2 database backend to postgresql. 2015-08-07 09:33:17 -04:00
Flavio Curella c2e70f0265 Fixed #21127 -- Started deprecation toward requiring on_delete for ForeignKey/OneToOneField 2015-07-27 18:28:13 -04:00
Alasdair Nicol 600fb7c51b Fixed #25161 -- Encouraged users to install the latest release in docs 2015-07-24 13:36:08 -04:00
Tim Graham bdfce4db21 Removed a confusing sentence in tutorial 5. 2015-07-08 15:11:40 -04:00
Tim Graham 7f1168e387 Removed support for Python 3.3. 2015-06-18 08:36:50 -04:00
Markus Amalthea Magnuson fb1ba4d63e Fixed #24943 -- Updated contributing tutorial to use virtualenv 2015-06-15 18:38:16 -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
Markus Amalthea Magnuson 3fd754f12d Fixed #24907 -- Updated contributing tutorial with a more recent example ticket. 2015-06-06 08:36:50 -04:00
Raphael Michel 3e9b5bfd9c Fixed #7060 -- Added a note about race conditions to the tutorial 2015-06-04 09:40:59 -04:00
Edin Sarajlic 40f2325df6 Added migrations directory to file structure in tutorial 2015-06-04 10:59:36 +02:00
Curtis 44eef25463 Optimise tutorial images 2015-05-29 14:56:38 +10:00
João Luiz Lorencetti 3653466bdf Fixed #24732 -- Reordered tutorial to cover basics before bells and whistles. 2015-05-28 14:07:39 -04:00
I am Clinton f3b51f5193 Made minor edits to docs/intro/tutorial01.text 2015-05-19 12:32:23 -04:00
Kamran Mackey 4c2197db32 Updated the Python shell example to use generic version numbers. 2015-05-16 08:35:58 -04:00
Jacob Kaplan-Moss f043434174 Added link to the code of conduct from contributing guides.
This is inspired by Angluar.js
(https://github.com/angular/angular/blob/master/CONTRIBUTING.md), among others.
Thanks to Jeff Triplett for the prod.
2015-04-17 18:12:41 -04:00
Marios Zindilis 7a7c797234 Fixed typo in docs/intro/tutorial02.txt 2015-04-07 07:41:05 -04:00
Markus Holtermann c5cc332bf2 Fixed #24550 -- Added migration operation description to sqlmigrate output
Thanks Tim Graham for the review.
2015-03-30 16:31:20 +02:00
Tim Graham 2acf9d099d Fixed #24519 -- Clarified location of templates directory in tutorial 2. 2015-03-27 09:57:58 -04:00
HerHde 39573a11db Added missing punctuation in some comments in tutorial 5. 2015-03-16 08:24:25 -04:00
saschalalala 5cf8f4596c Simplified command to display path to Django source files.
Python 3 always returns an absolute path.
2015-03-11 10:34:58 -04:00
Alex Shaindlin dcdef1fe2e Improved wording in tutorial 1. 2015-02-27 17:53:11 -05:00
Tim Graham b2f331dc68 Updated tutorial to use explicit relative imports. 2015-02-22 14:20:02 -05:00
Tim Graham ff5e47e7a4 Corrected sqlmigrate output in tutorial 1. 2015-02-22 12:29:01 -05:00
Tim Graham 7901eccf2e Fixed #24371 -- Cautioned against trying to switch databases. 2015-02-22 10:11:18 -05:00
Sean Wang eba6dff581 Fixed #24358 -- Corrected code-block directives for console sessions. 2015-02-22 09:35:39 -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
Tim Graham 7e8cf74dc7 Removed support for syncing apps without migrations per deprecation timeline.
Kept support for creating models without migrations when running tests
(especially for Django's test suite).
2015-01-18 15:58:06 -05:00
Tim Graham 4aa089a9a9 Removed support for custom SQL per deprecation timeline. 2015-01-17 10:16:06 -05:00
Tim Graham fed25f1105 Removed compatibility with Python 3.2. 2015-01-17 09:00:17 -05:00
Keryn Knight 726a9550db Fixed #24143 -- Encouraged use of Http404 messages for debugging. 2015-01-16 09:41:01 -05:00
Collin Anderson 26a92619f6 Fixed #24124 -- Changed context_processors in the default settings.py 2015-01-12 13:17:44 -05:00
Aymeric Augustin ee8d5b91e9 Wrote main documentation for templates. 2015-01-10 20:16:19 +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
Collin Anderson 0821b3d53c Clarified custom header instructions in tutorial 2. 2014-12-26 18:28:47 -05:00
Brian Scoles a6f0b6a98f Fixed typo in docs/intro/tutorial01.txt. 2014-12-25 06:56:23 -05:00
Claude Paroz 0a4b04fc23 Used https for most *.python.org links 2014-12-19 18:07:52 +01:00
Claude Paroz 742fba9455 Used the 🎫 syntax more extensively 2014-12-19 18:07:52 +01:00
Berker Peksag 560b4207b1 Removed redundant numbered parameters from str.format().
Since Python 2.7 and 3.1, "{0} {1}" is equivalent to "{} {}".
2014-12-03 14:27:38 -05:00
Tim Graham 1dbdc03382 Fixed #23907 -- Added admin.site.register in tutorial 2 for consistency. 2014-11-24 15:58:56 -05:00
Tim Graham 8fce797830 Fixed #23855 -- Removed unnecessary all() in tutorial 3. 2014-11-17 18:10:50 +01:00
Tim Graham 3a550bb6d3 Fixed #23588 -- Added a link in tutorial for list_display options. 2014-11-13 20:15:45 +01:00
Tim Graham dc241fdfdf Replaced dead links to python-distribute.org. 2014-10-24 18:58:31 -04:00
Tim Graham e949f4435f Fixed #23587 -- Clarified admin template overriding in tutorial 2.
Thanks Petrus van Bork for the report.
2014-10-08 08:19:11 -04:00
Corey Farwell 37b13033c6 Removed sudo from pip commands in docs. 2014-09-22 15:49:48 -04:00
velis74 24aa85cea9 Fixed #23535 -- Updated tutorial to account for default filter added in 5ea34f3f86. 2014-09-22 15:22:25 -04:00
Tim Graham 54fd84e432 Fixed #23491 -- Clarified tutorial 3.
Thanks diek for the suggestion.
2014-09-17 08:37:27 -04:00
Tim Graham 0d1561d197 Fixed #23486 -- Corrected makemigrations output in tutorial 1.
Thanks nmarler for the report.
2014-09-15 20:27:52 -04:00
Aymeric Augustin 9562ffea97 Avoid the word "stupid".
There's always a better word.
2014-09-09 20:55:57 +02:00
Tim Graham 88c4e01d34 Fixed #23438 -- Added snippet & imports to docs/intro/overview.txt. 2014-09-06 07:31:36 -04:00
Tim Graham 62939aba99 Removed an admonition in the tutorial about the old project layout.
There are no supported versions that use the old layout (<=1.3).
2014-09-05 14:43:33 -04:00
Tim Graham 035f2e699c Fixed #23362 -- Clarified "database columns as attributes" in tutorial. 2014-08-26 10:00:33 -04:00
areski 9d6551204e Removed unnecessary code-block directives. 2014-08-19 16:44:25 -04:00
Baptiste Mispelon 5853c87a45 Fixed #23303 -- Added BEGIN and COMMIT statements to the output of sqlmigrate. 2014-08-18 18:55:12 +02:00
Tim Graham a9fd740d22 Fixed #23276 -- Deprecated passing views as strings to url(). 2014-08-12 13:15:40 -04:00
Tim Graham 21d0ceefb5 Updated links for continous integration server. 2014-08-05 07:28:04 -04:00
Collin Anderson e075d2e66b Fixed #23148 -- Minor tweaks in tutorial code samples 2014-08-02 10:17:45 +02:00
Christoph Heer d47409831f Fixed #23067 -- Updated docs to use django-admin 2014-07-30 14:14:03 -04:00
Rikki 731f313d60 Added warning in tutorial 4 that the regex capture group name has changed. 2014-07-22 14:00:22 -04:00
Dean Silfen b8d255071e Edited setup.py in reuseable apps tutorial to use a context manager for open(). 2014-07-16 14:21:27 -04:00
Claude Paroz 232f2028d5 Included irc link in paragraph to allow for l10n
Translators may want to change the irc link pointing to a
language-specific channel.
2014-07-01 21:54:32 +02:00
Tim Graham 1e8411259f Fixed #22912 -- Warned about a common mistake in tutorial 5. 2014-06-27 09:51:21 -04:00
Tim Graham 1bbffe7867 Fixed #22888 -- Removed some unnecessary text in tutorial 3. 2014-06-23 09:10:44 -04:00
Maxime Turcotte 608aa8d101 Fixed #22836 -- Linked tutorial05 to the right section of tutorial04. 2014-06-20 08:14:17 -04:00
Collin Anderson a8fa96796f Tutorial: Consistent url syntax 2014-06-17 12:23:26 -04:00
vagrant 7a1f8414c3 Fixed #22842 2014-06-15 10:44:33 +00:00
Maxime Turcotte f97c53c098 Fixed #22801 -- Added 'www.' to diveintopython.net links 2014-06-10 15:38:25 -04:00
Tim Graham 93d05536fd Fixed #22770 -- Removed create_superuser from post_migrate signals.
Moved logic to syncdb command for backwards compatibility.
2014-06-10 14:37:37 -04:00
Tom 6923fdbbf1 Reordered tutorial 1 so that the database is configured first.
This change is required after the introduction of
SessionAuthenticationMiddleware to the default middleware
2014-05-05 13:34:46 -04:00
Brenda J. Butler c8d257e81d Fixed #22558 -- Added missing word in contributing docs 2014-05-02 08:28:07 +02:00
Tim Graham b0d032f9fc Fixed #22547 -- Added some links to tutorial 2.
Thanks bjb at sourcer.ca for the suggestion.
2014-04-30 18:22:43 -04:00
Moayad Mardini 927245ccd8 Fixed #22546 -- Removed idioms in tutorial 2.
Thanks bjb at sourcerer.ca for the suggestion.
2014-04-30 18:01:35 -04:00
Claude Paroz 680a0f08b1 Updated doc links to point to Python 3 documentation 2014-04-26 16:02:53 +02:00
Tim Graham 6b2ce38c49 Fixed #22472 -- Clarified meaning of dots in tutorial 4 code block. 2014-04-18 12:10:46 -04:00
chriscauley 66ec9ee441 Fixed #22378 -- Updated \d to [0-9]+ in urlpatterns of docs and tests.
Thanks tomwys for the suggestion.
2014-04-16 20:36:29 -04:00
Tim Graham eefad142de Fixed #22453 -- Corrected DoesNotExist message in docs.
Thanks Eugenio Cano-Manuel.
2014-04-16 08:36:02 -04:00
Tim Graham a1fa6fcabc Added Python 3.4 to list of supported version in docs/intro/install.txt 2014-04-08 11:13:05 -04:00
Tim Graham d73d0e071c Fixed #22218 -- Deprecated django.conf.urls.patterns.
Thanks Carl Meyer for the suggestion and Alex Gaynor and Carl for reviews.
2014-04-03 07:28:10 -04:00
Jeremy Dunck 0e52b2863b Substituted 'shortcut function' for 'factory method' in tutorial
Many newbies don't know what a factory method is, nor is it pertinent to the
information the tutorial hopes to convey.
2014-03-09 14:07:39 -07:00
Baptiste Mispelon ea4da8e63c Fixed some typos in the documentation.
Thanks to Rodolfo Carvalho and Piotr Kasprzyk
for the patch.
2014-03-02 17:05:57 +01:00
Tim Graham 1f5f015c32 Fixed spelling mistakes in docs. 2014-02-28 21:03:46 -05:00
Greg Chapple 2f25cdc18a Fixed #22129 -- Added steps for creating superusers to tutorial. 2014-02-28 08:10:07 -05:00
Szczepan Cieślik e816198034 Fixed docs typos. 2014-02-25 10:28:32 -05:00
Zbigniew Siciarz 74d4d58b62 Fixed #21939 -- Deprecated loading ssi/url tags from future. 2014-02-16 13:25:21 +01:00
Alasdair Nicol f3805f5c52 Added missing snippet to show filename in docs 2014-02-14 12:45:35 +00:00
Alasdair Nicol 8aa1efff6d Fixed #21951 -- Updated docs to use __str__ for Python 3
Thanks Tim Graham for the report and recommendations
2014-02-13 07:12:40 -05:00
Aymeric Augustin 2ff93e027c Fixed #21829 -- Added default AppConfigs.
Thanks Russell for the report, Marc for the initial patch, Carl for the
final review, and everyone who contributed to the design discussion.
2014-01-25 10:41:56 +01:00
Russell Keith-Magee d818e0c9b2 Fixed #16905 -- Added extensible checks (nee validation) framework
This is the result of Christopher Medrela's 2013 Summer of Code project.

Thanks also to Preston Holmes, Tim Graham, Anssi Kääriäinen, Florian
Apolloner, and Alex Gaynor for review notes along the way.

Also: Fixes #8579, fixes #3055, fixes #19844.
2014-01-20 10:45:21 +08:00
Aymeric Augustin 10e0cfc0e4 Fixed #21712 -- Moved autodiscover() to AdminConfig.ready().
Thanks Marc Tamlyn for the initial version of the patch.
2014-01-18 23:06:00 +01:00
Tianyi Wang e6800ea136 Fixed #21728 -- Corrected an inadvertent path change in docs/intro/contributing.txt. 2014-01-03 11:59:15 -05:00
Tim Graham 9953e98e6a Fixed #21701 -- Improved testing doc titles and added testing/tools.txt.
Thanks cjerdonek for the suggestion.
2013-12-31 08:14:09 -05:00
Tim Graham ec020cab7e Fixed a broken link in docs/intro/tutorial01.txt. 2013-12-30 17:59:18 -05:00
Aymeric Augustin 80d74097b4 Stopped populating the app registry as a side effect.
Since it triggers imports, it shouldn't be done lightly.

This commit adds a public API for doing it explicitly, django.setup(),
and does it automatically when using manage.py and wsgi.py.
2013-12-30 22:11:17 +01:00
Aymeric Augustin 99649ddcb2 Assumed Python 3 throughout docs/intro.
Various small fixes while I was proof-reading.
2013-12-30 19:09:45 +01:00
Yaroslav Halchenko 80027d2c38 Unified listing of shell commands/code
- use code-block:: bash
- prefix the command with $
2013-12-25 15:19:14 -05:00
Aymeric Augustin 9b8192ce51 Updated a few doc paragraphs following the app-loading refactor. 2013-12-24 17:20:11 +01:00
Tim Graham cc2d960274 Fixed #21613 -- Removed a hardcoded input id from the tutorial.
Thanks Bruno Brouard for the report.
2013-12-18 18:36:01 -05:00
Chris Jerdonek e1cfc4b96a Fixed link text for "Testing in Django" in tutorial 5. 2013-12-14 10:41:26 -05:00
Claude Paroz 626bdf648a Updated a bunch of hyperlinks in documentation 2013-12-08 18:40:09 +01:00
Alasdair Nicol 317fd13c7a Fixed #21562 -- Warned against using the same app name as a django contrib app.
Thanks yourcelf for the report.
2013-12-05 19:09:45 -05:00
Andrew Godwin 0b3c8fc851 Update tutorial part 1 to discuss migrations properly 2013-11-27 16:29:49 +00:00
Loic Bistuer 27f04e79b1 Fixed #21479 -- Favor 'migrate' over 'syncdb' in the docs. 2013-11-21 15:12:39 +01:00
Dražen Lučanin b5eef8535a Recommended setuptools in the reuseable app tutorial.
setuptools has merged with distribute.
2013-11-19 13:57:17 -05:00
Tim Graham 6c5f5b9a41 Fixed typo in tutorial 2; refs #21418. 2013-11-10 06:10:13 -05:00
Tim Graham af2dc4ebb8 Fixed doc typo. 2013-11-09 10:09:25 -05:00
Vajrasky Kok 10a39debb2 Fixed #21378 -- Updated tutorial02 for how to override admin site header. 2013-11-09 07:18:46 -05:00
Phil Elson 2110b31365 Fixed indentation of example in tutuorial 2. 2013-10-22 08:10:56 -04:00
M Nasimul Haque d07d6ae116 Fixed #20910 -- Added a "snippet" sphinx directive to allow prefixing a filename.
Thanks Marc Tamlyn for the suggestion.
2013-10-14 13:00:57 -04:00
Bouke Haarsma 9b7d38ed5a Fixed #21210 -- Documented when runserver doesn't auto-restart.
Thanks gergely at polonkai.eu for the suggestion.
2013-10-14 10:36:18 -04:00
Max Vizard 13ddf0e002 Fixed #21027 -- Updated tutorial 5 docs to link to management shell command page. 2013-10-14 08:07:44 -04:00
Unai Zalakain 3895d8899d Fixed #21213 -- Added docs for Django's mailing lists.
Added docs/internals/mailing-lists.txt documenting the use of django's
mailing lists. All references across docs changed to point to this page.

The referencing makes use of substitution because there's no way to make
a :ref: link in a non-inline fashion in Sphinx. It also makes use of
rst_epilog Sphinx conf for making this substitutions across all the
docs.
2013-10-04 10:00:36 -04:00
Tim Graham b66a51ad54 Fixed #21195 -- Clarifed usage of template_name in tutorial part 4. 2013-10-01 10:08:36 -04:00
Rogério Yokomizo 1b4b710355 Fixed #21141 -- Update Sphinx URL
Updated Sphinx URL from http://sphinx.pocoo.org/ to http://sphinx-doc.org/.
2013-09-22 14:44:09 -03:00
Tim Graham d1c9802811 Fixed #21116 -- Made usage of manage.py in docs more consistent.
Thanks daniel.quattro at gmail.com for the report.
2013-09-18 10:35:41 -04:00
Aymeric Augustin 5abc43cabf Updated examples in the docs after eade315d. 2013-09-17 10:05:45 +02:00
Tim Graham e4aab1bb8d Fixed #21094 -- Updated reuseable apps tutorial to use pip for installation.
Thanks ylb415 at gmail.com for the suggestion.
2013-09-13 09:29:21 -04:00
Tim Graham 0ac7cc3265 Fixed #21083 - Fixed spelling in tutorial.
Thanks jimmy.kjaersgaard at gmail.com for the report.
2013-09-10 09:54:26 -04:00
Kevin Christopher Henry 9d700322b3 Fixed #19885 -- cleaned up the django.test namespace
* override_settings may now be imported from django.test
* removed Approximate from django.test
* updated documentation for things importable from django.test

Thanks akaariai for the suggestion.
2013-09-09 16:03:13 -04:00
Rodolfo d34b94b00f Fixed #20876 -- Changed Poll model name in tutorial to Question 2013-09-07 13:37:09 -04:00
Tim Graham 112799e9a8 Fixed #20983 -- Updated package classifiers in reuseable apps tutorial.
Thanks Cloudream for the report.
2013-08-28 10:54:13 -04:00
Andrew Godwin b6a957f0ba Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
	docs/ref/django-admin.txt
2013-08-19 18:30:48 +01:00
Tim Graham 55339a7669 Fixed #20891 -- Removed part of the tutorial that requires pytz
Thanks AtomicSpark for the report.
2013-08-15 15:24:58 -04:00
Tim Graham 29255fcb4f Fixed some ReST errors regarding backticks 2013-08-15 07:14:10 -04:00
Andrew Godwin de64c4d6e9 Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt
2013-08-09 14:17:30 +01:00
Dominic Rodger c33d1ca1d9 Fixed #20852 - Fixed incorrectly generated left quotes in docs.
Sphinx generates left single quotes for apostrophes after
code markup, when right single quotes are required. The
easiest way to fix this is just by inserting the unicode
character for a right single quote.

Instances of the problem were found by looking for
">&#8216;" in the generated HTML.
2013-08-06 07:13:17 -04:00
Tim Graham b278f7478d Fixed #20858 -- Removed erroneous import in tutorial 2.
Thanks AtomicSpark.
2013-08-04 05:57:11 -04:00
Tim Graham 31ee120787 Fixed #20667 - Removed discussion of DEBUG from tutorial.
Forward-port of 3493f18d78 from master.
2013-08-01 18:07:59 -04:00
Andrew Godwin f8297f6323 More migration docs, and conversion of all easy syncdb references 2013-07-25 16:19:36 +01:00
Tim Graham fd95dc9e27 Fixed #20763 -- Typo in tutorial 3.
Thanks crichard@ for the report.
2013-07-18 07:58:51 -04:00
Tim Graham 2456ffa42c Fixed #20746 -- Removed Python 2.6 specific code/docs 2013-07-14 13:02:55 -04:00
SusanTan ef3fddf26e Fixed #18261 -- Clarified 'project root directory' 2013-07-09 07:11:41 -04:00
Claude Paroz 7442eb1a24 Fixed #20224 -- Update docs examples which mention __unicode__
Thanks Marc Tamlyn and Tim Graham for the review.
2013-07-05 19:27:07 +02:00
Aymeric Augustin a763915a03 Bumped minimum Python version requirement to 2.7 in Django 1.7. 2013-07-01 12:01:59 +02:00
Aymeric Augustin 3fd8eb1a27 Stopped branding Python 3 support as experimental.
Forward-port of 0de21a6 from stable/1.6.x.
2013-07-01 11:52:37 +02:00
Baptiste Mispelon 5caced89e0 Fixed missing slash in reusable apps tutorial. 2013-06-28 09:43:14 +02:00
Tim Graham 6ef199a08e Fixed error in last commit. Thanks Simon Charette. 2013-06-20 10:41:29 -04:00
Harm Geerts df4a74d709 Modified tutorial 3 to use RequestContext in place of Context. 2013-06-20 09:58:01 -04:00
Tim Graham 4e94c84e50 Fixed #19875 - Added warnings regarding DEBUG=False and empty ALLOWED_HOSTS 2013-06-09 15:05:15 -04:00
Tim Graham 9e65bd33db Fixed #20482 - Added a file reference in tutorial 3.
Thanks diek@ for the suggestion.
2013-05-23 08:36:53 -04:00