1
0
mirror of https://github.com/django/django.git synced 2025-04-24 17:24:37 +00:00

7418 Commits

Author SHA1 Message Date
Anssi Kääriäinen
209f174e58 [1.4.x] Made custom m2m fields without through easier to use
The change in f105fbe52b21da206bfbaedf0e92326667d7b2d4 made through=None
m2m fields fail in cases where they worked before. It isn't possible to
create such fields using public APIs. The fix is trivial, so it seems
worth fixing this for custom m2m field users.

This is not a backport from master. Master has gotten enough other
changes to related fields internal API that this fix alone isn't enough
to do any good.
2013-02-10 21:57:05 +02:00
Anssi Kääriäinen
9918b3f502 [1.4.x] Fixed #19707 -- Reset transaction state after requests
Backpatch of a4e97cf315142e61bb4bc3ed8259b95d8586d09c.
2013-02-10 17:34:38 +02:00
Claude Paroz
ec93ecdd10 [1.4.x] Fixed #19702 -- Changed a SQL command syntax to be MySQL 4-compatible
Thanks matf at op.pl for the report.
2013-02-02 14:24:35 +01:00
Claude Paroz
3610d11ba0 [1.5.x] Lowered field ordering requirement in ogrinspect test
This test was randomly failing depending on the library environment.
Backport of a1c470a6f from master.
2013-02-02 14:08:59 +01:00
Claude Paroz
6bd3896fcb [1.4.x] Fixed #18144 -- Added backwards compatibility with old unsalted MD5 passwords
Thanks apreobrazhensky at gmail.com for the report.
Backport of 63d6a50dd from master.
2013-02-02 12:10:38 +01:00
James Bennett
1f0af3c529 [1.4.x] Bump version numbers for security release. 2012-12-10 15:45:04 -06:00
Florian Apolloner
319627c184 [1.4.X] Fixed a security issue in get_host.
Full disclosure and new release forthcoming.
2012-12-10 22:14:16 +01:00
Florian Apolloner
b2ae0a63ae [1.4.X] Fixed #18856 -- Ensured that redirects can't be poisoned by malicious users. 2012-12-10 22:14:16 +01:00
Sebastián Magrí
c72172244e [1.4.x] Fixed #19318 -- Ensured that the admin's SimpleListFilter options can be displayed as selected even if the lookup's first element is not a string.
Backport of 88e17156393b
2012-12-03 20:58:54 -08:00
Anssi Kääriäinen
c7dcb1d808 [1.4.x] Fixed SQLite's collapsing of same-valued instances in bulk_create
SQLite used INSERT INTO tbl SELECT %s UNION SELECT %s, the problem
was that there should have been UNION ALL instead of UNION.

Refs #19351

Backpatch of a27582484cf814554907d2d1ad077852de36963f
2012-11-24 01:28:25 +02:00
Anssi Kääriäinen
25e041f270 [1.4.x] Fixed #19058 -- Fixed Oracle GIS crash
The problem is the same as in #10888 which was reintroduced when
bulk_insert was added. Thanks to Jani Tiainen for report, patch and
also testing the final patch on Oracle GIS.

Backpatch of 92d7f541da8b59520c833b19fbba52d3ecef2428
2012-11-15 16:22:28 +02:00
Claude Paroz
ad2d57a2cc [1.4.x] Fixed #19172 -- Isolated poisoned_http_host tests from 500 handlers
Thanks bernardofontes for the report.

Backport of b774c5993 from master.
2012-10-29 17:30:51 +01:00
Anssi Kääriäinen
37c87b785d [1.4.x] Fixed #18823 -- Ensured m2m.clear() works when using through+to_field
There was a potential data-loss issue involved -- when clearing
instance's m2m assignments it was possible some other instance's
m2m data was deleted instead.

This commit also improved None handling for to_field cases.

Backpatch of 611c4d6f1c24763e5e6e331a5dcf9b610288aaa8
2012-10-28 17:38:26 +02:00
Carl Meyer
ce168bb899 [1.4.x] Fix an HTML-parser test that's failed in Python 2.6.8 since 5c79dd58.
The problem description in #18239 asserted that
http://bugs.python.org/issue670664 was fixed in Python 2.6.8, but based on
http://bugs.python.org/issue670664#msg146770 it appears that's not correct; the
fix was only applied in 2.7, 3.2, and Python trunk. Therefore we must use our
patched HTMLParser subclass in all Python 2.6 versions.

Backport of fcec904e4f from master. Fixes #19148.
2012-10-23 18:57:59 +02:00
James Bennett
8c46ead92b [1.4.x] Bump ALL the version numbers. 2012-10-17 17:17:37 -05:00
Preston Holmes
92d3430f12 Fixed a security issue related to password resets
Full disclosure and new release are forthcoming

backport from master
2012-10-17 14:40:41 -07:00
Julien Phalip
cc0478606a [1.4.x] Fixed #18881 -- Made the context option in {% trans %} and {% blocktrans %} accept literals wrapped in single quotes. Thanks to lanyjie for the report. 2012-10-13 10:51:53 -07:00
Tim Graham
a35d7fd1e1 [1.4.X] Fixed #19051 - Fixed Selenium tearDownClass method; thanks glarrain for the report.
Backport of a1a5c0854f from master
2012-10-04 07:46:53 -04:00
Anssi Kääriäinen
4dba4ed548 [1.4.x] -- Fixed Python 2.5 compatibility issues 2012-09-30 16:36:01 +03:00
Anssi Kääriäinen
1f537335d9 [1.4.x] Fixed #18979 -- Avoid endless loop caused by "val in PermLookupDict"
Fixed by defining __iter__ which raises TypeError. This was done to
PermWrapper earlier.

Backport of 50d573d2c0b3e17cbf1aa240b03b52e4ad0c32cd
2012-09-27 15:54:48 +03:00
Julien Phalip
336dfc3413 [1.4.X] Fixed #18530 -- Fixed a small regression in the admin filters where wrongly formatted dates passed as url parameters caused an unhandled ValidationError. Thanks to david for the report. 2012-09-15 16:33:56 -07:00
Aymeric Augustin
376a18993b [1.4.x] [py3] Added forwards-compatible aliases.
Related documentation will go to the master branch, since there's
no Python 3 documentation in the 1.5 branch.
2012-09-07 11:45:25 -04:00
Anssi Kääriäinen
2326860851 [1.4.x] Fixed #17788 -- Added batch_size argument to qs.bulk_create()
The qs.bulk_create() method did not work with large batches together
with SQLite3. This commit adds a way to split the bulk into smaller
batches. The default batch size is unlimited except for SQLite3 where
the batch size is limited to 999 SQL parameters per batch.

Thanks to everybody who participated in the discussions at Trac.

Backpatch of 29132ebdef0e0b9c09e456b05f0e6a22f1106a4f from master (with
documentation changes removed).
2012-09-02 19:17:15 +03:00
Claude Paroz
92f7af3c36 [1.4.x] Fixed #18212 -- Standardized arguments of GenericIPAddressField
Unlike other model fields, the newly introduced (1.4)
GenericIPAddressField did not accept verbose_name and name as the
first positional arguments. This commit fixes it.
Thanks Dan McGee for the report and the patch.

Backport of 306d34873cff2 from master.
2012-09-01 18:39:51 +02:00
Raphaël Hertzog
57d9ccc4aa [1.4.x] Fixed #18239 -- Subclassed HTMLParser only for selected Python versions
Only Python versions affected by http://bugs.python.org/issue670664
should patch HTMLParser.
2012-08-16 21:12:30 +02:00
James Bennett
28a4d039a2 [1.4.x] Bump version numbers for security release. 2012-07-30 15:43:45 -05:00
Florian Apolloner
e34685034b [1.4.x] Fixed a security issue in http redirects. Disclosure and new release forthcoming.
Backport of 4129201c3e0fa057c198bdefcb34686a23b4a93c from master.
2012-07-30 22:03:33 +02:00
Florian Apolloner
c14f325c4e [1.4.x] Fixed second security issue in image uploading. Disclosure and release forthcoming.
Backport of b1d463468694f2e91fde67221b7996e9c52a9720 from master.
2012-07-30 22:00:17 +02:00
Florian Apolloner
da33d67181 [1.4.x] Fixed a security issue in image uploading. Disclosure and release forthcoming.
Backport of dd16b17099b7d86f27773df048c5014cf439b282 from master.
2012-07-30 22:00:17 +02:00
Ramiro Morales
c2ff027861 [1.4.x] Made LiveServerTestCase to restore state on exit.
The piece of state is DB connections' allow_thread_sharing attribute
which gets munged when test are run when in-memory SQLite databases.

Thanks Anssi for suggesting the possible root cause and Julien for
implementing the fix.

Backport of ea667ee3aeed33bce1dd681d9c0ea42f9926db5a from master.
2012-07-22 11:06:16 -03:00
Julien Phalip
9a2ca4266a [1.4.x] Fixed #17978 -- Fixed a minor layout issue when an inline contains a filter horizontal widget. Thanks to Aymeric Augustin for the report. 2012-07-07 15:44:26 -07:00
Julien Phalip
4d2fdd4185 [1.4.X] Fixed #18379 -- Made the sensitive_variables decorator work with object methods. 2012-06-03 23:59:01 -07:00
Michael Newman
0f69a16785 [1.4.x] Fixed #18135 -- Close connection used for db version checking
On MySQL when checking the server version, a new connection could be
created but never closed. This could result in open connections on
server startup.

Backport of 4423757c0c50afbe2470434778c8d5e5b4a70925.
2012-05-27 21:51:03 +03:00
Claude Paroz
6bb85d98b0 [1.4.x] Fixed #18019 -- Use threaded runserver only when database supports it. 2012-05-15 09:23:52 +02:00
Jannis Leidel
35423f6fb1 [1.4.X] Set the post process cache when finished instead of one by one.
This should prevent a race condition if running collectstatic is
canceled or its cache is accessed from other processes, leaving the
cache in a corrupt state.
2012-05-10 18:30:46 +02:00
Aymeric Augustin
a3c8201b77 [1.4.x] Fixed #17976 -- Made forms.BooleanField pickleable.
Backport of 9350d1d59c1a4e6a9ac246a808f55da35de0df69 from master.

This was a regression in Django 1.4.
Thanks bronger for the report and claudep for the patch.
2012-05-08 23:20:05 +02:00
Claude Paroz
ee43524e22 [1.4.X] Fixed #18104 -- Added missing parentheses around two-lines deprecation string. Thanks Roy Smith for the report.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-11 17:20:59 +00:00
Aymeric Augustin
01dfe35b38 [1.4.X] Fixed #18090 -- Applied filters when running prefetch_related backwards through a one-to-one relation. Backport of r17888 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-10 06:06:14 +00:00
Julien Phalip
a6ba67ffd1 [1.4.X] Fixed #18086 -- Restored '-pk' as the default order in the admin changelist. This rectifies a slight change in behavior introduced in Django 1.4 and r17635.
Backport of r17881 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-09 04:32:42 +00:00
Julien Phalip
aafa73db54 [1.4.X] Fixed #17972 -- Ensured that admin filters on a foreign key respect the to_field attribute. This fixes a regression introduced in [14674] and Django 1.3. Thanks to graveyboat and Karen Tracey for the report.
Backport of r17854 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 18:46:18 +00:00
Claude Paroz
6c5933d175 [1.4.X] Make auth test pass even when LANGUAGE_CODE is not 'en'. Refs #17980. Thanks wassup for the report.
Backport of r17811 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-29 15:11:14 +00:00
Claude Paroz
277661c2af [1.4.X] Fixed #17733 -- Discouraged setting TIME_ZONE to None when USE_TZ is True. Thanks berdario for the report.
Backport of r17809 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-29 15:09:52 +00:00
James Bennett
658ca67d9f Minor correction in the version tuple.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 16:58:48 +00:00
James Bennett
2591fb8d4c Bump trunk to 1.4.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 16:53:23 +00:00
Aymeric Augustin
f356a2e52f Fixed #17810 (again). Catch session key errors.
The previous commit didn't work with PyLibMC.
This solution appears to be the best compromise
at this point in the 1.4 release cycle.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 16:14:46 +00:00
Jannis Leidel
46871eb1bb Fixed an incompatibility with Python 2.5 in the changes done in r17795. Refs #17810.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 09:32:11 +00:00
Paul McMillan
2ca9801956 Fixed #17810. Catch session key errors.
Catches memcached session key errors related to overly long session keys.
This is a long-standing bug, but severity was exacerbated by the addition
of cookie-backed session storage, which generates long session values. If
an installation switched from cookie-backed session store to memcached,
users would not be able to log in because of the server error from overly
long memcached keys.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 05:31:11 +00:00
Jannis Leidel
38061221c3 Pulled sites translations updates from Transifex. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 03:29:30 +00:00
Jannis Leidel
5b3721b067 Pulled sessions translations updates from Transifex. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 03:24:45 +00:00
Jannis Leidel
c6ba0b54b7 Pulled redirects translations updates from Transifex. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 03:20:36 +00:00