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

15415 Commits

Author SHA1 Message Date
Tim Graham a776e3f420 [1.6.x] Fixed #21404 -- Added session.set_expiry() note to 1.6 release notes. 
Thanks pwr for the suggestion.

Backport of ffdae5b66d from master
 2013-11-18 08:00:16 -05: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
Tim Graham e8dea1f35c [1.6.x] Fixed #21440 -- Typo #2 in topics/http/shortcuts.txt 
Thanks alasdair.

Backport of d011714002 from master
 2013-11-15 10:22:51 -05: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
Tim Graham f2b5e9d5bb [1.6.x] Fixed #21440 -- Typo in topics/http/shortcuts.txt 
Thanks olof.bjarnason at gmail.com for the report.

Backport of 6e9e6ca071 from master
 2013-11-15 07:10:47 -05:00
Baptiste Mispelon 2a0039ba62 Fixed Python2.6 incompatibility caused by 67c30426c1. 2013-11-15 00:24:11 +01:00
Baptiste Mispelon bdde6f6a03 [1.6.x] Added backported fixes to 1.6.1 release notes. 
Backport of 8e6d1b9792 from master.
 2013-11-14 23:14:37 +01:00
Baptiste Mispelon 2cfff0cb72 Fixed wrong override_settings path introduced by 67c30426c1. 2013-11-14 23:09:20 +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
Anssi Kääriäinen c37b2e46b9 [1.6.x] Release notes for ORM changes in 1.6 
Backport of 4301d6fa36 from master
 2013-11-14 18:04:55 +02:00
Tim Graham 5b8c8c462d [1.6.x] Added release note for #21410; thanks Loic. 
Backport of 94d567ba30 from master
 2013-11-13 12:25:31 -05: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
Baptiste Mispelon b6acc4f749 [1.6.x] Removed a mention of `Form._errors` from the documentation. 
Also removed a sentence that was incorrect: raising a
`ValidationError` inside `Form.clean` doesn't clear the
`cleaned_data` attribute.

Thanks to loic84 and timograham for the review.

Backport of 9aa6d4bdb6 and
0048ed77c7 from master.
 2013-11-12 20:54:37 +01:00
Bernardo Pires 4aed1ee339 [1.6.x] Fixed #21372 -- Corrected docs regarding translating LANGUAGES. 
Corrected LANGUAGES documentation on how to translate language
names. Now using django.utils.translation.ugettext_lazy instead
of a dummy gettext() function.

Thanks to Salvatore for the report.

Backport of 8bc350b385 from master.
 2013-11-10 00:02:13 +01: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
Tim Graham c9076a408c [1.6.x] Fixed spelling of compatibility. 2013-11-09 10:18:55 -05:00
Baptiste Mispelon 86e72f5ba9 [1.6.x] Fixed versionadded misuse in the admin documentation. 
Backport of c82e850eed from master.
 2013-11-09 15:10:14 +01:00
Cody Scott 82e756da83 [1.6.x] Noted that .clear() will delete intermediary models 
Backport of a8e84521c4 from master
 2013-11-08 19:25:21 -05:00
Tom Scholl c9917f4c83 [1.6.x] Fixed docs for EmailMessage extra_headers attribute 
The EmailMessage documentation describes the initialization parameters
and states they 'can be set at any time prior to calling the send()
method.'. However, the 'headers' parameter's corresponding attribute is
called 'extra_headers'.

Backport of cab72a439b from master
 2013-11-08 18:39:53 -05:00
glts d4b1724b36 [1.6.x] Added missing parameter in npgettext_lazy docs 
Backport of 413307fe35 from master
 2013-11-08 18:35:43 -05:00
Claude Paroz 3c8879f092 [1.6.x] Removed obsolete locale restriction admonition 
Refs #14461. Thanks Ramiro Morales for pointing this.
Backport of b780d03d62 from master.
 2013-11-08 16:53:12 +01:00
Baptiste Mispelon 6c34e18bd4 [1.6.x] Fixed #21396: Document backwards-incompatible change in RedirectView.get_redirect_url. 
Thanks to Tim for the review.

Backport of f2e0266be7 from master.
 2013-11-08 10:55:11 +01:00
Tim Graham 6026a5091b [1.6.x] Added 1.4.10 release notes. 
Backport of c29dd76f40 from master
 2013-11-07 09:42:47 -05:00
Sylvain Bellemare b3da4cc092 [1.6.x] Removed no longer relevant word 
Backport of 3935b0f263 from master
 2013-11-07 09:32:26 -05:00
James Bennett c89a56d9fe [1.6.x] Correctly update development-status classifier. 2013-11-06 08:59:40 -06: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
Claude Paroz 66bf6b3f85 [1.6.x] Fixed #21373 -- Typo fixed in i18n docs 
Thanks rpq at winscores.com for the report.
Backport of 88b9d4ff3a from master.
 2013-11-02 19:15:20 +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
Sylvain Bellemare 35fd14cf42 [1.6.x] Fixed typo -- "a" user, not "an" user 
Backport of c7dabe49dd from master
 2013-11-01 19:28:19 -04:00
Claude Paroz 3f1b20841a [1.6.x] Fixed #21364 -- Specified InnoDB full-text support from MySQL 5.6.4 on 
Thanks thevlad at gmail.com for the report.
Backport of 89116cf24a from master.
 2013-11-01 11:02:11 +01:00
Claude Paroz f03c699159 [1.6.x] Fixed #21359 -- Corrected MySQL collation name in databases docs 
Thanks k_sze for the report.
Backport of 67c6c1a7c from master.
 2013-11-01 10:46:39 +01:00
Claude Paroz 8f104bb8d5 [1.6.x] Fixed #21339 -- Documented removal of some form field error messages 2013-10-31 17:53:05 +01: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
Tim Graham d774cb219c [1.6.x] Fixed #21306 -- Documented lower-casing behavior of title filter. 
Backport of eafe279120 from master
 2013-10-30 09:35:05 -04:00
Tim Graham 1cdf7f83ff [1.6.x] Fixed #21294 -- Clarified the logout next_page argument. 
Thanks wim at go2people.nl for the report.

Backport of 51e6575472 from master
 2013-10-30 09:26:35 -04:00
Antoine Catton 142757c61e [1.6.x] Documented the limitation on sep argument to Signer 
Co-Authored-By: Gavin Wahl <gwahl@fusionbox.com>

Backport of e9a356a695 from master
 2013-10-30 08:27:19 -04:00
Tim Graham da0c7723fa [1.6.x] Fixed #21316 -- Documented that modifying safe strings makes them unsafe. 
Thanks dev@simon.net.nz for the suggestion and vijay_shanker for the patch.

Backport of 1edef50880 from master
 2013-10-30 08:12:09 -04:00
Tim Graham aa645d20df [1.6.x] Fixed #21337 -- Documented removal of django.core.servers.basehttp.WSGIServerException 
refs 2ca00faa91

Backport of b47a052eb5 from master
 2013-10-30 07:47:32 -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
Tim Graham 747f77552a [1.6.x] Fixed #21325 -- Added missing argument to permission_required decorator. 
Backport of cc2049cdd7 from master
 2013-10-25 17:37:39 -04:00
Paolo Melchiorre 26e4576681 [1.6.x] Fixed typo in docs/releases/1.4.9.txt. 
Backport of 3b0293370a from master
 2013-10-25 07:55:41 -04:00
Tim Graham bc62a20a3e [1.6.x] Bumped release date for 1.5.5 & 1.4.9. 
Backport of 4ce5c119b5 from master
 2013-10-23 18:29:09 -04:00
Ramiro Morales 7f5555db2b [1.6.x] Workaround admin scripts test failures on Windows+Python 3. 
Change strategy used to examine instrumented output to acommodate the
fact that on Windows, where the path separator is '\', repr() of Python
modules has changed in Python 3 to use escaped backslashes in the FS
path section (e.g.
'C:\\python3x\\Lib\\site-packages\\django\\contrib\\auth\\models.py')
without having to special-case based on platform.

c04f3fc686 from master.
 2013-10-23 09:27:18 -03:00