innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
15,454 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

9348 Commits

Author SHA1 Message Date
Ramiro Morales 656a3adff7 [1.6.x] Corrected setting name in gis test error message. 
e36c165b14 from master.
 2013-12-05 18:35:00 -03:00
Claude Paroz c8b4ac814c [1.6.x] Fixed #21358 -- Allowed runserver on non-English locales 
Thanks svartalf for the report.
Backport of 2080bce69 from master.
 2013-12-02 10:35:27 +01:00
Tim Graham 2f42bbaba7 [1.6.x] Fixed #21535 -- Fixed password hash iteration upgrade. 
Thanks jared_mess for the report.

Backport of fddb0131d3 from master
 2013-11-30 14:35:38 -05:00
Claude Paroz 14ddc1b517 [1.6.x] Fixed #21496 -- Fixed crash when GeometryField uses TextInput 
Thanks Rhett Garber for the report and initial patch.
Backport of 34b8a3855 from master.
 2013-11-28 18:34:33 +01:00
Claude Paroz 655b8bb10b [1.6.x] Fixed #21448 -- Fixed test client logout with cookie-based sessions 
Thanks Gunnar Scherf for the report and the suggested patch.
Backport of 384816fcc from master.
 2013-11-26 20:42:54 +01:00
Richard Xia 6cd5c67b69 [1.6.x] Fixed #21355 -- try importing _imaging from PIL namespace first. 
Backport of 5725236c3e from master
 2013-11-26 19:04:23 +02:00
Claude Paroz 432de54611 [1.6.x] Fixed #21486 -- Prevented settings config in signal connection 
This was particularly problematic in the chain get_wsgi_application
-> db.connections import -> signal connection -> settings configuration.
Thanks Jon Dufresne for the report.
Backport of 42fef29446 from master.
 2013-11-23 18:49:06 +01:00
Ramiro Morales 8750296918 [1.6.x] Fixed #21488 -- Multiple locales treatment in i18n commands. 
Removed multiple locales separated by commas variation (that wasn't
working as documented) in favor of simply allowing use of the
``--locale``/``-l`` options more than once for ``makemessages`` and
``compilemessages``.

Thanks Romain Beylerian for the report and Claude, Simon for their help.
 2013-11-23 11:02:30 -03:00
Bouke Haarsma d55df0b810 [1.6.x] Fixed #21443 -- Cannot show debug info on PY3's importlib 
Thanks productions@zaziork.co.uk for the review.
Backport of 18185724e6 from master.
 2013-11-22 20:37:09 +01:00
Claude Paroz 9cbcd06b1a [1.6.x] Fixed #21405 -- Prevented queryset overwrite in BaseModelAdmin 
Thanks guido@20tab.com for the report and Tim Graham for the
analyze.
Backport of 1718b5256c from master.
 2013-11-21 22:24:00 +01:00
Anssi Kääriäinen 5730bf2819 [1.6.x] Fixed #21431 -- GenRel->FK list_filter regression in admin 
Report, analysis and tests from stephenmcd.

Backpatch of 752d3d70da from master.
 2013-11-21 15:34:04 +02:00
Claude Paroz d8fdee7db8 [1.6.x] Fixed #21472 -- Fixed inline formsets display when parent pk is 0 
Thanks agale031176@gmail.com for the report.
Backport of fafb6cf049 from master.
 2013-11-20 21:37:35 +01:00
Claude Paroz 833f7d11e8 [1.6.x] Fixed #21457 -- Allowed fixture file name to contain dots 
Thanks Keryn Knight for the report.
Backport of 97ac22ebfc from master.
 2013-11-18 20:34:39 +01:00
Claude Paroz 62bb4fc806 [1.6.x] Added non-breaking spaces for humanize in Russian 2013-11-18 20:08:01 +01:00
Claude Paroz e85baa813f Updated humanize translations and added release note. 
Refs #21415.
 2013-11-17 21:20:44 +01:00
Anssi Kääriäinen cbf8784d20 [1.6.x] Fixed a regression caused by fix for #21428 
On Python 3 sorting Fields mixed with GenericForeignKeys doesn't work
as GenericForeignKey isn't a subclass of django.db.models.fields.Field.

Refs #21428.

Backport of 326539f6a4 from master
 2013-11-16 20:55:37 +02:00
Anssi Kääriäinen 1fd762c106 [1.6.x] Fixed #21428 -- editable GenericRelation regression 
The GenericRelation refactoring removed GenericRelations from
model._meta.many_to_many. This had the side effect of disallowing
editable GenericRelations in ModelForms. Editable GenericRelations
aren't officially supported, but if we don't fix this we don't offer any
upgrade path for those who used the ability to set editable=True
in GenericRelation subclass.

Thanks to Trac alias joshcartme for the report and stephencmd and Loic
for working on this issue.

Backpatch of 0e079e4331 from master.
 2013-11-16 20:15:46 +02:00
Claude Paroz 882ee16f68 [1.6.x] Updated humanize translation catalog 
Refs #21415
 2013-11-15 15:49:07 +01:00
glts 1e2bbc3b71 [1.6.x] Fixed #21415 -- Replaced escape sequence by literal non-breaking space 
Unfortunately, escape sequences (\x.. or \u....) do not fit well
with the gettext toolchain. Falling back to using literal char,
even if visibility is not ideal.

Backport of 7e0ebd74c from master.
 2013-11-15 15:35:44 +01:00
Loic Bistuer 67c30426c1 [1.6.x] Fixed #21432 -- DateTimeQuery now copies tzinfo when cloning. 
Thanks Enrique Martínez for the report and @bmispelon for the tests.

Backport of 17ed99f3a3 from master.
 2013-11-14 21:39:24 +01:00
Matt Robenolt 0aa06bd378 [1.6.x] Propagate get_user_model exception from get_user 
Fixes #21439

Backport of 3560ef04 from master.

Conflicts:
	django/contrib/auth/tests/test_auth_backends.py
 2013-11-14 21:21:02 +01:00
Loic Bistuer b107421acf [1.6.x] Fixed #21410 -- prefetch_related() for ForeignKeys with related_name='+' 
Regression introduced by commit 9777442.

Thanks to trac username troygrosfield for the report and test case.

Backpatch of cb83448891 from master.

Conflicts:

	tests/prefetch_related/models.py
 2013-11-13 07:41:30 +02:00
Tim Graham 4b9e932fd4 [1.6.x] Fixed #21398 -- Fixed BCryptSHA256PasswordHasher with py-bcrypt and Python 3. 
Thanks arjan at anymore.nl for the report.

Backport of d15985d81f from master
 2013-11-09 10:21:19 -05:00
James Bennett a71ff76235 [1.6.x] Bump version numbers for 1.6 release. 2013-11-06 07:54:49 -06:00
Claude Paroz 84b9ab7c1d [1.6.x] Pulled Transifex translations for contrib apps 2013-11-05 21:44:03 +01:00
Claude Paroz 72bc925491 [1.6.x] Pulled Transifex translations for Django core 2013-11-05 20:02:25 +01:00
Tim Graham 33503c57ef [1.6.x] Fixed spelling ("dependant" -> "dependent") 
Dependent means reliant on.
A dependant is a person like a child or spouse.

Thanks Andrew Wilcox for the report.

Backport of 090315f5df from master
 2013-11-01 21:32:05 -04:00
Tim Graham 5217d01b77 [1.6.x] Fixed #21347 -- Added missing JS variable declaration. 
Thanks szymon.barglowski at gmail.com for the report.

Backport of 0b1d425a41 from master
 2013-10-30 16:00:13 -04:00
Claude Paroz ec0a3f5085 [1.6.x] Removed relative usage of import_module 
Python 3 version of importlib doesn't support this syntax.
Partial backport of fdd7a355bf. Refs #21335.
 2013-10-26 23:22:21 +02:00
Andrey Antukh e052ada0f6 [1.6.x] Fixed #21335 -- Use importlib from python3 when using python3 
Backport of 3351e94ffa from master.
 2013-10-26 22:55:10 +02:00
James Bennett 9c982053f4 [1.6.x] Bump version number for 1.6 release candidate. 2013-10-22 21:56:12 -05:00
Ramiro Morales bcc65c13a0 [1.6.x] Fixed #21307 -- Moved TransRealMixin to django.test.utils. 
51d2e1fb23 from master.
 2013-10-22 22:40:01 -03:00
Ramiro Morales b987fb188d [1.6.x] Decode from UTF-8 explicitly when reading a text file in makemessages. 
This shows itself with Python 3 under Windows where UTF-8 usually isn't
the default file I/O encoding and caused one failure and three errors
in our test suite under that platform setup.

b5f52647fe from master.
 2013-10-22 07:38:02 -03:00
Anssi Kääriäinen 6781dc6243 [1.6.x] Fixed #21249 -- variable name typo in compiler.get_grouping() 
The typo could have consequences in exceptional cases, but I didn't
figure out a way to actually produce such a case, so not tests.

Report & patch by Michael Manfre.

Backport of 86c248aa64 from master
 2013-10-21 22:10:42 +03:00
Florian Apolloner 823951ec55 [1.6.x] Force update of the password on iteration count changes. 
Backport of 7d0d0dbf26 from master.
 2013-10-21 20:33:03 +02:00
Florian Apolloner 37aea82b1c [1.6.x] Fixed #21253 -- PBKDF2 with cached HMAC key 
This gives a 2x speed increase compared to the existing implementation.

Thanks to Steve Thomas for the initial patch and Tim Graham for finishing it.

Backport of 1e4f53a6eb from master.
 2013-10-21 19:55:28 +02:00
Claude Paroz 0c850e2885 [1.6.x] Fixed #21291 -- Ensured inactive users cannot reset their passwords 
Thanks kz26 for the report and the suggested fix. Refs #19758.

Backport of 5f5259036 from master.
 2013-10-19 10:53:43 +02:00
Claude Paroz 742585b59c [1.6.x] Cleaned formatting/comments in PasswordResetFormTest 
Backport of 59a880863 from master.
 2013-10-19 10:52:58 +02:00
Tim Graham dc8176eb3a [1.6.x] Fixed bug causing CSRF token not to rotate on login. 
Thanks Gavin McQuillan for the report.

Backport of ac4fec5ca2 from master
 2013-10-18 08:33:00 -04:00
Claude Paroz 621fc1f1d7 [1.6.x] Fixed #21284 -- Prevented KeyError swallowing in fetch_command 
Thanks wildfire for the report.

Backport of 3514bcb251 from master.
 2013-10-18 14:05:26 +02:00
Claude Paroz b2f9c74ed1 [1.6.x] Fixed #21282 -- Made HttpResponse.serialize_headers accept latin-1 
Thanks Raphaël Barrois for the report and the initial patch and
Aymeric Augustin for the review.

Backport of a14f087233 from master.
 2013-10-17 18:15:56 +02:00
Claude Paroz ba9cf9596b [1.6.x] Fixed #21269 -- Don't crash when CommandError contains non-ascii 
Thanks kontakt@eikefoken.de for the report.

Backport of 42a67ec1cd from master.
 2013-10-14 21:28:29 +02:00
Claude Paroz 4a9bae0b39 [1.6.x] Imported custom user classes in tests depending on it 
Without those imports, affected test files cannot be run
independently. Refs #21164.

Backport of ef22d512b5 from master.
 2013-10-14 10:17:51 +02:00
Aymeric Augustin 5591fe6829 [1.6.x] Fixed #21256 -- Error in datetime_safe.datetime.combine. 
Backport of d9b6fb8 from master
 2013-10-13 19:11:43 +02:00
Aymeric Augustin f0c7649b16 Fixed #21198 -- Prevented invalid use of @python_2_unicode_compatible. 
Thanks jpic for the report and chmodas for working on a patch.

Reverts 2ea80b94. Refs #19362.

Conflicts:
	tests/utils_tests/test_encoding.py
 2013-10-13 18:25:21 +02:00
Aymeric Augustin ddff6522fa [1.6.x] Fixed #19560 -- Identified field in warning for naive datetime. 
Thanks gcc for the report and vajrasky for the patch.

Backport of 570d9c2678 from master.
 2013-10-13 11:58:12 +02:00
Claude Paroz 8765eddf2e [1.6.x] Updated auth translation template 2013-10-09 20:21:08 +02:00
Russell Keith-Magee 1ab84b6c65 [1.6.x] Fixed #21164 -- Added documentation for issue with test users. 
The package renaming restores the older package names (which were also the
documented package names). This doesn't affect test discovery because the
module in question doesn't contain any tests.

Thanks to Carl for the design discussion.

Backport of ddb5385 from master.
 2013-10-08 10:37:48 +08:00
Russell Keith-Magee 7f0fdffd07 [1.6.x] Refs #21197 -- Clarified upgrade check message. 
Thanks to Carl and Shai for the discussion.

Backport of 8ff4303 from master.
 2013-10-08 10:02:08 +08:00
Aymeric Augustin b42f0665a8 [1.6.x] Fixed #21235 -- Disabled savepoints for old versions of SQLite. 
Thanks Ramiro for the report.

Backport of 91547772 from master.
 2013-10-07 10:49:28 +02:00