Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity
18,739 Commits 26 Branches 382 Tags
Commit Graph

18739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Graham
01c00dc631 [1.7.x] Fixed possible "RuntimeError: maximum recursion depth exceeded" building docs. 
Backport of 6a71ac61bd8ebd57f036e076a4f7f29cf2d88c00 from master
 2016-02-16 09:37:01 -05:00
Ramon Moraes
6a6ef95be8 [1.7.x] Updated xhtml2pdf URL in docs. 2016-02-16 07:06:01 -05:00
Tim Graham
82e651e948 [1.7.x] Fixed typo docs/ref/models/relations.txt 
Backport of dfd4bd5fc5236d6e237c60be8599bb6fff6b0bc0 from stable/1.8.x
 2015-11-30 18:49:54 -05:00
Tim Graham
2d66d04e73 [1.7.x] Bumped version for 1.7.11 release. 1.7.11 2015-11-24 11:30:11 -05:00
Tim Graham
e6c631e68e [1.7.x] Added release date for 1.7.11 release. 2015-11-24 10:48:46 -05:00
Florian Apolloner
8a01c6b531 [1.7.x] Fixed a settings leak possibility in the date template filter. 
This is a security fix.
 2015-11-16 21:06:32 -05:00
Tim Graham
3bd43598f7 [1.7.x] Refs #23751 -- Added some unicode characters to the latex preamble. 
Thanks Graham Wideman for the patch.

Backport of a80d70dd10f3c7d483579734e524c94c62832070 from master
 2015-11-16 20:41:10 -05:00
Tim Graham
904c47bc06 [1.7.x] Fixed #23751 -- Fixed code snippet formatting in docs PDF. 
Thanks Graham Wideman for the patch.

Backport of e48a5b5a03181b3ada6183595eb6e1c599a9657a from master
 2015-11-16 20:41:06 -05:00
Tim Graham
a4973c8f28 [1.7.x] Bumped mysqlclient test requirement to >= 1.3.7. 
mysqlclient 1.3.7 fixes the test failures caused by 1.3.6.

Backport of 2514e044a7fce58176c4e79eec298f3d8f70e89b from master
 2015-11-12 21:35:30 -05:00
Simon Charette
fd1426570e [1.7.x] Refs #25693 -- Added a regression test for to_attr validation on forward m2m. 
Backport of cc8c02fa0fa2119704d1c39ca8509850aef84acc from master
 2015-11-11 12:42:53 -05:00
Simon Charette
3d037b9f68 [1.7.x] Refs #25693 -- Avoided redundant calls to get_fields() in to_attr validation. 
Conflicts:
	django/db/models/query.py

Backport of cc8c02fa0fa2119704d1c39ca8509850aef84acc from master
 2015-11-11 12:36:59 -05:00
Ian Foote
6184cb9baa [1.7.x] Fixed #25693 -- Prevented data loss with Prefetch and ManyToManyField. 
Thanks to Jamie Matthews for finding and explaining the bug.

Backport of 4608573788c04fc047da42b4b7b48fdee8136ad3 from master
 2015-11-11 00:58:53 -05:00
Tim Graham
85a41b449b [1.7.x] Fixed #23985 -- Documented a backwards incompatible change in URLValidator. 
Backport of 8c5b8018f69226389a1373523c41cd37883c9556 from master
 2015-10-29 18:07:09 -04:00
Tim Graham
afcbdf2805 [1.7.x] Documented Python 3.5 support for Django 1.8. 
Backport of d27085b02d58ecf8b72e7189b6a5feaf634ec977 from stable/1.8.x
 2015-10-26 10:17:21 -04:00
Nick Williams
e03fe2f6bb [1.7.x] Fixed link to the MySQL Connector/Python Django Backend documentation. 
Backport of 3f342d74e9196da475dd312cf43eaffec13af964 from master
 2015-10-02 12:34:11 -04:00
Tim Graham
5172bb9eec [1.7.x] Documented auth's login/logout function parameters. 
Backport of c14b6b52ff131db263bf06a02f903a73390975da from master
 2015-09-28 14:13:02 -04:00
Tim Graham
8f42934f86 [1.7.x] Refs #24361 -- Corrected documented level of the 'django' logger. 
The logger doesn't define an explicit level, therefore it defaults
to WARNING.

Backport of 4a06a904dcd27388ec9a3cfb2bc8a8421bb44816 from stable/1.8.x
 2015-09-23 11:22:28 -04:00
Tim Graham
fc94944183 [1.7.x] Added a version requirement to python-memcached in test requirements. 
Backport of 12a62e7e4b8e6d1136aa4457619449cbbcf9dd7c from master
 2015-09-17 15:12:06 -04:00
Tim Graham
5c603a178b [1.7.x] Added a version requirement to mysqlclient in test requirements. 
Backport of fc8a6a9b002aef90ff68f3d95e560db1ea728c76 from master
 2015-09-17 15:11:48 -04:00
David Sanders
9cc6a606c6 [1.7.x] Added default value for default kwargs for QueryDict. 
Backport of 48c420d99209b147b58d7b873d1b54f76249c8dc from master
 2015-09-05 08:22:35 -04:00
Tim Graham
2d2eeff3b1 [1.7.x] Refs #25144 -- Revised deprecation timeline: migrations won't become compulsory. 
Backport of e133b55943f26e87cff5b22215a776a9ce3fc6f3 from master
 2015-09-04 09:59:49 -04:00
Tim Graham
c0f9957cea [1.7.x] Fixed typo in tests/migrations/test_autodetector.py. 
Backport of 01966bb2a779f68d1a371acb1bf814fac7bb5132 from master
 2015-08-20 14:52:41 -04:00
Markus Holtermann
6c61cea83a [1.7.x] Fixed style issues in testing docs 
Backport of f33607ce0b744794f6ceafa1dddffbcb32e90978 from master
 2015-08-19 21:57:57 +10:00
Tim Graham
665b9eb5e2 [1.7.x] Post-release version bump. 2015-08-18 13:30:35 -04:00
Tim Graham
abb8dda6c9 [1.7.x] Bumped version for 1.7.10 release. 1.7.10 2015-08-18 08:38:33 -04:00
Tim Graham
2f5485346e [1.7.x] Fixed DoS possiblity in contrib.auth.views.logout() 
Refs #20936 -- When logging out/ending a session, don't create a new, empty session.

Previously, when logging out, the existing session was overwritten by a
new sessionid instead of deleting the session altogether.

This behavior added overhead by creating a new session record in
whichever backend was in use: db, cache, etc.

This extra session is unnecessary at the time since no session data is
meant to be preserved when explicitly logging out.

Backport of 393c0e24223c701edeb8ce7dc9d0f852f0c081ad,
088579638b160f3716dc81d194be70c72743593f, and
2dee853ed4def42b7ef1b3b472b395055543cc00 from master

Thanks Florian Apolloner and Carl Meyer for review.

This is a security fix.
 2015-08-18 08:24:51 -04:00
Tim Graham
95af894668 [1.7.x] Added stub release notes for security releases. 2015-08-18 08:24:46 -04:00
Tim Graham
16b1be70ab [1.7.x] Fixed typo in docs/ref/contrib/gis/geoquerysets.txt 
Backport of 56ed80ac2a7dac6dc26754f7fe95941e8a6f124e from master
 2015-08-11 09:33:50 -04:00
Tim Graham
64a118c1eb [1.7.x] Fixed #25224 -- Fixed typo in docs/ref/contrib/flatpages.txt 
Backport of 28cb272a7279e6dfc4d5c53838ebf7343c3e66b5 from master
 2015-08-04 14:52:30 -04:00
Claude Paroz
9efddb7f3e [1.7.x] Updated GeoIP test for newer versions 
Backport of 3f9dca62cb31a2b4b279b7d312a850660d21e91f from master
 2015-07-30 18:17:13 -04:00
Tim Graham
4fc5b487a8 [1.7.x] Fixed #25183 -- Fixed non-deterministic GeoIP test. 
google.com doesn't always resolve to an IP inside the United States.

Backport of 5b6ca150730cddb09ff8622d49b273d57b9c6703 from master
 2015-07-30 18:12:42 -04:00
Tim Graham
0f4f75a308 [1.7.x] Fixed #25199 -- Fixed dead link to HTMLdoc. 
Backport of e176de25127a2750ea1c6a705b2c0983b5782b41 from master
 2015-07-30 13:26:40 -04:00
jorgecarleitao
b492921cf8 [1.7.x] Fixed typo in docs/ref/middleware.txt 
Backport of 7c642cafbb9e9ab1ba3ee7bb3d8fe1c0a58e06e8 from master
 2015-07-27 07:18:28 -04:00
Ali Vakilzade
50ca151276 [1.7.x] Fixed signature of ModelAdmin.get_paginator() in docs. 
Backport of ecf4ed246ae192f8d381b799b921a892fd7afa85 from master
 2015-07-20 08:08:32 -04:00
Tim Graham
eba3ec90ea [1.7.x] Added 1.4.22 release notes. 
Backport of 427a49f9e996d5d7712472ce287b80857086ee02 from master
 2015-07-14 07:28:04 -04:00
Tim Graham
baebfe6860 [1.7.x] Post-release version bump. 2015-07-08 16:01:31 -04:00
Tim Graham
0cbe3c63af [1.7.x] Bumped version for 1.7.9 release. 1.7.9 2015-07-08 07:36:17 -04:00
Tim Graham
ae49b4d994 [1.7.x] Prevented newlines from being accepted in some validators. 
This is a security fix; disclosure to follow shortly.

Thanks to Sjoerd Job Postmus for the report and draft patch.
 2015-07-08 07:35:43 -04:00
Carl Meyer
1828f4341e [1.7.x] Fixed #19324 -- Avoided creating a session record when loading the session. 
The session record is now only created if/when the session is modified. This
prevents a potential DoS via creation of many empty session records.

This is a security fix; disclosure to follow shortly.
 2015-07-08 07:35:39 -04:00
Tim Graham
9eda28ac48 [1.7.x] Added security release note stubs. 2015-07-08 07:35:17 -04:00
Luke Plant
f23656cd1a [1.7.x] Corrected example code for get_query_set upgrade in 1.6 release notes 
The conditional setting of `get_query_set` is required for correct behaviour
if running Django 1.8. The full gory details are here:

http://lukeplant.me.uk/blog/posts/handling-django%27s-get_query_set-rename-is-hard/

Backport of f87e552d9842ff9591a9c51ebdb5f96e4dd54b00 from master
 2015-07-08 11:07:52 +01:00
Tim Graham
2baf6826c9 [1.7.x] Backported .gitignore and .hgignore from master. 2015-07-01 10:32:24 -04:00
Marten Kenbeek
9bd3a2325e [1.7.x] Refs #23621 -- Fixed warning message when reloading models. 
Backport of aabb58428beae0bd34f32e5d620a82486b670499 from master
 2015-06-30 15:01:28 -04:00
Tim Graham
1efda84a95 [1.7.x] Corrected Python version support info in docs/topics/install.txt 2015-06-17 11:30:43 -04:00
Tim Graham
207da07d59 [1.7.x] Fixed #24903 -- Fixed assertRaisesMessage on Python 2.7.10. 
A regression found in in Python 2.7.10 rc1 wasn't reverted for the final
release: https://bugs.python.org/issue24134

Backport of two commits from master:
* c2bc1cefdcbbf074408f4a4cace88b315cf9d652
* e89c3a46035e9fe17c373a6c9cd63b9fd631d596
 2015-06-09 16:14:49 -04:00
argaen
7ae53e7480 [1.7.x] Fixed import in docs/ref/contrib/syndication.txt 
Backport of 1725d009918e7d37390d5abd34034f3defca5fc3 from master
 2015-06-09 12:38:10 -04:00
Andriy Sokolovskiy
927d90ee1e [1.7.x] Fixed #24817 -- Prevented loss of null info in MySQL field renaming. 
Backport of 80ad5472ce4b6ba6e94227422d0727371e97cdf0 from master
 2015-05-28 10:26:27 -04:00
I am Clinton
8bb369ef63 [1.7.x] Fixed mistakes in docs/topics/forms/formsets.txt examples. 
Backport of 9c8a2ab81db1fa999862034d9e8e9e1d091a72e5 from master
 2015-05-22 11:30:13 -04:00
latyas(懒)
198ad25a03 [1.7.x] Fixed typo in docs/ref/contrib/admin/index.txt 
Backport of 8b106cfaa07dc04ad27a1a90c1eb03af80111695 from master
 2015-05-20 09:03:33 -04:00
Tim Graham
3908c3cb71 Reverted "[1.7.x] Made minor edits to docs/intro/tutorial01.text" 
This reverts commit ba4237c3b31906aa7cf1c2ec02751b878c962c53.

Claude asked that these fixes not be backported as they affect translations.
 2015-05-19 13:00:45 -04:00