mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-14 19:30:46 +00:00
Code Issues 32 Releases Wiki Activity
15,799 Commits 29 Branches 437 Tags
Commit Graph

6132 Commits

Author SHA1 Message Date
Tim Graham
b718e292ac [1.6.x] Added 1.6.5 release note for refs #22508. 
Backport of 13087020a9 from master
 2014-05-12 12:44:48 -04:00
Tim Graham
42f8029b36 [1.6.x] Fixed #22613 -- Added formfield_for_choice_field() to the list of methods that InlineModelAdmin supports. 
Backport of 986bd41f8a from master
 2014-05-12 07:01:23 -04:00
Markus Amalthea Magnuson
129c446e86 [1.6.x] Insert space. 
Backport of 8eb51a8cf6 from master
 2014-05-11 16:18:21 -04:00
Ramiro Morales
8ebf38b7a4 [1.6.x] Fix typo in release notes. 2014-05-10 23:22:51 -03:00
Claude Paroz
dd9cedf16a [1.6.x] Updated the messages context processor docs 2014-05-06 20:40:59 +02:00
Tim Graham
f939e25b59 [1.6.x] Fixed #22585 -- Fixed typo in topics/auth/customizing.txt. 
Thanks matt at mattwoodward.com for the report.
 2014-05-06 12:13:55 -04:00
Tim Graham
5783088eec [1.6.x] Fixed #1349 -- Clarified docs on serving files from STATIC/MEDIA_URL. 
Backport of fb7c347f7b from master
 2014-05-05 07:39:08 -04:00
Tim Graham
cddbaca697 [1.6.x] Fixed #22575 -- Fixed typo in docs/topics/class-based-views/generic-editing.txt. 
Thanks adminq80 at gmail.com.

Backport of 87776859af from master
 2014-05-05 06:42:32 -04:00
Anssi Kääriäinen
0e37049636 [1.6.x] Fixed #22429 -- Incorrect SQL when using ~Q and F 
Backpatch of 5e1f4656b98816c96a1cc051224c1b699db480e0 from master.

Conflicts:
	django/db/models/sql/query.py
	tests/queries/models.py
	tests/queries/tests.py
 2014-05-05 13:27:54 +03:00
Claude Paroz
034866204b [1.6.x] Fixed #22565 -- Prevented pgettext_lazy crash with bytestring input 
Thanks ygbo for the report.
Backport of 142c27218 from master.
 2014-05-02 19:38:46 +02:00
Brenda J. Butler
b97b24882c [1.6.x] Fixed #22558 -- Added missing word in contributing docs 
Backport of c8d257e81 from master.
 2014-05-02 08:29:59 +02:00
Claude Paroz
120a981207 [1.6.x] Fixed #22551 -- Made oracle backend method Python 3 compatible 
Thanks fatal10110 at gmail.com for the report. The fix is 1.6-only
because that code has been refactored in 1.7 (6983201cfb).
 2014-05-01 18:15:00 +02:00
Tim Graham
c1692fa25a [1.6.x] Fixed #22547 -- Added some links to tutorial 2. 
Thanks bjb at sourcer.ca for the suggestion.

Backport of b0d032f9fc from master
 2014-04-30 18:26:04 -04:00
Moayad Mardini
2a0f942cbd [1.6.x] Fixed #22546 -- Removed idioms in tutorial 2. 
Thanks bjb at sourcerer.ca for the suggestion.

Backport of 927245ccd8 from master
 2014-04-30 18:02:06 -04:00
Aymeric Augustin
f6e9127483 [1.6.x] Fixed #22523 -- Clarified pytz requirement. 
Thanks z for the report and timo for the proposal.

Backport of 0fb7570 from master
 2014-04-29 08:34:21 +02:00
Tim Graham
2997a20072 [1.6.x] Added stub release notes for 1.6.5. 
Backport of 650065f0ef from master
 2014-04-28 20:38:34 -04:00
Tim Graham
6574e6c183 [1.6.x] Added dates to release notes of today's release. 
Backport of 68d264059a from master
 2014-04-28 19:07:07 -04:00
Claude Paroz
b4b63b3832 [1.6.x] Fixed #22507 -- Clarified nature of the sender argument of signals 
Backport of d1f93e9c1e from master.
 2014-04-25 23:16:59 +02:00
Tim Graham
e9c78435ab [1.6.x] Fixed #22504 -- Corrected domain terminology in security guide. 
Thanks chris at chrullrich.net.

Backport of f65eb15ac6 from master
 2014-04-25 10:29:24 -04:00
Moayad Mardini
2b0e9aa57d [1.6.x] Fixed #22493 - Added warnings to raw() and extra() docs about SQL injection 
Thanks Erik Romijn for the suggestion.

Backport of 3776926cfe503f16c7195621da20c5b89bda70a2 from master
 2014-04-25 09:56:39 -04:00
Malcolm Box
42659ceb3f [1.6.x] Fixed #22516 -- Added versionchanged annotation for STATIC_ROOT default value. 
Backport of 658710be00 from stable/1.7.x
 2014-04-25 09:36:56 -04:00
Tim Graham
d16948bd19 [1.6.x] Fixed #22515 -- Fixed the object_id of the LogEntry that's created after a user password change in the admin. 
Thanks ross at servercode.co.uk for the report.

Backport of 9e7f86b890 from master
 2014-04-25 08:36:28 -04:00
Claude Paroz
a742cf1711 [1.6.x] Renamed Transifex project from django-core to django 
See also http://blog.transifex.com/post/83622601443/new-teams-management-transifex
Backport of 7c24027ba from master.
 2014-04-24 11:52:36 +02:00
Tim Graham
6915220ff9 [1.6.x] Fixed #22486 -- Restored the ability to reverse views created using functools.partial. 
Regression in 8b93b31487d6d3b0fcbbd0498991ea0db9088054.

Thanks rcoup for the report.

Backport of 3c06b2f2a3 from master
 2014-04-23 08:56:13 -04:00
Marti Raudsepp
c5306d4af1 [1.6.x] Various documentation typo/spelling fixes 
Errors detected by Topy (https://github.com/intgr/topy), all changes
verified by hand.

Backport of 11d453bcadad3c9a5ae35882792d0f1e8e8e7818 from master
 2014-04-22 20:13:43 -04:00
Ray Ashman
49f5a29493 [1.6.x] Updated grammar in description of django.contrib.auth. 
Backport of 9853779805 from master
 2014-04-22 18:29:07 -04:00
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
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 c07f3e60c2d455e36ba4ac339d4283d32bbc3814 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 75c0d4ea3ae48970f788c482ee0bd6b29a7f1307 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 54d5c37de6572eae57a66339bb38719e681cee82 from master.
 2014-04-18 15:14:31 +02: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 28102991172ab931d030412275f926c1b05c688d 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 eefad142dee466c1ead6038fbeec75479b1afead 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 465980d070a33555cdabb4787db50a4e23228de2 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
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
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
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