mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 11:06:07 +00:00
Code Issues 27 Releases Wiki Activity
9,841 Commits 28 Branches 426 Tags 667 MiB
a40685fdfc
Commit Graph

277 Commits

Author SHA1 Message Date
Gabriel Hurley
9323f81dc0 Fixed #14820 -- Added more information to the generic relation docs regarding different choices for storing PK references for a GenericForeignKey. Thanks to mrmachine for the all the work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15545 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-16 00:18:09 +00:00
Gabriel Hurley
e9d99c4371 Fixed #15309 -- reST/Sphinx cleanup on the ContentTypes Framework docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15544 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-16 00:12:52 +00:00
Timo Graham
6eacbfd411 Fixed "the the" typos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-14 23:18:30 +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
Justin Bronn
c7618d5fa6 Updated GeoDjango installation docs and spatial database template script for latest Ubuntu/Debian packages. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-13 01:50:54 +00:00
Luke Plant
d068a04244 Fixed #15284 - improved example jQuery code for adding X-CSRF-Token 
Using the ajaxSend event is better than beforeSend, because the beforeSend
callback can have only one value, which makes it painful if it is needed by
multiple bits of javascript.

Thanks to LukeMaurer for report and initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15515 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-12 23:37:35 +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
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
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
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
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
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
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
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
Russell Keith-Magee
2d352444b0 Fixed #14176 -- Added forwards compatibility to the legacy syndication feed view. This allows class-based feeds to be deployed using the old-style feed view, as long as the feed requires no arguments (i.e., get_object returns None). Thanks to psychcf for the report, cwhaines for the investigation, and Andrew Godwin for the assist. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-13 14:51:34 +00:00
Timo Graham
30c8a5574a Fixed #15003 - assorted edits to admin docs; thanks adamv. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-08 21:15:00 +00:00
Ramiro Morales
70c8cd4100 Fixed #13307 -- Enhanced the generic inlines documentation by mentioning the concrete Generic{Tabular,Stacked}Inline classes that should be used. Thanks loki77 for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-31 23:02:07 +00:00
Timo Graham
7902a89ced Fixed #12469 - Add a few clarifications to the ModelAdmin.get_urls() docs. Thanks benc for the suggestions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-29 21:50:40 +00:00
Timo Graham
75e841d534 Fixed #13837 - Add geodjango packages for Ubuntu 10.04; thanks muanis and zerok for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-28 00:12:49 +00:00
Timo Graham
ddfe700563 Fixed #12642 - Add docs for has_[add|change|delete]_permission ModelAdmin methods. Thanks to MadeR for the report and for the wiki contributors from which I took language for this patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15066 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-27 13:41:19 +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
Timo Graham
c4b8366884 Fixed #14956 - typo in messages docs. thanks alexarsh for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15049 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-25 20:26:32 +00:00
James Bennett
5ed6e7a4d5 Refactor the choices for localflavor's USStateField, and add new US postal code support. Fixes #14937 and #9022, refs #10308 and #8425. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-23 02:56:31 +00:00
Justin Bronn
5fddfda559 Fixed #13788 -- GEOSGeometry.transform no longer silently no-ops when GDAL isn't available. Thanks, Rob Coup. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15025 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-22 17:43:30 +00:00
Russell Keith-Magee
3550456535 Added some reST markup to avoid a warning during docs compilation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-22 15:54:31 +00:00
Justin Bronn
b6ab88c34a Fixed #14439 -- Improved documentation for running the GeoDjango test suite. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-22 00:21:35 +00:00
Jannis Leidel
af5ad1116c Rectified bugs that were accidentally committed in r14997. Thanks for the heads-up, Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15011 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-21 19:19:04 +00:00
Jannis Leidel
98e1a71ceb Fixed #14900 -- Added ability to override the paginator class used in a ModelAdmin. Thanks, Adam Vandenberg. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14997 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-21 14:57:29 +00:00
Jannis Leidel
8dfd3dfd49 Fixed #14805 -- Capitalize "Google" in sitemaps docs. Thanks, Adam. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:56:52 +00:00
Jannis Leidel
d0257a1558 Fixed #14041 -- Added ability to override the template of the sitemaps views. Thanks, julien. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:56:29 +00:00
Jannis Leidel
b3520da9ac Fixed #13862 -- Added an ordering option to InlineModelAdmin and cleaned up documentation for it a bit. Thanks, Simon Meers, rasca and cogat. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:56:01 +00:00
Jannis Leidel
2c2209b473 Fixed #13607 -- Auto-initialize admin's date hierarchy links intelligently. Thanks, Simon Meers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:54:50 +00:00
Timo Graham
82f2daaf45 Fixed #11470 - add documentation for ModelAdmin.message_user. thanks adamv. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14868 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-11 13:51:14 +00:00
Simon Meers
06850baefa Fixed syntax error in ref/contrib/localflavor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-06 00:01:52 +00:00
Gabriel Hurley
01f2081bb6 Fixed #14835 -- Corrected a lack of indentation in the reST markup for docs/ref/contrib/admin/index.txt and reflowed the text accordingly. Thanks to cogat for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-05 04:52:31 +00:00
Simon Meers
5a7af25c7a Fixed #12812 -- added warning about cyclic imports in contrib.comments. Thanks to Beetle_B, bjourne and philgyford for the reports, and Russ for the wording. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14810 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-04 11:35:22 +00:00
Russell Keith-Magee
ae7213b593 Fixed #14563 -- Added Turkish localflavor. Thanks to serkank for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-04 05:25:24 +00:00
Jannis Leidel
cc64fb5c4b Fixed #8342 -- Removed code from the admin that assumed that you can't login with an email address (nixed by r12634). Also refactored login code slightly to be DRY by using more of auth app's forms and views. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-02 00:44:35 +00:00
Gabriel Hurley
a0b3306349 Fixed #14804 -- Metadata improvement, broken link fix, and alphabetization of template filters in contrib.humanize reference docs. Thanks to adamv for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-29 05:30:11 +00:00
Honza Král
d9eb31a98f Fixed #14793 -- staticfiles documentation example overwrites urlpatterns. Thanks gg! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-27 18:36:41 +00:00
Honza Král
dc334a2ba8 Fixed #3400 -- Support for lookup separator with list_filter admin option. Thanks to DrMeers and vitek_pliska for the patch! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-21 19:29:15 +00:00
Alex Gaynor
274aba3b9b Fixed #11108 -- added ModelAdmin.delete_model, a hook with which to perform custom pre-post delete behavior. Thanks to Florian Apolloner for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-21 19:00:40 +00:00
Gabriel Hurley
58b6c65fa9 Replaced an inappropriate UTF8 character in the admindocs docs. Thanks to Luke Plant for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-20 11:10:48 +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
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
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
Carl Meyer
616b30227d Fixed #7539, #13067 -- Added on_delete argument to ForeignKey to control cascade behavior. Also refactored deletion for efficiency and code clarity. Many thanks to Johannes Dollinger and Michael Glassford for extensive work on the patch, and to Alex Gaynor, Russell Keith-Magee, and Jacob Kaplan-Moss for review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-09 16:46:42 +00:00