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

15651 Commits

Author SHA1 Message Date
Tim Graham 362ce5e936 [1.6.x] Added 1.6.4 release note stub. 
Backport of 9fb95dfc9f from master
 2014-04-22 11:49:29 -04:00
Tim Graham a937687633 [1.6.x] Post release version bump. 2014-04-22 11:49:21 -04:00
Florian Apolloner 6ec346ba7b [1.6.x] Fixed #22426 -- Added support old-style d.c.messages format. 
Forward ported code from 1.5 that adds backwards compatibility with legacy message length.
See commit 9e7183073f for details.

Thanks to Ofir Ovadia for the initial patch.

Backport of f286721f7f from master
 2014-04-22 10:48:11 +02:00
James Bennett 7bb9bebe47 [1.6.x] Add missing disclosure information to security archive. 2014-04-21 18:29:05 -05:00
James Bennett 3f1abbfc40 [1.6.x] Update for 1.6.3 security release. 2014-04-21 18:10:57 -05:00
Erik Romijn d63bfb14dd [1.6.x] Added information on resolved security issues to release notes. 
Backport of c07f3e60c2 from master
 2014-04-21 18:30:27 -04:00
Erik Romijn 5f0829a27e [1.6.x] Fixed queries that may return unexpected results on MySQL due to typecasting. 
This is a security fix. Disclosure will follow shortly.

Backport of 75c0d4ea3a from master
 2014-04-21 18:30:27 -04:00
Aymeric Augustin d63e20942f [1.6.x] Prevented leaking the CSRF token through caching. 
This is a security fix. Disclosure will follow shortly.

Backport of c083e3815a from master
 2014-04-21 18:30:27 -04:00
Tim Graham 4352a50871 [1.6.x] Fixed a remote code execution vulnerabilty in URL reversing. 
Thanks Benjamin Bach for the report and initial patch.

This is a security fix; disclosure to follow shortly.

Backport of 8b93b31487 from master
 2014-04-21 18:30:27 -04:00
Matt Lauber 25adac9b42 [1.6.x] Corrected the section identifier for MySQL unicode reference. 
Backport of b2514c02e1 from master
 2014-04-21 13:20:51 -04:00
Tim Graham 1b43131b5d [1.6.x] Moved RemoteUserBackend documentation to reference guide. 
Backport of 26d118c3fe from master
 2014-04-18 16:11:10 -04:00
Moayad Mardini b6863879e1 [1.6.x] Fixed #22458 -- Added a note about MySQL utf8_unicode_ci collation 
Thanks tobami at gmail.com for the report.

Backport of 11ac50b18e from master
 2014-04-18 15:11:14 -04:00
Tim Graham 839deb7a77 [1.6.x] Fixed #22473 -- Emphasized that Model.clean() is not called from Model.save(). 
Backport of b43bbd6d39 from master
 2014-04-18 15:03:30 -04:00
Tim Graham 9e28bfb324 [1.6.x] Added some missing items to the 1.6.3 release notes. 
Backport of c2b269df6e from master
 2014-04-18 10:32:53 -04:00
Erik Romijn 8e5ce99d83 [1.6.x] Fixed #22471 -- Corrected misprint in i18n docs 
Backport of 54d5c37de6 from master.
 2014-04-18 15:14:31 +02:00
Tim Graham fa60ac76c0 [1.6.x] Fixed #22454 - Changed compatibility warning hint for test runner. 
Backport of 214d1e1b0f from master
 2014-04-17 20:47:54 -04:00
Ben Davis e093060823 [1.6.x] Fixed #22220 -- Added more examples to reverse() documention. 
Thanks EvilDMP for the suggestions.

Backport of 030dd4f72c from master
 2014-04-16 20:31:09 -04:00
Jordi Yeh 82803611eb [1.6.x] Fixed #22457 -- Fixed contributing guide w/o github set-up 
The published commnand was not working when the user did not have
the git client set-up with the public-key. Changed the contributing
guide to clone it from https instead.

Backport of 2810299117 from master.
 2014-04-16 09:42:02 -04:00
Tim Graham 20dbbc5fa2 [1.6.x] Fixed #22453 -- Corrected DoesNotExist message in docs. 
Thanks Eugenio Cano-Manuel.

Backport of eefad142de from master
 2014-04-16 08:38:04 -04:00
Tim Graham 9510e96da6 [1.6.x] Added a note regarding django.contrib.auth.authenticate. 
Thanks Josh Brown for the suggestion.

Backport of ae5b662796 from master
 2014-04-16 07:49:38 -04:00
Tim Graham a476b15aa5 [1.6.x] Added RemoteUserMiddleware to middleware reference page. 
Backport of 465980d070 from master.
 2014-04-16 07:30:50 -04:00
Tim Graham 724ccd2ec1 [1.6.x] Fixed #22392 -- Corrected deployment instructions for Apache 2.4. 
Thanks zjcheah at yahoo.com for the report.

Backport of 0f37d2e4c0 from master
 2014-04-15 17:45:52 -04:00
valtron 1252b77824 [1.6.x] Fixed #21760 -- prefetch_related used an inefficient query for reverse FK. 
Regression introduced by commit 9777442. Refs #21410.

Conflicts:
	tests/prefetch_related/tests.py

Backport of d3b71b976d from master
 2014-04-13 01:06:03 +07:00
Aymeric Augustin a357079892 Improved a comment. Thanks intgr for the report. 2014-04-11 23:03:54 +02:00
Tim Graham d501c79f7b [1.6.x] Fixed #22419 -- Typo in docs/topics/db/multi-db.txt. 
Thanks Josh Kupershmidt.

Backport of c487b1e230 from master
 2014-04-10 19:34:25 -04:00
Aymeric Augustin 80f6cbbadb [1.6.x] Increased robustness of 58161e4e. Refs #22291. 
Backport of ee837b9a from master
 2014-04-10 23:22:13 +02:00
Aymeric Augustin 1d3d2b9a24 [1.6.x] Fixed #21202 -- Maintained atomicity when the server disconnects. 
Thanks intgr for the report.

This commit doesn't include a test because I don't know how to emulate a
database disconnection in a cross-database compatible way.

Also simplified a 'backends' test that was constrained by this problem.

Backport of 81761508 from master
 2014-04-10 23:22:13 +02:00
Aymeric Augustin 4ea02bdb0d [1.6.x] Fixed #21239 -- Maintained atomicity when closing the connection. 
Refs #15802 -- Reverted #7c657b24 as BaseDatabaseWrapper.close() now
has a proper "finally" clause that may need to preserve self.connection.

Backport of 25860096 from master.
 2014-04-10 23:22:13 +02:00
Aymeric Augustin 746cded010 [1.6.x] Fixed #22321 -- Wrapped exceptions in _set_autocommit. 
Refs #21202.

Backport of 3becac84 from master
 2014-04-10 23:21:55 +02:00
Aymeric Augustin 9afedbef42 [1.6.x] Fixed #22291 -- Avoided shadowing deadlock exceptions on MySQL. 
Thanks err for the report.

Backport of 58161e4e from master.
 2014-04-10 23:05:09 +02:00
Tim Graham de95867284 [1.6.x] Fixed #21353 -- Noted that description is ignored for TabularInlines. 
Thanks nofinator for the report.

Backport of d5031ecf88 from master
 2014-04-10 13:33:34 -04:00
John Paulett 129cb7e222 [1.6.x] Fixed #22364 -- Sanitized getpass input in changepassword. 
Python 2 getpass on Windows does not accept unicode, even
when containing on ASCII characters. Related #190807.

Backport of b5a9166f7e from master
 2014-04-10 13:16:08 -04:00
Carl Meyer 728fd27c00 [1.6.x] Fixed #22412 -- More nuanced advice re template filters and exceptions. 
Thanks Tim for review.

Backport of 7e3834adc9 from master
 2014-04-10 06:19:15 -04:00
Aymeric Augustin e68c084ed1 Fixed a broken test introduced in 6fa7d7c5. Refs #21553. 
Thanks Shai.
 2014-04-10 07:51:04 +02:00
Shai Berger d5cef2a19c [1.6.x] Documentation fixes for the select_for_update change. 
Refs #22343; thanks Tim Graham for the fixes.
 2014-04-10 03:44:45 +03:00
Shai Berger 690a5984a3 [1.6.x] Fixed #22343 -- Disallowed select_for_update in autocommit mode 
The ticket was originally about two failing tests, which are
fixed by putting their queries in transactions.

Thanks Tim Graham for the report, Aymeric Augustin for the fix,
and Simon Charette, Tim Graham & Loïc Bistuer for review.

Backport of b990df1d63 from master
 2014-04-10 02:15:14 +03:00
Aymeric Augustin 6fa7d7c594 [1.6.x] Fixed #21553 -- Ensured unusable database connections get closed. 
Backport of 5f2f47f from master
 2014-04-09 22:54:39 +02:00
ejstronge 32529e6432 [1.6.x] Fixed small typo in django-admin.txt 
The word 'by' seemed to be missing from the first line of the compilemessages command.

Backport of 5ca522b9ed from master
 2014-04-09 07:13:45 -04:00
Anubhav Joshi 23526d2f48 [1.6.x] Fixed #16205 -- Added an installation for Windows. 
Backport of d35d2f61c5 from master
 2014-04-08 11:29:02 -04:00
Vishal Lal 1cce00a762 [1.6.x] Fixed #22372 -- Improved description of WizardView.get_context_data(). 
Thanks simon29 for the report.

Backport of a8e2ec0e82 from master
 2014-04-03 08:28:02 -04:00
Ramiro Morales bd5965ce68 [1.6.x] Document removal of GeoDjangoTestSuiteRunner in 1.6 release notes. 
e6ced2bb08 from master.
 2014-04-02 17:18:56 -03:00
Patrick Michaud 73474df954 Fixed #22256 -- Replaced bad fallback for missing PATH 
Thanks Baptiste Mispelon for the review.
Backport of acee46fc9 from master.
 2014-04-01 20:45:12 +02:00
Loic Bistuer 07e2a56814 [1.6.x] Fixed #22360 -- Fixed two non-deterministic tests in Python 3.4. 
The order of admin's changelist filters in the querystring relied on
dict ordering.

Backport of 4d996b8e69 from master
 2014-03-31 08:24:12 -04:00
Tim Graham f0d03d41be [1.6.x] Replaced urllib/urlparse imports with from django.utils.six.moves. 
Backport of 981b864fbd from master
 2014-03-31 07:55:33 -04:00
Loic Bistuer a5297c1ef4 [1.6.x] Fixed #21795 -- Made add_preserved_filters account for url prefixes. 
Thanks to trac username honyczek for the report. Refs #6903.

Backport of 4339e9a92d from master
 2014-03-31 07:29:08 -04:00
Tim Graham 916f0de74b [1.6.x] Added 1.6.3 release note for refs #22250. 
Backport of d57ba04d89 from master
 2014-03-31 07:12:16 -04:00
Ramiro Morales c0882fefca [1.6.x] Corrected an import in a model form docs example. 
422f5d9a2c from master.
 2014-03-30 20:37:02 -03:00
Tim Graham 059bc7eb60 [1.6.x] Fixed #22338 -- Fixed a test dependent on dictionary key iteration order. 
Backport of 69a4f383f6 from master
 2014-03-30 14:27:11 -04:00
Tim Graham 30ba506e97 [1.6.x] Fixed #21858 -- Clarified 1.6 release note regarding M2M help text changes. 
Thanks lee at semel.net for the report.

Backport of f30e6590f4 from master
 2014-03-29 10:23:28 -04:00
Anssi Kääriäinen 31892af3f0 [1.6.x] Fixed #22250 -- regression in gis compiler for non-concrete fields 
Thanks to gwahl@fusionbox.com for the report.

Backport of 21f208e66e from master
 2014-03-29 08:29:38 +02:00