Commit Graph

2574 Commits

Author SHA1 Message Date
Karen Tracey b5ffd10547 [1.1.X] Apply doc addition that somehow was left out of r11834. Refs #7977.
r11841 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-13 15:19:21 +00:00
Brian Rosner 17350faeae [1.1.X] Adjusted URL to #django IRC logs
Backport of r11817 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 07:15:25 +00:00
Russell Keith-Magee b24bb68649 [1.1.X] Cleaned up the release notes index page, and added some stub 1.1.2 and 1.2 release notes.
Backport of r11760 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-23 13:52:59 +00:00
James Tauber 2ea5e4c743 [1.1.X] Added myself to committers list
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-19 21:56:22 +00:00
Russell Keith-Magee 55b6f3cf21 Corrected an inconsistency in the documentation regarding the way to specify the locmem and dummy cache backend. Thanks to Jens Diemer for the report.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-19 11:20:06 +00:00
Brian Rosner 4cba436269 [1.1.X] Fixed #5034 -- honor request.urlconf in reverse and resolve.
This enables {% url %} to honor request.urlconf set from process_request
middleware methods.

Thanks SmileyChris for the initial patch work.

Backport of [11740] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-16 01:59:54 +00:00
Russell Keith-Magee 7f2f6bc863 [1.1.X] Fixed #12204 -- Corrected the use of :djadmin: links in the testing docs, plus updated a lot of old-style markup in the django-admin docs. Thanks to Art_S for the report.
Backport of r11734 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-12 13:59:35 +00:00
Brian Rosner a429943467 [1.1.X] Fixed #12115 -- Corrected typo in admin documentation. Thanks encinas.
Backport of [11686] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-30 08:49:56 +00:00
Jannis Leidel b1151bc2b3 [1.1.X] Added bio for myself
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-28 10:01:38 +00:00
Luke Plant ebe5405282 Added a no-op {% csrf_token %} tag to 1.1.X, to ease transition of apps to 1.2
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 21:50:58 +00:00
Luke Plant 97ee7a3baf [1.1.X] Fixed #10996 - documented login CSRF vulnerabilities in the CsrfMiddleware
1.1.X branch only fix - trunk is completely different now.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 00:38:28 +00:00
Karen Tracey d2b6f6c948 [1.1.X] Fixed #11961: Corrected a few typos in docs/testing.txt. Thanks to timo for the patch.
Merge of r11599 from trunk.
Also updated svnmerge-integrated to reflect other changesets already backported,
and added a couple more that should not be merged to svnmerge-blocked.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26 15:31:47 +00:00
Luke Plant 0ed09c8a73 [1.1.X] Fixed small error in deprecation policy.
Backport of r11652


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-24 14:12:46 +00:00
Luke Plant 1f0266bd18 [1.1.X] Fixed #9163 - CsrfMiddleware needs to reset ETag header
Thanks to carljm for report and patch.

Backport of r11650 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-24 11:27:59 +00:00
Russell Keith-Magee ec9b6f2616 [1.1.X] Fixed #11959 -- Updated the tutorial to ensure that the admin site continues to work after URLpatterns are introduced. Thanks to carljm for the report and draft patch.
Backport of r11621 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-14 13:41:37 +00:00
Luke Plant c557ea6c12 [1.1.X] Fixed #9674 - documented app_label.
Thanks to andymckay for the report and jpaulett for the patch.

Backport for [11596] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-28 22:04:20 +00:00
James Bennett f8c97127bb [1.1.X] Fixed #11931: Removed mention of nonexistent get_sql() method for arguments to limit_choices_to. Since the correct reference involves undocumented ORM internals, this simply removes the reference entirely in favor of publicly-documented use of Q objects. Backport of [11591] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-23 23:41:35 +00:00
James Bennett 880a447497 [1.1.X] The 1.1.X branch has been created, so that needs to be past tense. Backport of [11588] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-22 21:21:45 +00:00
Russell Keith-Magee a7dd69c079 [1.1.X] Fixed some ReST markup in admin installation docs.
Merge of r11580 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-16 12:19:44 +00:00
Russell Keith-Magee 5074a43241 [1.1.X] Fixed counting error in admin installation overview docs.
Merge of r11579 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-16 12:16:27 +00:00
Russell Keith-Magee d30dd3e9c9 [1.1.X] Fixed #11755 -- Added documentation for an edge case of FormSet usage. Thanks to ffualo for the suggestion.
Merge of r11549 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:35 +00:00
Russell Keith-Magee 2075da3525 [1.1.X] Fixed #11740 -- Added extra detail on the behavior of ModelForms. Thanks to severian for the suggestion.
Merge of r11548 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:18 +00:00
Russell Keith-Magee 05c087300c [1.1.X] Fixed #9414 -- Clarified the documentation on the permission decorators. Thanks to timo for the patch.
Merge of r11547 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:09 +00:00
Russell Keith-Magee ceee67fba8 [1.1.X] Fixed #11873 -- Corrected typo in generic views docs. Thanks to Brett Cannon for the report.
Merge of r11546 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:02 +00:00
Russell Keith-Magee e9d1a7e98a [1.1.X] Fixed #11073 -- Added documentation for SESSION_COOKIE_PATH. Thanks to liling for the report, and gsong for the patch.
Merge of r11545 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11567 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:53 +00:00
Russell Keith-Magee b5ee4ad4ba [1.1.X] Fixed #10864 -- Clarified the role played by redirect_to_field in the login_required auth decorator. Thanks to trigeek38 for the suggestion, and SmileyChris for the draft.
Merge of r11544 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:42 +00:00
Russell Keith-Magee 5312e7b40a [1.1.X] Fixed #9236 -- Added documentation on the dependencies of the admin.
Merge of r11543 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:31 +00:00
Russell Keith-Magee 91bbfc57df [1.1.X] Added the SVN internal docs to the internal docs index.
Merge of r11542 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:19 +00:00
Russell Keith-Magee 4d84513795 [1.1.X] Fixed #6047 -- Minor correction to the documentation regarding regex field lookups. Thanks to Richard D. Worth for the suggestion, and Steve Holden for the text.
Merge of r11541 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:09 +00:00
Russell Keith-Magee bea1678a10 [1.1.X] Fixed #11359 -- Added a link to the signals topic guide in the signals reference. Thanks to tyson for the suggestion.
Merge of r11540 and r11554 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:00 +00:00
Russell Keith-Magee 6988dad101 [1.1.X] Fixed #11592 -- Corrected the grammar in the queryset docs. Thanks to Shannon Bradshaw for the report.
Merge of r11539 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11561 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:31:50 +00:00
Russell Keith-Magee d57f98b8e8 [1.1.X] Fixed #11628 -- Corrected the tutorial, removing instructions to update the year where that isn't required. Thanks to tommstein for the report.
Merge of r11538 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:31:40 +00:00
Russell Keith-Magee 9815484905 [1.1.X] Fixed #11659 -- Corrected a minor typo in the v1.1 release notes. Thanks to agabel for the report.
Merge of r11537 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:31:26 +00:00
Russell Keith-Magee 753d79a479 [1.1.X] Fixed #11728 -- Corrected a typo in a class name in the request/response docs. Thanks to Tommstein for the report.
Merge of r11536 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:31:17 +00:00
Russell Keith-Magee 9908d7649f [1.1.X] Fixed #11780 -- Corrected a typo in the static file serving docs.
Merge of r11535 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:31:04 +00:00
Russell Keith-Magee 1fde940414 [1.1.X] Fixed #11808 -- Corrected typo in admin docs. Thanks to kratorius for the patch.
Merge of r11534 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:30:50 +00:00
Russell Keith-Magee 0fc36e4f91 [1.1.X] Fixed #11831 -- Corrected typo in comments docs. Thanks to gsf for the patch.
Merge of r11533 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:30:36 +00:00
Russell Keith-Magee 10e3c9f1e0 [1.1.X] Fixed #11589 -- Corrected an argument in the shortcuts documentation. Thanks to tsaylor for the report.
Merge of r11531 and r11532 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 04:54:48 +00:00
James Bennett 69aed8db4b [1.1.X] Document the fact that we now put dead branches in the attic. Backport of r11523 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-11 22:00:24 +00:00
Luke Plant 8da58e51ff Fixed #11554: Several errors in Generic Views Documentation.
Thanks Ramiro. 
Refs #11477 - that ticket should have been marked a duplicate of #11554



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-11 13:46:56 +00:00
Luke Plant 49b9470dca Fixed #11071 - update is_ajax() docs.
Thanks timo.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@11490 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-10 16:17:56 +00:00
Luke Plant 1387b17026 Fixed #7437: SelectDateWidget is not documented.
Thanks timo.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@11488 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-10 15:45:15 +00:00
Luke Plant 404a82e156 Fixed #7376: auth docs don't say they depend on contenttypes.
Thanks arien


git-svn-id: http://code.djangoproject.com/svn/django/trunk@11487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-10 15:41:00 +00:00
Luke Plant de5e768557 Fixed #11477: Generic views docs point out bug with wrong queryset
Thanks SmileyChris



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11484 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-10 15:21:16 +00:00
Karen Tracey bb9cc01b13 Fixed #6674: Documented a couple of widget arguments. Thanks timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-29 12:40:47 +00:00
Ian Kelly dcf3be7a62 Fixed #10566: Added support for cx_Oracle compiled with the WITH_UNICODE flag.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-24 15:45:48 +00:00
James Bennett 150ef1adee Correct a typo and a reST formatting problem in [11466].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-17 10:51:35 +00:00
James Bennett 5eda3a16df Add new documentation covering the layout of the Django SVN repository.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-17 10:23:43 +00:00
Karen Tracey b82ad10f9d Fixed #11508: Adding missing word to form wizard doc. Thanks thepointer and timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-13 16:59:59 +00:00
Karen Tracey c8517025af Fixed #11573: Updated Nginx url. Thanks bryanveloso.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-13 16:53:19 +00:00