mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-19 07:54:07 +00:00
Code Issues 24 Releases Wiki Activity
9,844 Commits 28 Branches 423 Tags 638 MiB
24e0b56dcb
Commit Graph

112 Commits

Author SHA1 Message Date
Gabriel Hurley
a40685fdfc Fixed #15308 -- Sphinx/reST fixes for the Custom Model Fields docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-16 00:24:49 +00:00
Ramiro Morales
d7c2dcd538 Fixed a couple of documentation typos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-14 15:02:02 +00:00
Jannis Leidel
a26034ffbf Fixes #15270 -- Moved back the serve view to django.views.static due to dependency conflicts with the contrib app staticfiles (reverts parts of r14293). Added a helper function that generates URL patterns for serving static and media files during development. Thanks to Carl for reviewing the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-14 01:42:26 +00:00
Gabriel Hurley
f80e997c50 Fixed #15138 -- Clarified a slightly ambiguous example in the custom template tag docs. Thanks to elbarto for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15448 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-07 23:44:43 +00:00
Ramiro Morales
f6e38f3800 Fixed #5494, #10765, #14924 -- Modified the order in which translations are read when composing the final translation to offer at runtime. 
This is slightly backward-incompatible (could result in changed final translations for literals appearing multiple times in different .po files but with different translations).

Translations are now read in the following order (from lower to higher priority):

For the 'django' gettext domain:

 * Django translations
 * INSTALLED_APPS apps translations (with the ones listed first having higher priority)
 * settings/project path translations (deprecated, see below)
 * LOCALE_PATHS translations (with the ones listed first having higher priority)

For the 'djangojs' gettext domain:

 * Python modules whose names are passed to the javascript_catalog view
 * LOCALE_PATHS translations (with the ones listed first having higher priority, previously they weren't included)

Also, automatic loading of translations from the 'locale' subdir of the settings/project path is now deprecated.

Thanks to vanschelven, vbmendes and an anonymous user for reporting issues, to vanschelven, Claude Paroz and an anonymous contributor for their initial work on fixes and to Jannis  Leidel and Claude for review and discussion.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-07 18:48:40 +00:00
Carl Meyer
0bf5fbfa76 Some tweaks to the staticfiles docs to clarify things for new users. Thanks Jannis and brutasse for review and discussion. 
* Rearranged 'in a nutshell' usage docs to clarify app-dirs vs STATICFILES_DIRS, initially focus on the simplest path to working local dev, and remove the need for repetitive 'you don't need this in local dev' notes.
* Added docs on using staticfiles serve view for non-staticfiles (e.g. user-uploaded files).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-31 22:06:53 +00:00
Jannis Leidel
6361a242af Fixed typo in staticfiles documentation introduced in [15369]. Thanks, harijay. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15375 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-30 23:29:25 +00:00
Jannis Leidel
8fe42053bc Reworded parts of the staticfiles documentation after receiving various user feedback. Thanks, all! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-30 17:23:25 +00:00
Russell Keith-Magee
b31a1b9926 Refs #14661 -- Clarified the handling of initial data injected via custom SQL. 
This is BACKWARDS INCOMPATIBLE CHANGE for anyone relying on SQL-injected initial data in a test case.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-18 16:43:01 +00:00
Timo Graham
1ebd6860b6 Fixed #15080 - Add -v0 to collectstatic fabric example. Thanks hvdklauw. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15229 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-16 21:49:01 +00:00
Timo Graham
60470e8ac2 Fixed #10078 - Document use of locales in management commands. Thanks gregoire for the suggestion and ramiro for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-03 14:27:28 +00:00
Timo Graham
07ef43082d Fixed #15002 - Fix title casing to conform to style guidelines. thanks adamv. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-03 13:29:17 +00:00
Timo Graham
aff5c467c1 Fixed #13912 - Fixed AliasMatch regex in modwsgi docs. Thanks SmileyChris for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-30 13:29:57 +00:00
Timo Graham
ca292f125b Fixed #14277 - Clarify path names in modwsgi docs; thanks neitpiet for the report, elbarto for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-29 13:59:15 +00:00
Timo Graham
2ea93f9327 Fixed #14000 - remove versionadded/changed tags for Django 1.0 and 1.1 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-26 00:37:14 +00:00
Jannis Leidel
b224b05304 Fixed #14910 -- Clarified the order of precedence of loading translation catalogues. Thanks, vanschelven. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-21 14:57:57 +00:00
Russell Keith-Magee
314fabc930 Fixed #14908 -- Added a 'takes_context' argument to simple_tag. Thanks to Julien Phalip for driving the issue and providing the final patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-19 15:00:50 +00:00
Gabriel Hurley
5f63c01b50 Fixed #14777 -- Added docs on working around the Python CSV module's lack of Unicode support. Thanks to adamv for the report and draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-29 06:24:14 +00:00
Russell Keith-Magee
2596cf1652 Clarified a comment in the mod_python docs on the status of the handler. Thanks to mattmcc for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-22 12:29:22 +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
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
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
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
Gabriel Hurley
682f4cf9ed Fixed #12975 -- Moved the docs for contrib.admindocs out of the template docs and into their own reference section, and significantly improved the documentation of what admindocs can do. Thanks to jabapyth for the report, and whiteinge for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14484 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-07 09:21:55 +00:00
Ramiro Morales
4239bb0f35 Documented options accepted by the runfcgi management command. 
Also, modified our custom management command option docs xref parser
to also process those without a ``--`` prefix. --  Refs #14398.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14361 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-27 15:35:07 +00:00
Gabriel Hurley
298f3d300e Fixed #14562 -- corrected a typo in the static-files howto. Thanks to stephaner for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-26 12:32:35 +00:00
Chris Beaven
82dca6d4af Replace an incorrect reference to collectmedia in the docs (the command is collectstatic) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-26 01:16:22 +00:00
Gabriel Hurley
9facaec719 Fixed #10545 -- Mentioned that template context variables are scoped to the block in which they're assigned. Thanks to yaniv.haber for the report and timo for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-25 20:50:53 +00:00
Alex Gaynor
8a8c0ed0f9 Fixed #14551 -- corrected a type in the remote user auth documentation. Thanks to mag for the report and fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14344 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-24 17:29:24 +00:00
Jannis Leidel
c1b3deedaa Fixed #14528 and #14538 -- Refined staticfiles documentation. Thanks, gremmie and romaniuk. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-23 14:32:20 +00:00
Jacob Kaplan-Moss
14b52b95d2 Removes a mistaken note about the static media development helper. 
Turns out that when you write documentation without actually consulting the code
you get things wrong. Who knew?

Thanks to Waldemar Kornewald for catching my mistake.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-20 20:16:36 +00:00
Alex Gaynor
ec80e55cac Fixed #14514 -- fixed a typo in the static files docs, thanks to Andy McKay for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-20 17:57:37 +00:00
Jannis Leidel
cfc19f84de Fixed #12323 and #11582 -- Extended the ability to handle static files. Thanks to all for helping with the original app, the patch, documentation and general support. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-20 01:33:24 +00:00
Gabriel Hurley
3739f89b44 Fixed #7616 -- Added advice on unix socket permissions and umasks to fastcgi deployment documentation. Thanks to Malcolm Tredinnick for the report and advice, and PaulM and cramm for reviewing the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-19 00:58:03 +00:00
Gabriel Hurley
05001056a8 Fixed #12369 -- Improved example to account for environments where cStringIO is not available. Thanks to rubic for the report and niall for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14076 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 10:21:55 +00:00
Russell Keith-Magee
a904e55859 Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 08:12:50 +00:00
Simon Meers
c93f5e5d0e Fixed #5677 -- update modpython stdout documentation. Thanks to Manfred Wassmann for the report, nickefford for the initial patch and Graham Dumpleton for the expert advice. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 05:08:42 +00:00
Russell Keith-Magee
98c6ff3a2b Fixed #14384 -- Updated mod_wsgi docs to match documented best practice. Thanks to monokrome for the report and wogan for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14016 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-08 15:36:48 +00:00
Jannis Leidel
e77f16144b Fixed #14281 -- A few documentation fixes. Thanks, Ramiro and Timo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-01 02:00:52 +00:00
Malcolm Tredinnick
030c97b119 Documented how to manually piece together URLs with get_script_name(). 
Thanks to timo and leovitch for the patch. Fixed #10328.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 19:44:19 +00:00
Russell Keith-Magee
f611ffaab3 Fixed #13820 -- Started the deprecation process for mod_python. Thanks to Robert Coup for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-28 02:40:57 +00:00
Jacob Kaplan-Moss
728effcfbd Fixed #14141: docs now use the :doc: construct for links between documents. 
Thanks, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-19 19:27:44 +00:00
Russell Keith-Magee
5da6aeba17 Fixed #13636 -- Migrated fixtures tests to use unittests, eliminating another set of expensive flush calls. Thanks to Eric Holscher for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-05 05:26:04 +00:00
Karen Tracey
8e7d2d2e68 Fixed #13530: Corrected a handful of doc typos. Thanks Ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-12 22:53:23 +00:00
Russell Keith-Magee
a0cf7f4bb9 Fixed #12135 -- Clarified custom template tag example. Thanks to EvilDMP for the report, and timo for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-10 14:05:16 +00:00
Russell Keith-Magee
9f230c7eeb Fixed #12517 -- Corrected get_prep_lookup example in custom field docs. Thanks to django@pressure.net.nz for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-10 13:17:12 +00:00
Russell Keith-Magee
b832e61308 Fixed #12621 -- Corrected grammar error in custom template tag docs. Thanks to beemzet for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-10 13:16:08 +00:00
Brian Rosner
0618cb24f5 Fixed #9170 -- added improved custom management command documentation. 
Thanks to David Fischer and Eric Holscher for their work on initial patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-08 21:38:00 +00:00
Russell Keith-Magee
07590ff4e8 Fixed #13184 -- Document the requirement that custom model fields using SubfieldBase should probably implement formfield. Thanks to Mark L. for the report, and to Joseph and Honza for the guidance on the solution. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 14:34:40 +00:00