p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,786 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

13786 Commits

Author SHA1 Message Date
Tim Graham 8ab5db7a33 [1.5.x] Fixed #20248 - Clarified manage.py vs. django-admin.py 
Backport of 8fc68af9c0 from master
 2013-04-12 06:11:22 -04:00
Baptiste Mispelon 9c49e64b66 [1.5.x] Fixed #20211: Document backwards-incompatible change in BoundField.label_tag 
Also cleaned up label escaping and consolidated the test suite regarding
label_tag.
Backport of ab686022f from master.
 2013-04-12 10:25:44 +02:00
Claude Paroz 991432ee8a [1.5.x] Documented BoundField.label_tag 
Backport of 0f99246b6 from master.
 2013-04-12 10:18:24 +02:00
Tim Graham 709ee83cd3 [1.5.x] Fixed #20243 - Clarified when RelatedManager.remove() exists. 
Backport of 712a792713 from master
 2013-04-11 14:17:19 -04:00
Andrew Badr 93231851f8 [1.5.x] Removed incorrect phrase from DecimalField docs 
Backport of 408da7b457 from master
 2013-04-11 13:39:29 -04:00
Claude Paroz 427b59495e [1.5.x] Fixed #20237 -- Reenabled assertContains with binary parameter 
Thanks Baptiste Mispelon for the review.
Backport of fe01404bb9 from master.
 2013-04-11 10:58:06 +02:00
Tim Graham 82b5e10e61 [1.5.x] Fixed #20204 - Consistent usage of url() in URL dispatcher documentation 
Thanks Baptiste Mispelon for the patch and dave.lampton@ for the suggestion.

Backport of c852d45681 from master.
 2013-04-10 20:41:03 -04:00
Simon Charette d04e8f8c78 [1.5.x] Fixed #20207 -- Handle ManyToManyField with a unicode name correctly. 
Backport of 216580e034.
 2013-04-05 15:21:59 -04:00
Julien Phalip a15a3e9148 [1.5.x] Fixed #20169 -- Ensured that the WSGI request's path is correctly based on the `SCRIPT_NAME` environment parameter or the `FORCE_SCRIPT_NAME` setting, regardless of whether or not those have a trailing slash. Thanks to bmispelon for the review. 
Backport of 2f81a0ca65
 2013-04-01 12:07:58 -07:00
Tim Graham 405d6208e5 [1.5.x] Fixed #8649 - Documented a caveat about dynamically adjusting formsets. 
Backport of 4a1d425cfe from master
 2013-03-31 04:35:48 -04:00
Tim Graham 930cd8eebb [1.5.x] Fixed #9913 - Clarified User.is_authenticated docs. 
Thanks rshea for the draft text.

Backport of ac4d82b94a from master
 2013-03-31 04:01:05 -04:00
Tim Graham a825b1903d [1.5.x] Fixed #20168 - Generalized a PostgreSQL specific database query in the docs. 
Thanks Russ for the suggestion.

Backport of c119d0f152 from master
 2013-03-31 03:41:44 -04:00
Tim Graham 999817375b [1.5.X] Fixed #19492 - Added a link to the uWSGI/Django tutorial. 
Backport of 91d06ea719 from master
 2013-03-30 16:22:43 -04:00
Tim Graham ed3dd2759e [1.5.X] Fixed #18277 - Clarified startproject documentation. 
Backport of 33503600b5 from master
 2013-03-30 08:38:28 -04:00
Richard Cornish 29c77c5ed2 [1.5.X] Updated bios of committers 
Backport of 6e67d764ae from master
 2013-03-30 07:49:21 -04:00
Tim Graham c3779d4214 [1.5.x] Fixed #19897 - Updated static files howto. 
Thanks Jan Murre, Reinout van Rees and Wim Feijen,
plus Remco Wendt for reviewing.

Backport of i6c730da1f from master.
 2013-03-30 07:12:37 -04:00
Tim Graham 1c42a3ec73 [1.5.X] Fixed #19582 - Added a static files tutorial. 
Thanks James Pic.

Backport of c32fc79aa1 from master
 2013-03-30 07:03:33 -04:00
Tim Graham abaab6ef48 [1.5.x] Fixed #15379 - Added "how to cite Django" to FAQ. 
Thanks Russ and Susan Tan.

Backport of 9916e69bf1 from master
 2013-03-29 16:50:33 -04:00
Nimesh Ghelani 1d620fb957 [1.5.x] Fixed #20150 -- Fixed an error in manager doc example 
Backport of 485c024567 from master
 2013-03-29 15:55:23 -04:00
Maik Hoepfel 28cb46befb [1.5.x] Removed ambiguity regarding LANGUAGES setting 
Backport of a05042fd3a from master
 2013-03-29 08:01:38 -04:00
Gavin Wahl d1b7bd030b [1.5.x] Fixed spelling errors 
Backport of ec04fd1344 from master
 2013-03-29 08:00:24 -04:00
Tim Graham 149150deb1 [1.5.x] Improved FormView docs in class-based views index. 
Thanks Stefan Berder.

Backport of 738eef0f8b from master
 2013-03-29 07:59:50 -04:00
ferhat elmas 56d4356d8c [1.5.x] Fixed #20146 -- Updated removed_tags example 
Backport of e5d252f5b9 from master.
 2013-03-28 22:45:30 +01:00
Jacob Kaplan-Moss 1cf4968cc5 Bumped version number post-release. 2013-03-28 16:07:32 -05:00
Jacob Kaplan-Moss 2847ae6665 Bump version numbers for 1.5.1. 2013-03-28 15:12:39 -05:00
Jacob Kaplan-Moss d7eaadb4f8 [1.5.x] Added 1.5.1 release notes. 
Backport of ae5247cb from master.
 2013-03-28 15:07:43 -05:00
Claude Paroz ebac592a83 Updated translations from Transifex 
Polish, Telugu, Georgian, Azerbaijani, Norwegian Bokmål, Basque,
Dutch, Thai, Spanish (Argentina), Afrikaans.
 2013-03-28 09:22:57 +01:00
Jacob Kaplan-Moss bec250211b [1.5.x] Correctly restore warning capture after logging tests. 
This is a fix to the wrong behavior that 15c3906eeb introduced.

Backport of 4befef9 from trunk.
 2013-03-27 17:03:12 -05:00
Jacob Kaplan-Moss 9a41045b77 [1.5.x] Fixed logging-related test failure introduced by e79b857. 
Backport of 654d8e9.
 2013-03-27 12:21:26 -05:00
Jacob Kaplan-Moss 87f4860718 [1.5.x] Fixed #20078: don't allow filtering on password in the user admin. 
Backport of 9e462f8101 from master.
 2013-03-27 11:52:40 -05:00
Preston Holmes 572a300e56 [1.5.x] Fixed #18985 -- ensure module level deprecations are displayed 
Also don't compete with -W CLI option.

Thanks to Aymeric Augustin for the catch, and Claude Paroz for the patch.

Backport of e79b857a07 from master.
 2013-03-27 10:37:47 -05:00
Donald Stufft 456d6c15db Merge pull request #961 from dstufft/document-bcrypt-truncation-1.5.x 
Document password truncation with BCryptPasswordHasher
 2013-03-26 10:32:08 -07:00
Donald Stufft 33c4abb71a Document password truncation with BCryptPasswordHasher 2013-03-26 13:29:53 -04:00
Anssi Kääriäinen 207117ae73 [1.5.x] Fixed #20091 -- Oracle null promotion for empty strings 
Backpatch of e17fa9e877
 2013-03-26 15:05:37 +02:00
Yohan Boniface 5e2bb1223c [1.5.X] Fixed signature of HttpResponse.set_signed_cookie in docs. 
Backport of c5b2414a52 from master
 2013-03-24 13:55:45 -04:00
Claude Paroz 8772f9b4a6 [1.5.x] Fixed #20119 -- Fixed typo in auth docs 
Thanks vinyll for the report.
Backport of f670cce9f5 from master.
 2013-03-23 20:01:44 +01:00
Russell Keith-Magee d35e621633 [1.5.x] Fixed #20048, #20060 -- Modified tests for contrib apps sensitive to custom User models. 
Thanks to matiasb for the report of #20060 and the draft patch for #20048.

(cherry picked from commit 930af661ab)
 2013-03-23 10:02:10 +08:00
Tim Graham f7ca464039 [1.5.x] Added missing markup to docs. 
Backport of 93cffc3b37 from master.
 2013-03-22 14:08:55 -04:00
Tom V 1363b41823 [1.5.x] Fixed docs template name typo 
Backport of a907fa088e from master
 2013-03-22 13:51:55 -04:00
Claude Paroz deec020bf5 [1.5.x] Fixed #20108 -- Fixed filepath_to_uri decoding error 
This was a regression due to unicode_literals usage. Thanks Ivan
Virabyan for the report and the initial patch.
Backport of 164528acc8 from master.
 2013-03-22 17:58:36 +01:00
Marc Tamlyn dd897e4eeb [1.5.x] Fixed #20094 - Be more careful when checking for Iterator 
Python 2.6 has some different behaviour when checking
isinstance(foo, collections.Iterator).
Backport of 829dc3c5 from master.
 2013-03-22 17:45:41 +01:00
Tim Graham 7206330c15 [1.5.x] Fixed #17935 - Clarified intro of topics/files.txt. 
Thanks guettli for the suggestion.

Backport of f7795e968d from master
 2013-03-22 07:44:42 -04:00
Claude Paroz add0dc02ad [1.5.x] Fixed #20096 -- Added link to the Greek localflavor app 
Backport of a9ee0e297 from master.
 2013-03-20 17:11:21 +01:00
Claude Paroz b91067d9aa [1.5.x] Revert "Fixed #19895 -- Made second iteration over invalid queryset raise an exception too" 
This reverts commit d1e87eb3ba.
This commit was the cause of a memory leak. See ticket for more details.
Thanks Anssi Kääriäinen for identifying the source of the bug.
 2013-03-20 10:43:14 +01:00
Matthew Wood 5c78877016 [1.5.x] Fixed #20051 -- Specified where to define `TEMPLATE_DIRS`. 2013-03-18 15:48:47 -04:00
Aymeric Augustin 9e920a4888 [1.5.x] Minor docs fix for e11ccc76. 
Backport of f3a6d74 from master.
 2013-03-17 22:44:20 +01:00
Aymeric Augustin 1c9bd69ff0 [1.5.x] Stopped using non-standard __globals__ and __code__ attributes. 
Some alternative implementations don't have them.

Closes #19944.

Backport of 9d4a5b00f1 from master.
 2013-03-17 16:05:55 +01:00
Aymeric Augustin 2757d492bb [1.5.x] Updated bundled version of six. 
Backport of e11ccc76d3.
 2013-03-17 16:05:30 +01:00
Florian Apolloner f96d2848c6 [1.5.x] Updated our six module to follow upstream changes. 
This includes fixes for the java/jython detection and a new license header.

Thanks to Thomas Bartelmess for the report.

Backport of c5ce0e8a68 from master.
 2013-03-17 16:05:19 +01:00
Claude Paroz 101ec4bf8a [1.5.x] Fixed #20036 -- Improved GEOS version string parsing 
Thanks chikiro.spam at gmail.com for the report.
Backport of 747f7d254 from master.
 2013-03-13 09:54:37 +01:00