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

13867 Commits

Author SHA1 Message Date
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
Tim Graham e5c57fe1b4 [1.5.x] Fixed #19965 - Added a warning that the tutorial is written for Python 2. 
Thanks itsallvoodoo for the patch.

Backport of e1bafdbffa from master.
 2013-03-12 08:08:01 -04:00
Claude Paroz 1ac7d4e345 [1.5.x] Fixed #20008 -- Removed trailing slash in Wikipedia link 
Thanks senden9 at gmail.com for the report.
Backport of 63c52dcbcd from master.
 2013-03-10 16:00:24 +01:00
Claude Paroz 327c98ff08 [1.5.x] Fixed #19933 -- Catched ValueError in get_system_username 
Thanks lanre.hbs at gmail.com for the report.
 2013-03-02 22:45:06 +01:00
Tim Graham 142728277a [1.5.x] Fixed #19962 - Added a note about SESSION_EXPIRE_AT_BROWSER_CLOSE and browsers that persist sessions. 
Thanks David Sanders.

Backport of fe5d9fe5fe from master
 2013-03-02 10:13:17 -05:00
Claude Paroz d43dfdf4b9 [1.5.x] Fixed #19960 -- Fixed sentence in contrib.auth signals docs 
Thanks edd at slipszenko.net for the report.
Backport of 6d3b0c33dc from master.
 2013-03-01 22:18:00 +01:00
Tim Graham ed381bd922 [1.5.x] Fixed #19937 - Typo in class-based views intro. 
Backport of d009ffe436 from master
 2013-02-28 08:26:56 -05:00
Marti Raudsepp 3919810923 [1.5.x] [py3] str.decode does not exist; str.encode was intended 
Backport of fba6df19b5 from master
 2013-02-27 16:18:06 -05:00
Claude Paroz 171a6635d2 [1.5.x] Fixed #19926 -- Fixed a link to code example in queries docs 
Thanks Randy Salvo for the report.
Backport of b0ba21db07 from master.
 2013-02-27 21:32:08 +01:00
Tim Graham 7f04031ef1 [1.5.x] Fixed #16807 - Added a class-based views intro. 
Thanks Preston Holmes for the text.

Backport of 2108941677 from master
 2013-02-27 08:19:45 -05:00
Łukasz Langa bbe8205693 [py3] Always fed hashlib with bytes. 2013-02-27 10:03:33 +01:00
Tim Graham 67f3a6e9cf [1.5.x] Fixed #19922 - Typo in translation docs. 
Thanks amoebob for the report.

Backport of 9ce1b6191b from master
 2013-02-26 15:14:17 -05:00
James Bennett b170c077cc [1.5.x] Correct final element of version tuple. 2013-02-26 13:28:38 -06:00
James Bennett 52093827c7 [1.5.x] Update trove classifier for 1.5 final release. 2013-02-26 13:13:43 -06:00
James Bennett 61283a8208 [1.5.x] Add release date to 1.5 release notes. 2013-02-26 13:12:27 -06:00
James Bennett e7f2c6f2d7 [1.5.x] Bump version numbers for Django 1.5 release. 2013-02-26 13:06:35 -06:00
Aymeric Augustin 702d39921c [1.5.x] Fixed #19634 -- Added proper __hash__ methods. 
Classes overriding __eq__ need a __hash__ such that equal objects have
the same hash.

Thanks akaariai for the report and regebro for the patch.

Backport of e76147a from master.
 2013-02-25 23:37:23 +01:00
Aymeric Augustin 1742fd08f5 [1.5.x] Fixed #6195 -- Documented caching options for javascript_catalog. 
Backport of 0836670 from master
 2013-02-25 22:30:56 +01:00
Aymeric Augustin 33fc438952 [1.5.x] Fixed #18144 -- Restored compatibility with SHA1 hashes with empty salt. 
Thanks dahool for the report and initial version of the patch.

Backport of 633d8de from master.
 2013-02-25 20:04:26 +01:00
Claude Paroz 3fb98406dc [1.5.x] Updated translations 2013-02-25 14:27:14 +01:00