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

13725 Commits

Author SHA1 Message Date
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
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 8f839aaa18 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 6b03179e12 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 2cd0edaa47 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
Tim Graham e69d810741 [1.5.x] Fixed #17094 - Typo in class-based views doc. 
Thanks alej0 for the report.

Backport of c89717fabe from master.
 2013-02-23 08:55:01 -05:00
Jannis Leidel f96dd05542 [1.5.X] Fixed #19850 -- Use configured staticfiles storage to find the URL of a static file in the admin. 2013-02-23 14:42:11 +01:00
Anssi Kääriäinen 251f345db6 [1.5.x] Fixed Oracle regression in last_executed_query() with unicode strings 
The regression was likely caused by the fix in #19606 which adjusted
Oracle's unicode detection, though it seems this would have been an
issue in some configurations even before.

Backpatch of ce094e570e
 2013-02-23 00:31:14 +02:00
Anssi Kääriäinen 8a99d718f7 [1.5.x] Fixed empty strings + to_field regression on Oracle 
Querying the reverse side of nullable to_field relation, where both
sides can contain null values resulted in incorrect results. The reason
was not detecting '' as NULL.

Refs #17541, backpatch of 09fcb70c80.
 2013-02-23 00:09:48 +02:00
Preston Holmes b17a572eb3 [1.5.x] Fixed #19868 -- Clarified purpose of custom user example 2013-02-20 15:34:22 -08:00
Anssi Kääriäinen 96790fc022 [1.5.x] Made a couple of selenium tests wait for page loaded 
The admin_widgets tests were issuing click() to the browser but
didn't wait for the effects of those clicks. This caused the resulting
request to be processed concurrently with the test case. When using
in-memory SQLite this caused weird failures.

Also added wait_page_loaded() to admin selenium tests for code
reuse.

Fixed #19856, backpatch of 50677b29af
 2013-02-21 00:01:07 +02:00
Anssi Kääriäinen 8ad436636f [1.5.x] Fixed #19672 -- Error in negated Q() filtering 
There was a variable overwrite error in negated join filtering. This
happened when add_filter() was adding the IS NULL condition to the
WHERE clause.

This is not a backport from master as there have been some other
refactorings which made this patch irrelevant.

The patch is from Ian Kelly.
 2013-02-20 21:57:39 +02:00
Carl Meyer 8d4342f2c9 [1.5.x] Fixed #19857 -- Fixed broken docs link in project template. 2013-02-19 18:43:28 -07:00
Carl Meyer c7f80b428b Don't characterize XML vulnerabilities as DoS-only. 2013-02-19 18:20:08 -07:00
Tim Graham 23ef6e1baf [1.5.X] Fixed #19728 - Updated API stability doc to reflect current meaning of "stable". 
Backport of 132d5822b0 from master
 2013-02-19 18:20:46 -05:00
Stefan "hr" Berder 4f99b0b635 [1.5.X] Fixed typo in docs/topics/class-based-views/generic-display.txt 
Backport of 22d5e4b4af from master
 2013-02-19 16:32:59 -05:00
James Bennett 18d920ea48 [1.5.x] Bump version numbers for security release. 2013-02-19 14:15:33 -06:00
Carl Meyer 84ce990c07 [1.5.x] Update 1.5 release notes for XML and formset fixes. 2013-02-19 10:39:04 -07:00
Aymeric Augustin 3ef4bbf495 [1.5.x] Added a default limit to the maximum number of forms in a formset. 
This is a security fix. Disclosure and advisory coming shortly.
 2013-02-19 10:39:04 -07:00
Carl Meyer 0e46c7f7ac [1.5.x] Checked object permissions on admin history view. 
This is a security fix. Disclosure and advisory coming shortly.

Patch by Russell Keith-Magee.
 2013-02-19 10:39:04 -07:00
Carl Meyer 2d0c22e02d [1.5.x] Restricted the XML deserializer to prevent DoS attacks. 
This is a security fix. Disclosure and advisory coming shortly.
 2013-02-19 10:39:03 -07:00
Carl Meyer a7e33c5bf3 [1.5.x] Added a new required ALLOWED_HOSTS setting for HTTP host header validation. 
This is a security fix; disclosure and advisory coming shortly.
 2013-02-19 10:39:03 -07:00
Tim Graham 5d853db90e [1.5.X] Fixed #19717 - Removed mentions of "root QuerySet" in docs. 
Thanks julien.aubert.mail@ for the report and James Pic for the patch.

Backport of 64d0f89ab1 from master
 2013-02-18 09:36:49 -05:00
Simon Meers 94ef17e2c2 [1.5.x] Corrected INSTALLED_APPS syntax in 1.5 release notes. 
Backport of 9c2066d5 from master.
 2013-02-18 00:55:22 +11:00
Tim Graham ba794f68bf [1.5.x] Fixed #19824 - Corrected the class described for Field.primary_key from IntegerField to AutoField. 
Thanks Keryn Knight.

Backport of 218bbef0c4 from master
 2013-02-16 18:34:18 -05:00
Tim Graham ad2b091c1f [1.5.x] Fixed #19812 - Removed a duplicate phrase in the widget docs. 
Thanks diegueus9 for the report and itsallvoodoo for the draft patch.

Backport of 7a80904b00 from master
 2013-02-16 18:25:03 -05:00
Alex Hunley 5c3c8bf09a [1.5.x] Fixed #19719 - Removed misleading example from ModelForm documentation 
Backport of 976dc07baf from master
 2013-02-16 18:05:35 -05:00
Claude Paroz 41848b078a [1.5.x] Fixed #19833 -- Fixed import parameter encoding in get_runner 
Thanks Danilo Bargen for the report.
Backport of 63236161 from master.
 2013-02-16 13:32:03 +01:00
Russell Keith-Magee 461d6e2295 [1.5.x] Refs #14881 -- Document that User models need to have an integer primary key. 
Thanks to Kaloian Minkov for the reminder about this undocumented requirement.

(cherry picked from commit 91c26eadc9)
 2013-02-16 10:21:45 +08:00