mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-28 16:16:12 +00:00
Code Issues 32 Releases Wiki Activity
15,864 Commits 30 Branches 460 Tags
61f20b42cdbe9c246d210ad5a0d3a22ada32c443
Commit Graph

9466 Commits

Author SHA1 Message Date
Tim Graham
61f20b42cd [1.6.x] Updated six to 1.8.0. 
Backport of 81477c91f6 from master
 2014-11-04 21:25:08 -05:00
Tim Graham
164970bac1 [1.6.x] Post-release version bump. 2014-10-22 13:32:32 -04:00
James Bennett
811508b051 [1.6.x] Bump version number for bugfix release. 2014-10-22 12:49:25 -04:00
Emmanuelle Delescolle
c5c4bfa12a [1.6.x] Fixed #23604 -- Allowed related m2m fields to be references in the admin. 
Thanks Simon Charette for review.

Backport of a24cf21722 from master
 2014-10-06 08:50:48 -04:00
Tim Graham
943716c8ee [1.6.x] Skipped a broken geoapp test on Oracle; refs #23504. 
Backport of 729cd6a11a from master
 2014-09-23 20:06:50 -04:00
Tim Graham
dd7346ed1d [1.6.x] Made a GIS test work on Oracle. 
Thanks Josh Smeaton and Claude Paroz for advice.

Backport of 7add30df01 from master
 2014-09-22 13:46:28 -04:00
Tim Graham
2376319ce0 [1.6.x] Skipped a broken GIS test on Oracle; refs #23504. 
Backport of 828edc5ba9 from master
 2014-09-22 13:43:35 -04:00
Tim Graham
8cee5875a6 [1.6.x] Removed unnecessary order_by() from a GIS test that crashed Oracle. 
Oracle cannot order_by() a TextField; refs #23504.

Backport of 7fc13178d6 from master
 2014-09-22 13:42:51 -04:00
Tim Graham
59d369db78 [1.6.x] Skipped some broken tests on Oracle GIS; refs #23504. 
Backport of 7fce7f51ef from master
 2014-09-22 13:39:39 -04:00
Tim Graham
cc8486b6fe [1.6.x] Corrected indentation in a contrib.humanize test; refs #23340. 
Thanks Zach Borboa for the report.

Backport of 96010ae15b from master
 2014-09-10 12:27:14 -04:00
Simon Charette
a7af6ad96a [1.6.x] Fixed #23431 -- Allowed inline and hidden references to admin fields. 
This fixes a regression introduced by the 53ff096982 security fix.

Thanks to @a1tus for the report and Tim for the review.

refs #23329.

Backport of 342ccbd from master
 2014-09-08 14:05:26 -04:00
Tim Graham
8635fa0b11 [1.6.x] Additional edits for refs #23340; thanks Loic. 
Backport of 0a2bc6e6bd from master
 2014-09-06 08:01:02 -04:00
Collin Anderson
c9e0afe2d3 [1.6.x] Fixed #23340 -- Corrected naturaltime docs to match behavior. 
Thanks zachborboa for the report and blackguest for the patch.

Backport of 7353e26d5d from master
 2014-09-06 07:48:34 -04:00
Tim Graham
900f28a2b5 [1.6.x] Post release version bump. 2014-09-02 21:08:02 -04:00
James Bennett
75d03c7755 [1.6.x] Update version number for bugfix release. 2014-09-02 15:54:38 -05:00
Akis Kesoglou
b877697472 [1.6.x] Fixed #23370 -- defer() + select_related() crashed with inherited models. 
Backport of 6613ea6e3f from master
 2014-08-30 07:16:47 -04:00
Simon Charette
e3453b61c6 [1.6.x] Fixed #23329 -- Allowed inherited and m2m fields to be referenced in the admin. 
Thanks to Trac alias Markush2010 and ross for the detailed reports.

Backport of 3cbb759 from master
 2014-08-27 21:50:29 -04:00
Tim Graham
808c0dc705 [1.6.x] Bumped version number post-release. 2014-08-20 16:38:01 -04:00
James Bennett
8b19a4e275 [1.6.x] Update version number for security release. 2014-08-20 15:14:55 -05:00
Simon Charette
f7c494f250 [1.6.x] Prevented data leakage in contrib.admin via query string manipulation. 
This is a security fix. Disclosure following shortly.
 2014-08-20 11:43:43 -04:00
Preston Holmes
0268b855f9 [1.6.x] Fixed #23066 -- Modified RemoteUserMiddleware to logout on REMOTE_USE change. 
This is a security fix. Disclosure following shortly.
 2014-08-20 11:43:43 -04:00
Tim Graham
dd0c3f4ee1 [1.6.x] Fixed #23157 -- Removed O(n) algorithm when uploading duplicate file names. 
This is a security fix. Disclosure following shortly.
 2014-08-20 11:43:43 -04:00
Florian Apolloner
da051da8df [1.6.x] Prevented reverse() from generating URLs pointing to other hosts. 
This is a security fix. Disclosure following shortly.
 2014-08-20 11:43:43 -04:00
Claude Paroz
9f9fdc4b0a [1.6.x] Fixed #22996 -- Prevented crash with unencoded query string 
Thanks Jorge Carleitao for the report and Aymeric Augustin, Tim Graham
for the reviews.
Backport of fa02120d36 from master.
 2014-08-19 22:55:35 +02:00
Claude Paroz
f5e8376288 [1.6.x] Fixed multi geometries editing in OpenLayers widget 
Backport of 457c16d0d from master.
 2014-08-15 10:10:35 +02:00
Claude Paroz
99b5567796 [1.6.x] Fixed #23265 -- Used system-specific encoding in runserver 
Thanks SpaceFox for the report.
Backport of 055d95fce0 from master.
 2014-08-14 12:11:42 +02:00
Tim Graham
e4b2bea743 [1.6.x] Fixed #19107 -- Restored bug fix for sending unicode email with Python 2.6.5 and below. 2014-07-30 09:29:08 -04:00
Shai Berger
838b7f8220 [1.6.x] Fixed #20292: Pass datetime objects (not formatted dates) as params to Oracle 
This seems worthwhile in its own right, but also works around an Oracle
bug (in versions 10 -- 11.1) where the use of Unicode would reset the
date/time formats, causing ORA-01843 errors.

Thanks Trac users CarstenF for the report, jtiai for the initial patch,
and everyone who contributed to the discussion on the ticket.

Backport of 6983201 from master.
 2014-07-29 07:00:26 -04:00
Aymeric Augustin
83098dccdf [1.6.x] Fixed #23089 -- Fixed transaction handling in two management commands. 
Previously, when createcachetable and flush operated on non-default
databases, they weren't atomic.

Also avoided transactional DDL and transactional truncates on databases
that don't support them (refs #22308).

Backport of 753a22a635, 0757e0f30d, and 6877a9d415 from master
 2014-07-24 19:27:15 -04:00
Iain Dawson
205090bc71 [1.6.x] Replaced instances of 'his/her' with 'their'. 
Backport of 8fbf13a6c8 from master
 2014-07-21 19:55:28 +00:00
Gavin Wahl
227a0f27a6 [1.6.x] Fixed #22998 -- Updated the fast_delete logic for GFKs 
Backport of 6e2b82fdf6 from master
 2014-07-16 12:53:48 +03:00
Tim Graham
685582940b [1.6.x] Fixed #13794 -- Fixed to_field usage in BaseInlineFormSet. 
Thanks sebastien at clarisys.fr for the report and gautier
for the patch.

Backport of 5e2c4a4bd1 from master
 2014-07-14 12:39:19 -03:00
Daniel Hahler
b6bfdacdae [1.6.x] Fixed various minor doc typos / references. 
Backport of 67f9f385aa from master
 2014-07-05 20:27:03 -04:00
Claude Paroz
90b4d20566 [1.6.x] Fixed a French translation in contrib.auth 
Refs #22929.
 2014-06-30 20:09:57 +02:00
Duncan Parkes
20a1c07ea1 [1.6.x] Improved documentation for QueryDict. 
Backport of 7f4e2ef1e9 from master
 2014-06-24 21:42:36 -04:00
Vlastimil Zíma
ef3ae3d1c9 [1.6.x] Fixed #22514 -- Prevented indexes on virtual fields [postgres]. 
Backport of 78c32f1caa from master
 2014-06-20 19:01:49 -04:00
Egor Semiguzov
734e9ad232 [1.6.x] Removed erroneous trailing comma in OLMapWidget.js. 
Backport of c5226eb72a from master
 2014-06-03 07:44:45 -04:00
Claude Paroz
3a736c1836 [1.6.x] Made an aggregate test pass with spatialite backend 
backends.tests.SqliteAggregationTests was failing with spatialite.

Backport of 550b6195ed from master
 2014-05-31 22:08:38 -04:00
Alasdair Nicol
c9a4c1d80b [1.6.X] Added missing commas to list of strings 2014-05-28 09:15:56 +01:00
Erik Romijn
50a289d05f [1.6.x] Fixed #22579 -- Corrected validation for email to reject trailing slash 
Backport of 424fe76349 from master.
 2014-05-16 15:40:52 +02:00
mbacho
4b49cbfae4 [1.6.x] Fixed typo in multipartparser.py 
Backport of 8a9d54aa69 from master
 2014-05-16 05:35:43 -04:00
Jacob Kaplan-Moss
9dc7f69a4b Updated version numbers post-release. 2014-05-14 18:42:26 +02:00
Jacob Kaplan-Moss
b5bacdea00 Updated version numbers for release. 2014-05-14 18:37:33 +02:00
Erik Romijn
6011075245 [1.6.x] Added additional checks in is_safe_url to account for flexible parsing. 
This is a security fix. Disclosure following shortly.
 2014-05-14 10:15:06 +02:00
Aymeric Augustin
1abcf3a808 [1.6.x] Dropped fix_IE_for_vary/attach. 
This is a security fix. Disclosure following shortly.
 2014-05-14 10:15:06 +02:00
Aymeric Augustin
b6d3212190 [1.6.x] Fixed #22508 -- Avoided overwriting select_related. 
Previously, known related objects overwrote related objects loaded
though select_related. This could cancel the effect of select_related
when it was used over more than one level.

Thanks boxm for the bug report and timo for bisecting the regression.

Conflicts:
	tests/select_related_regress/tests.py

Backport of f574220f from master
 2014-05-10 17:05:09 +02:00
Anssi Kääriäinen
0e37049636 [1.6.x] Fixed #22429 -- Incorrect SQL when using ~Q and F 
Backpatch of 5e1f4656b9 from master.

Conflicts:
	django/db/models/sql/query.py
	tests/queries/models.py
	tests/queries/tests.py
 2014-05-05 13:27:54 +03:00
Claude Paroz
034866204b [1.6.x] Fixed #22565 -- Prevented pgettext_lazy crash with bytestring input 
Thanks ygbo for the report.
Backport of 142c27218 from master.
 2014-05-02 19:38:46 +02:00
Claude Paroz
120a981207 [1.6.x] Fixed #22551 -- Made oracle backend method Python 3 compatible 
Thanks fatal10110 at gmail.com for the report. The fix is 1.6-only
because that code has been refactored in 1.7 (6983201cfb).
 2014-05-01 18:15:00 +02:00
Tim Graham
6265885c1e [1.6.x] Post release version bump. 2014-04-28 18:59:49 -04:00