mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
15,735 Commits 30 Branches 460 Tags
85f9745807ea0042225aaf4472fb63a00f3e2bcc
Commit Graph

15735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tim Graham
f659c8e13a [1.6.x] Added Python 3.4 support notes. 
Backport of 306deab2c7 from master
 2014-03-27 08:14:39 -04:00
Tim Martin
fe83cfe9ed [1.6.x] Fixed #21941 -- Documented the kwargs param of django.conf.urls.url(). 
Thanks cjerdonek for the report.

Backport of a779757706 from master
 2014-03-27 07:02:06 -04:00
Tim Graham
c0a9c2f72a [1.6.x] Fixed #22322 -- Fixed incorrect explanation of what managed=False does. 
refs #14305.

Thanks Adrian Klaver for the report.

Backport of 9b7ba8af1b from master
 2014-03-25 14:10:29 -04:00
Adam Kaliński
38096da5c0 [1.6.x] Fixed #22048 - Enhanced docs to cover nonexistent one-to-one relationships. 
Thanks EvilDMP for the suggestion.

Backport of ec08d62a20 from master
 2014-03-24 09:45:56 -04:00
Tim Graham
90916e1708 [1.6.x] Fixed #22247 -- Replaced "upstream" with "downstream" in cache docs. 
Thanks valgarv at gmx.net for the report.

Backport of 60d2dde286 from master
 2014-03-24 09:19:50 -04:00
Tim Graham
7af32bca38 [1.6.x] Fixed #21665 -- Documented that changes in assertRedirects may be required given new URL escaping behavior. 
Thank pdc for the report.

Backport of 62e81bc00b from master
 2014-03-24 09:09:23 -04:00
Tim Graham
779ef57c37 [1.6.x] Updated six to 1.6.1. 
Backport of 2ec82c7387 from master
 2014-03-24 07:34:22 -04:00
Claude Paroz
d908b67e81 [1.6.x] Fixed #22317 -- Fixed documented handler400 default value 
Backport of 3f7615cddc from master.
 2014-03-23 21:20:43 +01:00
Claude Paroz
c9b2feffee [1.6.x] Tweaked strip_tags tests to pass on Python 3.3 
Backport of 6a0291bda from master.
 2014-03-22 15:05:28 +01:00
Claude Paroz
f05f5c231a [1.6.x] Removed a strip_tags test for older Python versions 
Django's custom HTMLParser for older Python versions cannot
parse convoluted syntax.
 2014-03-22 14:21:35 +01:00
Claude Paroz
5f7b3e56ce [1.6.x] Added release note about strip_tags improvement 
Backport of 1c8dbb0cc from master.
 2014-03-22 12:37:06 +01:00
Claude Paroz
d1503afd66 [1.6.x] Improved strip_tags and clarified documentation 
The fact that strip_tags cannot guarantee to really strip all
non-safe HTML content was not clear enough. Also see:
https://www.djangoproject.com/weblog/2014/mar/22/strip-tags-advisory/
Backport of 6ca6c36f8 from master.
 2014-03-22 11:07:27 +01:00
Aymeric Augustin
c8c2d60614 [1.6.x] Small doc changes missed in 66076268. 
Partial backport of 253e8ac2 from master.
 2014-03-21 22:11:50 +01:00
Tim Graham
0726482c9d [1.6.x] Replaced an instance of PIL with Pillow in the docs. 
Backport of 563d6a6bba from stable/1.7.x
 2014-03-21 11:25:18 -04:00
Anubhav Joshi
a01daaf231 [1.6.x] Fixed #22253 -- Added django-i18n to the mailing lists docs. 
Thanks bmispelon for the suggestion.

Backport of 0399523cf1 from master
 2014-03-19 07:23:41 -04:00
Daniel Pyrathon
9f7bd83184 [1.6.x] Fixed #22242 -- Documented common cookie size limit. 
Backport of 885e7adf56 from master
 2014-03-16 10:47:08 -04:00