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

15367 Commits

Author SHA1 Message Date
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
Shai Berger 27f3f34136 Fixed #13245: Explained Oracle's behavior w.r.t db_table 
and how to prevent table-name truncation

Thanks russellm & timo for discussion, and timo for review.

Backported from master 317040a73b
 2013-10-23 15:01:05 +03: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
Tim Graham 2e74d6cb53 [1.6.x] Added 1.5.5 and 1.4.9 release notes 
Backport of 2eb8f15516 from master
 2013-10-22 20:24:26 -04:00
Tim Graham 4499dc81e2 [1.6.x] Fixed #21304 -- Typo in docs/topics/testing/advanced.txt 
Thanks joao at silvaneves.org for the report.

Backport of 9704c49d59 from master
 2013-10-22 12:06:16 -04: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
Ramiro Morales 7130609654 [1.6.x] Fixed an I18N test class tearDown method. 
a3690168cb from master.
 2013-10-22 06:37:18 -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
Tim Graham 86373dc63e [1.6.x] Added docs for the hasher's iteration count changes. 
Backport of 28b70425af from master.
 2013-10-21 20:33:27 +02: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
Riccardo Magliocchetti 15a6667a70 [1.6.x] Fixed #21296 -- Added docs for PostgreSQL and unix domains sockets. 
Backport of 1e39982b6e from master
 2013-10-21 13:10:41 -04: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
Juergen Schackmann f198abc7e4 [1.6.x] Fixed #21212 -- Documented the reverse name for OneToOneField. 
Thanks bjb at credil.org for the report.

Backport of f8632572ad from master
 2013-10-18 16:22:41 -04:00
Tim Graham 5bb975a139 [1.6.x] Added a warning regarding session security and subdomains. 
Backport of a3372f67cb from master
 2013-10-18 09:44:29 -04:00
Tim Graham fa90b855b2 [1.6.x] Fixed ReST error in 1.6. release notes. 
Backport of 651bb73ab3 from master
 2013-10-18 08:47:59 -04: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
Tim Graham 37afcbeb92 [1.6.x] Removed 1.6 release note text regarding password limit length. 
This changed was reverted in 5d74853e15.

Backport of d97bec5ee3 from master
 2013-10-17 19:00:08 -04: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
Tianyi Wang 1241a2cc10 [1.6.x] Improvement on InlineFormSet doc, refs #21006 
Backport of 944a2bb7c1 from master
 2013-10-15 09:58:51 -04:00
Tianyi Wang ecfd958c84 [1.6.x] Fixed #21006 -- Added example code for overriding methods on an InlineFormSet. 
Thanks treysta at gmail.com for the suggestion.

Backport of 9bfe66164e from master
 2013-10-15 07:36:37 -04:00
Sorcha Bowler 07ebd23254 [1.6.x] Fixed #21223 -- Added form.id_for_label to topic guide. 
Thanks ebertti at yahoo.com.br for the suggestion.

Backport of 018e2c055a from master
 2013-10-14 18:43:29 -04: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
Bouke Haarsma 7f566fdb4c [1.6.x] Fixed #20962 -- Documented that template tag render() may raise exceptions. 
Thanks Keryn Knight for the report.

Backport of e077224f4a from master
 2013-10-14 11:55:12 -04:00
Loic Bistuer 8222a48253 [1.6.x] Clarfied the ModelForm docs with respect to generated vs. declared fields. 
The ModelForm docs suggested that fields defined declaratively override
default fields generated from the form Meta.

This is conceptually wrong, especially with inheritance in mind. Meta is
usually defined on the topmost ModelForm subclass, while fields can come
from anywhere in the MRO, especially base classes; therefore we suggested
that something defined in a base class override something from a subclass.

This patch rephrases the docs around the idea that Meta is used to generate
*missing* fields.

Refs #8620, #19617.

Thanks @mjtamlyn and @timgraham for the review.

Backport of 54cd930baf from master
 2013-10-14 10:55:41 -04:00
Bouke Haarsma da181056a9 [1.6.x] Fixed #21210 -- Documented when runserver doesn't auto-restart. 
Thanks gergely at polonkai.eu for the suggestion.

Backport of 9b7d38ed5a from master
 2013-10-14 10:38:30 -04:00
Bouke Haarsma e3c8db61f3 [1.6.x] Fixed #21264 -- Incorrect RST usage in docs 
Backport of 8fc63087f6 from master
 2013-10-14 08:15:50 -04:00
Max Vizard 8f5ea9d19b [1.6.x] Fixed #21027 -- Updated tutorial 5 docs to link to management shell command page. 
Backport of 13ddf0e002 from master
 2013-10-14 08:10:51 -04: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
Ramiro Morales 503092b09a [1.6.x] Forms docs: More emphasis in 'id' value customizability. 
18ea1c473b form master.
 2013-10-12 13:30:58 -03:00
Tim Graham 8f5d3d16cb [1.6.x] Fixed #15582 -- Documented how TransactionTestCase.multi_db affects fixtures. 
Thanks slinkp for the suggestion.

Backport of dd839a2dfd from master
 2013-10-11 20:12:52 -04:00
Cody Scott f787869d8c [1.6.x] Minor edits to docs/topics/db/queries.txt. 
Backport of 8bfc7cc64c from master
 2013-10-11 15:35:48 -04:00
Cody Scott 2069dfeaef [1.6.x] Small improvements to docs/topics/db/models.txt 
Backport of 695bc0d191 from master
 2013-10-10 20:57:16 -04:00
Claude Paroz 8765eddf2e [1.6.x] Updated auth translation template 2013-10-09 20:21:08 +02:00
Claude Paroz 7a58fde7a6 [1.6.x] Fixed grammar/typos in auth customization docs 
Backport of 1b9c72fc4f from master.
 2013-10-09 16:22:36 +02:00
Russell Keith-Magee 1bf95803f3 [1.6.x] Fixed #21243 -- Corrected exception message in multiple database tests. 
Thanks to vajrasky for the report and patch.

Backport of a971d19 from trunk.
 2013-10-09 09:06:59 +08:00
Dan Loewenherz af46932b57 [1.6.x] Fix grammatical errors in email documentation 
Backport of 43f213e475 from master
 2013-10-08 20:30:43 -04: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
Ramiro Morales 563b5c2000 [1.6.x] Re-added link to SQLite notes from DB section of install doc. 
67f5dffbec from master.
 2013-10-07 07:42:28 -03: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
Ramiro Morales 5252885494 [1.6.x] Fixed #21165 -- Fix test for syndication feed timestamp field on Windows. 
Thanks Michael Manfre for the report, Raphaël Barrois for the patch and
Claude Paroz, Aymeric Augustin for the reviews.

Refs #7936

62dfd79f8b from master.
 2013-10-03 22:50:51 -03:00
Tim Graham e2e7571035 [1.6.x] Fixed #21218 -- Typo on docs/howto/upgrade-version.txt 
Thanks ryan at ryangallen.com for the report.

Backport of 36e220f923 from master
 2013-10-03 20:14:00 -04:00