1
0
mirror of https://github.com/django/django.git synced 2024-12-24 10:05:46 +00:00
Commit Graph

9233 Commits

Author SHA1 Message Date
Alex Gaynor
c0248f6f07 Corrected some syntax issues in the docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 16:08:28 +00:00
Jannis Leidel
8a7a8f465b Removed stale directory not removed by git-svn in r14592.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:46:11 +00:00
Jannis Leidel
17b329ae08 Fixed #10004 and #12320 -- Enabled the makemessages management command to collect comments for translators that start with the "Translators" keyword. Thanks for the report and patches, martinb and Claude Paroz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:37:33 +00:00
Jannis Leidel
d7ad02ff72 Fixed a bunch of code examples in the form media documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:36:58 +00:00
Jannis Leidel
96af304747 Fixed #10636 -- Added check to make sure the ADMIN_MEDIA_PREFIX setting is properly set before serving files with the AdminMediaHandler.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:36:42 +00:00
Jannis Leidel
33d8fcde8a Fixed #14693, #14709 -- Backwards incompatible change to rectify the confusion around the STATICFILES_URL and STATICFILES_ROOT settings.
* Two new global settings that will be used by -- **but are not limited to** -- the staticfiles app: STATIC_ROOT and STATIC_URL.

  * Moving the 'django.contrib.staticfiles.templatetags.staticfiles' template tag to the core ('django.templatetags.static') and renaming it to 'get_static_prefix'.

  * Moving the context processor 'django.contrib.staticfiles.context_processors.staticfiles' to the core ('django.core.context_processors.static') and renaming it to 'static'.

  * Paths in media definitions will use STATIC_URL as the prefix if the value is not None, and falls back to the previously used MEDIA_URL.

Thanks again to the community for constructive criticism and Carl and Russ for sanity-inducing discussions on IRC.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:36:26 +00:00
Russell Keith-Magee
9b45f6cd54 Migrated model_formsets doctests. Thanks to Gregor Müllegger for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 13:30:44 +00:00
Ramiro Morales
5666bca678 Fixed #11369 -- Corrected verbose_name_plural model Meta option to be consistent with verbose_name when using abstract model inheritance. Thanks Beetle_B for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 12:09:21 +00:00
Alex Gaynor
4276b5197b Fixed #12687 -- fixed an issue with aggregates and counts in conjunction with annotations where the QuerySet was provably empty.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14586 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 02:57:14 +00:00
Chris Beaven
3e9d2f81c5 Remove an obsolete admonition in tutorial one (referencing 0.96 functionality)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 02:25:20 +00:00
Alex Gaynor
5b4c6fd5e4 Fixed #14706 -- corrected a stray backtick in the docs. Thanks to Adam for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 01:57:23 +00:00
Adrian Holovaty
5844cdca38 Small grammar fix in 'user-uploaded files' comment from [14560]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 23:48:08 +00:00
Ramiro Morales
f3d0704783 Fixed #14691 -- Made ForeignKey.validate() use the right database. Thanks Marco Paolini for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 22:09:13 +00:00
Chris Beaven
ea145923fc Better cross-referencing of the USE_THOUSAND_SEPARATOR setting in documentation. Thanks to Klaas van Schelven for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 21:33:48 +00:00
Russell Keith-Magee
35dc7d6033 Migrated model_inheritance_regress doctests. Thanks to Gregor Müllegger for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 15:14:04 +00:00
Luke Plant
b84838aef4 Fixed #14576 - FormWizard.done() method doesn't get passed the last form in the list
Thanks to cyberdelia for report and test, and steph for the initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 14:37:00 +00:00
Luke Plant
b9e6db4ae8 Added info about using logging to the 'Error reporting' howto.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 14:00:38 +00:00
Luke Plant
165f13dc88 Corrected 'email' to 'e-mail' in error reporting docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 13:30:31 +00:00
Russell Keith-Magee
8bafde1229 Migrated forms (minus localflavor) doctests. A huge thanks to Daniel Lindsley for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 13:20:56 +00:00
Alex Gaynor
8da8d6c586 Added a test for using an __in lookup with a ValueListQueryset from a none() call. Refs #14622.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 02:33:51 +00:00
Alex Gaynor
e69bc74351 Fixed #14696, corrected some messed up syntax in the docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 02:21:07 +00:00
Luke Plant
f6363bc628 Fixed potential circular import problem.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 23:35:16 +00:00
Ramiro Morales
b6ec268e23 Fiexed #3055 -- Validate that models target of a GenericRelation have a GenericForeignKey field.
Thanks jason for diagnosing the problem and Marcos Moyano for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 23:21:39 +00:00
Luke Plant
0324151bec Fixed #14685 - incompatible code in contrib.sessions.models
Thanks to PaulM for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 22:23:46 +00:00
Ramiro Morales
74f46c0ae2 Fixed #10650 -- Clarified description of MEDIA_ROOT in setting files. Thanks jjconti, tvon, vak, Muhammad Alkarouri and thiggins for their work.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 15:42:54 +00:00
Ramiro Morales
2b344d2628 Fixed #14536 -- Corrected DB connection OPTIONS examples in documentation. Thanks denilsonsa for reporting the error.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 14:15:58 +00:00
Jannis Leidel
ff63a5bdec Fixed #14632 -- Skip a messages test if auth app is not in INSTALLED_APPS. Thanks, gregmuellegger.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:43:13 +00:00
Jannis Leidel
9b7be918ed Fixed #12325 -- Allows zero values for moderate_after and close_after fields of comment moderators. Thanks, Gabriel Hurley.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:42:56 +00:00
Jannis Leidel
109f42a981 Fixed #14670 -- Made GenericTabularInline aware of changes made in r13708. Thanks, gregmuellegger.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:42:31 +00:00
Jannis Leidel
3b29fe353b Added release notes for potential alpha-2.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:42:11 +00:00
Jannis Leidel
e9f3899b20 Refactored runserver command and moved code related to staticfiles to a subclass that is enabled if staticfiles app is installed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:41:55 +00:00
Jannis Leidel
1ed62706e7 Fixed a few typos introduced in r14533.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:41:24 +00:00
Luke Plant
d9ae7c6b37 Corrected default value for ADMIN_MEDIA_PREFIX in docs, and added info about how it integrates with staticfiles.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14551 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 03:55:06 +00:00
Alex Gaynor
102d230f94 Converted m2m_signals from doctests to unittests. Thanks to Gregor Müllegger for the patch. We have always been at war with doctests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 19:39:22 +00:00
Ian Kelly
8a7a44ffa2 Fixed a test case that was failing in Oracle due to conflation of null and empty strings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 19:26:57 +00:00
Ian Kelly
9892f4c5d5 Fixed a multiple_database test case that was failing in Oracle due to forced table name capitalization. The test case now matches the style used by the raw_query tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14545 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 18:48:39 +00:00
Ian Kelly
87a8046f90 Made the oracle backend throw the same ValueError as the mysql backend when a timezone-aware datetime is passed in. This fixes a datatypes test failure.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14544 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 18:39:30 +00:00
Ian Kelly
e0e347c2d3 Fixed a misapplied test skip feature in the oracle backend from r14139.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14543 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 17:51:31 +00:00
James Bennett
bd83177c70 Correct a typo in [14541].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 16:35:40 +00:00
James Bennett
dc0accb5a3 Better description in the release notes of what's going on with the PasswordInput change.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 16:12:38 +00:00
Gabriel Hurley
b951ffbc6b Fixed #14669 -- corrected an ungrammatical sentence in the internationalization docs. Thanks to steveire for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 02:48:26 +00:00
Ian Kelly
ee6bec6c09 Fixed #11101: Rewrote the sequence reset SQL for Oracle to prevent it from performing an implicit commit that caused all fixtures to be automatically committed, causing a large number of test failures.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 01:44:22 +00:00
Alex Gaynor
590bde8835 Changed a test to be less specific about the exception string it expected. Test suite now passes 100% on PyPy.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 23:03:53 +00:00
Jannis Leidel
70edd4e103 Reverted deprecation of media context processor (from r14293) to separate static files and media files a bit more.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 21:44:33 +00:00
Jannis Leidel
63023e6ad9 Added AdminMediaHandler to deprecation docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 21:44:05 +00:00
Jannis Leidel
8e96584f63 Fixed #14524, #14582, #14617, #14665 and #14667 -- Tweaked staticfiles app.
* Updated StaticFilesHandler and AdminMediaHandler
  to make use of the 404 handler if needed.

* Updated runserver management command to serve static files
  only in DEBUG mode (or if specified the --insecure option)
  and if the staticfiles app is in INSTALLED_APPS. Also added
  an option to disable serving completely (--nostatic).

* Added check in debug mode if STATICFILES_* settings are
  different to MEDIA_* settings.

* Removed a faulty PendingDeprecationWarning in AdminMediaHandler
  that is triggered every time runserver is used.

* Fixed an issue with the modification time checks when
  running collectstatic.

* Extended and refined documentation.

Thanks to everyone for input, especially to Carl Meyer, Ted Kaemming and
Adam Vandenberg for patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 21:43:49 +00:00
Jannis Leidel
216fdfab61 Added note about the addition of the django.contrib.staticfiles app. Thanks to Florian Apolloner for reminding me about it and providing a patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 21:43:04 +00:00
Alex Gaynor
76154c7fe5 Removed the executable bit from a test file, it wasn't. Thanks to Florian for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 17:53:25 +00:00
Alex Gaynor
34b5739216 Remove the executable flag from uploadhandler.py, it wasn't. Thanks to Florian for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 17:51:14 +00:00
Luke Plant
02fc6276d7 Fixed #14508 - test suite silences warnings.
Utility functions get_warnings_state and save_warnings_state have been added
to django.test.utils, and methods to django.test.TestCase for convenience.

The implementation is based on the catch_warnings context manager from
Python 2.6.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 15:06:20 +00:00