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

15675 Commits

Author SHA1 Message Date
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 5e1f4656b9 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
Tim Graham 6265885c1e [1.6.x] Post release version bump. 2014-04-28 18:59:49 -04:00
James Bennett 4a6b911fcf [1.6.x] Bump version for 1.6.4 bugfix release. 2014-04-28 15:39:08 -05: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 3776926cfe 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 274bedb928 Removed bad import in last commit. 2014-04-23 09:14:52 -04:00
Tim Graham 6915220ff9 [1.6.x] Fixed #22486 -- Restored the ability to reverse views created using functools.partial. 
Regression in 8b93b31487.

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 11d453bcad 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
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