mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-21 23:00:44 +00:00
Code Issues 32 Releases Wiki Activity
13,649 Commits 29 Branches 438 Tags
Commit Graph

13649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 d1e87eb3baf75b1b6a0ada46a9b77f7e347cdb60.
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 9d4a5b00f1977d8cddf8e241fa4bb8a9e819f188 from master.
 2013-03-17 16:05:55 +01:00
Aymeric Augustin
2757d492bb [1.5.x] Updated bundled version of six. 
Backport of e11ccc76d325b6bbbf101f510a91299f507f0745.
 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 c5ce0e8a687ecf7fbc38fa85c5311a6320a246c6 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. 1.5 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
Claude Paroz
cf114cffea [1.5.x] Fixed #19903 -- Fixed unbalanced setUp/tearDown calls in LiveServerAddress test 
Backport of 6d52bcbb7c from master.
 2013-02-25 08:59:44 +01:00
Carl Meyer
b83feeea43 [1.5.x] Minor edits to some recently-added admin docs. 
Backport of 8f839aaa180f from master.
 2013-02-25 00:15:46 -07:00
Aymeric Augustin
455baa68eb [1.5.x] Changed testing strategy used in 6b03179e. 
Avoid polluting the app cache as it causes unrelated test failures.

Refs #19688.

Backport of 7b49da1 from master.
 2013-02-25 00:11:10 +01:00
Simon Charette
f8b41da431 [1.5.x] Fixed #19688 -- Allow model subclassing with a custom metaclass using six.with_metaclass 
Backport of 6b03179e126d4df01623dccc162c1579f349e41e from master.

Although we're post RC 2, I'm backporting this because it's arguably a
major bug in a new feauture that will prevent several well-known
third-party apps from being ported to Python 3.
 2013-02-24 17:45:48 +01:00
Ben Konrath
1845c53081 [1.5.x] Fixed #19394 --Added note about auth forms and custom user models. 2013-02-24 07:58:16 -08:00
Preston Holmes
f60dd6f55d [1.5.x] Made a small clarification in tutorial. 
refs #19889
 2013-02-23 19:07:55 -08:00
Tim Graham
72db38facc [1.5.X] Added an example of "default" database dictionary left blank; refs #19775. 
Thanks wsmith323 for the patch.

Backport of cf890c110e from master
 2013-02-23 16:03:03 -05:00
Tim Graham
1702be89c8 [1.5.X] Fixed #19402 - Clarified purpose of CustomUser.REQUIRED_FIELDS 
Thanks pydanny for the report and ptone for the patch.

Backport of 24a2bcbcdd from master
 2013-02-23 15:43:55 -05:00
Grzegorz Nosek
d1e87eb3ba [1.5.x] Fixed #19895 -- Made second iteration over invalid queryset raise an exception too 
When iteration over a queryset raised an exception, the result cache
remained initialized with an empty list, so subsequent iterations returned
an empty list instead of raising an exception

Backport of 2cd0edaa477b327024e4007c8eaf46646dcd0f21 from master.
 2013-02-23 14:39:05 -06:00
Tim Graham
2683e8ea20 [1.5.X] Fixed #19579 - Documented that "providing_args" is purely documentational. 
Backport of 4c05fdb467 from master
 2013-02-23 15:33:58 -05:00
Tim Graham
a97c441e18 [1.5.X] Fixed #19880 - Fixed an error in the form wizard initial_dict example. 
Thanks almalki for the report.

Backport of 9b97f01dea from master
 2013-02-23 15:28:03 -05:00
Tim Graham
fceafa1929 [1.5.X] Fixed #19775 - Clarified requirements of the "default" database. 
Thanks monkut for the report and wsmith323 for the patch.

Backport of 31bcb102b2 from master
 2013-02-23 15:23:00 -05:00
Tim Graham
29b0d89ee9 [1.5.X] Updated example to use staticfiles static template tag, thanks reinout for the suggestion, refs #19675. 
Backport of f3ae67a62f from master
 2013-02-23 11:05:59 -05:00
Tim Graham
0fa827c55f [1.5.x] Fixed #19752 - Changed Postgres version numbers to 9.x to avoid having to update them each minor release. 
Backport of 8d17114899 from master.
 2013-02-23 10:42:27 -05:00
Tim Graham
da8c789082 [1.5.X] Updated static file example in overview to use static template tag, refs #19675. 
Thanks jezdez for the note.

Backport of 9e959e8d58 from master
 2013-02-23 10:37:29 -05:00
Tim Graham
ad69293958 [1.5.X] Fixed #19675 - Added mention of static files to overview. 
Thanks Dwight Gunning for the patch.

Backport of a61dbd6219 from master
 2013-02-23 10:01:14 -05:00
Tim Graham
89fb1836a8 [1.5.x] Fixed #19887 - Noted when callables may be used in ModelAdmin.fields and ModelAdmin.fieldset. 
Thanks Patrick Strasser for the suggestion and Zbigniew Siciarz for the patch.

Backport of 722683f508 from master.
 2013-02-23 09:47:42 -05:00
Tim Graham
5732f7b62b [1.5.x] Changed "mysite/mytemplates/" -> "mysite/templates" in tutorial. 
Thanks James Pic.

Backport of 1b7fb29dfb from master.
 2013-02-23 09:23:06 -05:00