mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-25 10:35:48 +00:00
Code Issues 25 Releases Wiki Activity
10,950 Commits 28 Branches 426 Tags 667 MiB
0d9b6a5bc4
Commit Graph

152 Commits

Author SHA1 Message Date
Julien Phalip
aaf8a31e5d Brushed up the custom template tag 'howto' guide by moving the assignment_tag doc to a more appropriate place (i.e. under the "Setting a variable in the context" section), adding cross references, fixing a few minor inaccuracies and doing a little PEP8 cleanup. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-27 13:56:10 +00:00
Julien Phalip
8137027fd7 Fixed #13956 -- Enabled *args and **kwargs support for simple_tag, inclusion_tag and assignment_tag. Many thanks to Stephen Burrows for the report and initial patch, to Gregor Müllegger for the initial tests, to SamBull for the suggestions, and to Jannis Leidel for the review and PEP8 cleanup. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-27 12:15:15 +00:00
Carl Meyer
00678334aa Fixed #16863 -- Corrected ReST markup to avoid errors building docs. 
Although directives such as "note" and "warning" will accept content
immediately following the directive, this is technically where arguments to the
directive should go (see http://sphinx.pocoo.org/rest.html#directives). Putting
the content there means that any lines beginning with an inline text role
(e.g. ":setting:`DEBUG`") will be mis-interpreted as an option block for the
directive. To avoid this error, there should always be a blank line between the
directive start and the directive content.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 18:06:42 +00:00
Julien Phalip
88fc8657f4 Fixed #16276 -- Noted in the deployment documentation index that the Django Book 2nd ed. was written against Django 1.1. Thanks to bshaurette and bluejeansummer for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 01:12:11 +00:00
Alex Gaynor
5fbf5fd3dd Fixed #16793. Added more cross referencing to the load tag's documentation. Thanks to bluejeansummer for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 02:52:37 +00:00
Ramiro Morales
932b1b8d6d Converted links to external topics so they use intersphinx extension markup. 
This allows to make these links more resilent to changes in the target URLs.
Thanks Jannis for the report and Aymeric Augustin for the patch.

Fixes #16586.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-04 21:17:30 +00:00
Jannis Leidel
1d32bdd3c9 Fixed #15252 -- Added static template tag and CachedStaticFilesStorage to staticfiles contrib app. 
Many thanks to Florian Apolloner and Jacob Kaplan-Moss for reviewing and eagle eyeing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-11 14:07:39 +00:00
Jannis Leidel
d138906ad9 Fixed #15974 -- Correctly link to static files handling in deployment docs. Thanks, RogueBean. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16491 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-01 15:18:42 +00:00
Jannis Leidel
286e45e9ea Fixed #15077 -- Clarified FastCGI documentation with regard to shared hosting providers. Thanks, Horst Gutmann. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16489 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-01 15:18:27 +00:00
Jannis Leidel
38a2444277 Fixed #16050 -- BACKWARDS-INCOMPATIBLE CHANGE: Moved static files of the admin to conventional file system location. 
This also removes the need for ADMIN_MEDIA_PREFIX and replaces it with the convention to find admin's static files at STATIC_URL + 'admin/'.

Thanks to Jacob for the review and general help.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-30 09:06:19 +00:00
Jannis Leidel
89277c7f6e Fixed another typo in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-18 11:58:50 +00:00
Jannis Leidel
aad6f21b29 Fixed #16057 -- Extended deployment documentation with instructions for uWSGI. Thanks, jpic and aaugustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-16 16:34:12 +00:00
Jannis Leidel
e008fde23e Fixed #16273 -- Fixed typo in staticfiles docs. Thanks, BernhardEssl. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-16 15:27:11 +00:00
Jannis Leidel
0ebaf10258 Fixed #11989 -- Allow passing a Template instance to inclusion_tag. Thanks to Jeremy Dunck and tcoenen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-11 16:22:45 +00:00
Jannis Leidel
d27f909d2e Fixed #12847 -- Added name parameter to simple_tag, assignment_tag and inclusion_tag helpers. Thanks, vladmos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-11 16:05:28 +00:00
Luke Plant
45e55b9143 Fixed #14614 - filtering of sensitive information in 500 error reports. 
This adds a flexible mechanism for filtering what request/traceback
information is shown in 500 error emails and logs. It also applies
screening to some views known to be sensitive e.g. views that handle
passwords.

Thanks to oaylanc for the report and many thanks to Julien Phalip for the
patch and the rest of the work on this.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-08 22:18:46 +00:00
Jannis Leidel
49f57a5d28 Fixed #15992 -- Added more references to settings. Thanks, aaugustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-29 17:41:04 +00:00
Jannis Leidel
407f62fd31 Fixed #15796 -- Restructured the contributing documentation and added note about newly added Trac abilities. Many thanks to Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16284 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-27 10:49:47 +00:00
Adrian Holovaty
d7036e52ab Made some small tweaks/fixes to documentation from IGNORABLE_404_URLS changeset [16160] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-24 18:39:28 +00:00
Chris Beaven
803a454aef Fixes #15732 -- better introduction of template filter decorator concepts (first register, then stringfilter). Thanks for the patch, hahasee. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16251 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-20 02:42:28 +00:00
Jannis Leidel
091c9b530e Fixed #15983 and #16032 -- Another pass over the staticfiles docs. Many thanks to Frank Wiles and EvilDMP. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16235 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-18 09:51:24 +00:00
Simon Meers
5ecb88c146 Fixed #16014 -- numerous documentation typos -- thanks psmith. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-13 04:33:42 +00:00
Simon Meers
8122ce7c76 Fixed #15989 -- typo in static-files howto. Thanks luizvital. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-09 22:30:31 +00:00
Jannis Leidel
e282e1b327 Added missing reference to custom template tag docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-07 16:58:52 +00:00
Luke Plant
171df93170 Fixed #15954 - New IGNORABLE_404_URLS setting that allows more powerful filtering of 404s to ignore 
Thanks to aaugustin for implementing this.

(Technically this doesn't fix the original report, as we've decided against
having *any* default values, but the new feature makes it possible, and the
docs have an example addressing #15954).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-05 20:49:26 +00:00
Jannis Leidel
950e05c3ff Fixed #14262 -- Added new assignment_tag as a simple way to assign the result of a template tag to a context variable. Thanks, Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-03 11:52:42 +00:00
Ramiro Morales
1d7c2dedcd Fixed small typos in custom template tags docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16126 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-30 02:19:24 +00:00
Adrian Holovaty
f8495d2371 Fixed #15822 -- Removed references to the v1 postgresql backend (which has been removed). Thanks for the patch, aaugustin 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-17 20:45:06 +00:00
Adrian Holovaty
9a279edc1c Fixed some ReST errors from e-mail -> email change in docs, and changed some docs that shouldn't have been changed (because translation strings haven't been converted yet) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-01 16:18:23 +00:00
Adrian Holovaty
94af19c43f Changed e-mail to email throughout documentation and codebase. The one exception is translation strings, which I didn't want to disrupt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-01 16:10:22 +00:00
Jannis Leidel
6a5548cf83 Corrected another part of the staticfiles docs which was missed in r15913. Refs #15681. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-24 17:58:13 +00:00
Jannis Leidel
8ddf5ba66f Fixed #15681 -- Fixed a documentation error regarding the default value of the STATIC_URL setting. Thanks, Chris Drackett. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-24 17:52:32 +00:00
Ramiro Morales
a2c19f7984 Tweaked title level in custom file storage systems documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-21 15:39:26 +00:00
Ramiro Morales
413ceb57b2 Changed 'raise' statements to new style syntax in documentation. Thanks DaNmarner. Refs #15635. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-17 20:49:31 +00:00
Jannis Leidel
ad4118be44 Fixed #15598 -- Updated static URL helper to be no-op on non-local prefixes. Thanks, traff. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-15 20:13:21 +00:00
Russell Keith-Magee
c5a6badbfc Converted the new contributions docs to unix line endings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-27 23:31:46 +00:00
Gabriel Hurley
2b7b468325 Fixed #14702 -- Added a "needsinfo" resolution to Trac, and added supporting documentation on the new resolution and closing tickets in general. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-27 22:13:07 +00:00
Simon Meers
2dfbe92d7c Fix typo in staticfiles docs (not ticketed). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-27 11:54:03 +00:00
Gabriel Hurley
c250b8840b Fixed #14401 -- Added a contributing howto guide for new users. Thank you to everyone who added their advice, feedback, and wisdom to the wiki article while constructing this new guide. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-25 02:45:48 +00:00
Gabriel Hurley
5edb61438e Fixed #15310 -- Corrected a view path in the static files how to docs. Thanks to Bradley Ayers for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-17 02:11:44 +00:00
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