mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
11,940 Commits 30 Branches 460 Tags
fe43ad5707d116bb1729bc17a24ca16c90ae040d
Commit Graph

4342 Commits

Author SHA1 Message Date
Russell Keith-Magee
8c59905033 Fixed #15241 -- Updated the upgrading notes for generic views to reflect recent changes in class-based views. Thanks to Jonney for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-09 12:59:05 +00:00
Russell Keith-Magee
0d9c5d5a5e Fixed #15245 -- Added note about the CSRF AJAX exception to the 1.2.5 release notes. Thanks to Matt Austin for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-09 12:58:42 +00:00
Alex Gaynor
208630aa4b Fixed a security issue in the CSRF component. Disclosure and new release forthcoming. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-09 02:06:27 +00:00
Gabriel Hurley
66312066a0 Fixed #14861 -- Added an admonition about the potential for circular imports with custom logging handlers (which produces an extremely confusing error message) to the logging docs. Thanks to donspaulding for the report and adamv for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-07 23:56:39 +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
Gabriel Hurley
327d69de73 Fixed #15134 -- Placed formset documentation before modelform documentation in the forms topic index to improve the logical flow of information being presented. Thanks to Aryeh Leib Taurog for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-07 23:39:29 +00:00
Gabriel Hurley
0f50ef12bf Fixed #15055 -- added information about (and an example of) the csrf_token template tag to the forms documentation. Thanks to sneakyness for the report and bpeschier for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-07 22:52:39 +00:00
Gabriel Hurley
1bac26b9a8 Fixed #15236 -- corrected a typo and added a versionadded directive for the user_logged_in and user_logged_out signals. Thanks to claudep for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-07 22:32:16 +00:00
Gabriel Hurley
608877c066 Fixed #15207 -- Added versionadded directives for the "using" argument sent by signals, and cleaned up some incidental indentation/formatting inconsistencies. Thanks to Keryn Knight for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-07 22:18:14 +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
Timo Graham
0737307e8c Fixed #15222 - FileCache -> FileBasedCache typo; thanks Serp. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-06 17:28:01 +00:00
Timo Graham
f77d81de3d Fixed #15208 - Document ModelAdmin.formfield_for_choice_field; thanks julien. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-02 20:57:09 +00:00
Timo Graham
a9ebf9ec24 Fixed #7325 -- Broken links for model documentation; thanks Justin Lilly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-02 20:39:54 +00:00
Timo Graham
3cdd6d898e Fixed #15204 - Update form examples for rendering of the help_text; thanks prestontimmons. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15396 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-02 20:23:13 +00:00
Carl Meyer
76fb2bb0e2 Fixed some documentation and default-settings.py comments that were misleading about the purpose of STATIC_ROOT, and removed an unused import. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-01 14:28:07 +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
2d29c11117 Fixed #15196 -- Bumped version up a bit in Sphinx configuration. Thanks, Eric Holscher. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-30 20:31:39 +00:00
Timo Graham
456534dda9 Fixed #15191 - typo in form validation docs; thanks berto for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-30 19:09:44 +00:00
Jannis Leidel
aaa76ca1b3 Fixed #14978 -- Added versionchanged directive to --adminmedia docs clarifying why it's not working with staticfiles (deprecation of AdminMediaHandler). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15370 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-30 17:23:30 +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
e3d322ede8 Fixed #15177 -- Added note to generic views reference page indicating that the views have been deprecated (mirroring the topic guide). Thanks to rasca for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-30 13:33:53 +00:00
Russell Keith-Magee
14c082646d Fixed #15134 -- Removed a duplicate TOC entry for modelforms docs. Thanks to Aryeh Leib Taurog for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15366 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-30 13:33:27 +00:00
Justin Bronn
34288ec2f2 Fixed example use of deprecated function in GeoDjango tutorial. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15358 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-29 08:10:20 +00:00
Timo Graham
fe0a15b6c9 Fixed #14993 - Improved docs for ModelAdmin.filter_horizontal adding that it's for ManyToManyFields; thanks jammon for the suggestion. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-29 02:01:43 +00:00
Luke Plant
a0585e99bf Added note to 1.2.5 release notes about ModelAdmin.lookup_allowed change 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15352 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-28 15:47:40 +00:00
Russell Keith-Magee
a5cac772b6 Fixed #13662 -- Added an entry in the README to direct people to the instructions for running the test suite, and cleaned up that section of the docs. Thanks to mir for the report, and to cogat and gg for the draft text. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-27 03:14:49 +00:00
Carl Meyer
8151c0431e Copied in-development 1.2.5 release notes to trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-26 08:10:54 +00:00
Carl Meyer
00e7a571c5 Fixed #6456 - Excised FileField file deletion to avoid data loss. Thanks to durdinator for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-26 07:46:19 +00:00
Timo Graham
1b961e8ee3 Fixed #15153 - removed obsolete sentence in tutorial; thanks LeSphinx for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-26 00:58:41 +00:00
Timo Graham
a981f5b988 Fixed #15163 - typo in email docs; thanks metal for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15311 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-26 00:37:08 +00:00
Ramiro Morales
f81d4ba5b3 Fixed #14038 -- Added information to release notes and version changed|added markers to documentation additions for the new template loeaders API introduced in version 1.2. Thanks 3point2 for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-25 15:42:24 +00:00
Luke Plant
42c31f6bf0 Rationalised CompatCookie/SimpleCookie into single SimpleCookie class with all fixes. 
Since upstream Python has fixed the encoding bug (see
http://bugs.python.org/issue9824), we don't want a separate class for this
bug fix, or several layers for the different fixes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-24 20:35:46 +00:00
Russell Keith-Magee
3f528e10d5 Fixed #15012 -- Added post-rendering callbacks to TemplateResponse so that decorators (in particular, the cache decorator) can defer processing until after rendering has occurred. Thanks to Joshua Ginsberg for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-24 14:24:35 +00:00
Timo Graham
4849ebb017 Fixed #15147 - Typo in "Managing static files"; thanks ori for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15284 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-22 23:29:11 +00:00
Timo Graham
578ad9b472 Fixed #15141 - remove some deprecated storage engines from the MySQL notes; thanks mariuz for the suggestion. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-22 16:16:42 +00:00
Timo Graham
a757b5b8ca Fixed #15133 - Some markup issues in the docs; thanks Aryeh Leib Taurog for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-22 12:43:50 +00:00
Alex Gaynor
5fcce5e10f Fixed a typo in the docs, thanks to sunoano for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-21 20:16:38 +00:00
Jannis Leidel
70a2a71c9b Update contributing documentation for changed translation policy. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-21 19:37:16 +00:00
Carl Meyer
93a4d46184 Fixed #14672 - Added admin handling for on_delete=PROTECT. Thanks to jtiai for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-20 00:33:32 +00:00
Carl Meyer
f399f8bd71 Corrected an outdated reference to cmemcache in contributing docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-19 20:37:58 +00:00
Timo Graham
457aaca7fa Fixed #15109 - typo in middleware docs; thanks colinsullivan for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-18 23:25:38 +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
5fd93e1c36 Fixed #13628 - Discourage the use of doctests; thanks d0ugal for the suggestion. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15227 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-16 19:22:36 +00:00
Timo Graham
4d654c92ce Fixed #15030 - ModelAdmin media docs don't mention STATIC_URL. Thanks jezdez for the suggestion, Silva for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-16 13:56:12 +00:00
Russell Keith-Magee
1ca9e95d4e Fixed #15062 -- Documented the fact that managers must be able to be shallow copied. Thanks to Ian Clelland for the report, and Łukasz Rekucki for the help diagnosing the problem. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-16 06:44:23 +00:00
Jannis Leidel
645eb2b26b Stopped staticfiles app from requiring a models module when looking for static files. Also removed a bit of code smell in the prefix handling by saving it in the source file storage. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15219 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-15 23:38:00 +00:00
Timo Graham
6c361ecb17 Fixed #15085 - Fix LOCATION for FileCache example. Thanks abdelazer for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-15 18:52:59 +00:00
Timo Graham
8b4e39bc2e Fixed #15088 - Missing dash in documentation. Thanks Aryeh Leib Taurog for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-15 18:45:49 +00:00