mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-30 12:09:25 +00:00
Code Issues 32 Releases Wiki Activity
20,357 Commits 29 Branches 430 Tags
Commit Graph

20357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Roseman
4cc0baa98e [1.8.x] Fixed #25079 -- Added warning if both TEMPLATES and TEMPLATE_* settings are defined. 
Django ignores the value of the TEMPLATE_* settings if TEMPLATES is also
set, which is confusing for users following older tutorials. This change
adds a system check that warns if any of the TEMPLATE_* settings have
changed from their defaults but the TEMPLATES dict is also non-empty.

Removed the TEMPLATE_DIRS from the test settings file; this was marked
for removal in 1.10 but no tests fail if it is removed now.

Backport of 24620d71f2116da31abe6c9391f7bc807ac23c0b from master
 2015-07-13 17:55:19 -04:00
Yosuke Yasuda
269315d81a [1.8.x] Fixed #25108 -- Fixed a test which failed on Pillow 2.9+ 
Backport of a2b999dfcac9bc92513a36ec6b3033ded1561c66 from master
 2015-07-13 14:59:02 -04:00
Chris McCollister
f8140c4679 [1.8.x] Fixed #24984 -- Added link to Jinja2 static tag instructions in staticfiles docs. 
Backport of d62194a260eedd30aeea78f407032aabfde4be70 from master
 2015-07-13 07:38:42 -04:00
Matthew Madurski
cdae9d8cae [1.8.x] Fixed #25103 -- Corrected versionadded for FileResponse 
Backport of 0b02ce54cf58f96811a625245e374e6cd10e28af from master
 2015-07-10 13:48:48 -04:00
Tim Graham
ad3a895432 [1.8.x] Fixed #25082 -- Documented where to register system checks. 
Backport of 074a82f49b1443e66885ea861bbd2d2cb04af43e from master
 2015-07-10 10:38:38 -04:00
Nick Sweeting
2733c32ba9 [1.8.x] Fixed #25083 -- Added SessionAuthenticationMiddleware to auth installation docs 
Backport of f0857c09fb51b21afb3e55da53bce962466af6d3 from master
 2015-07-10 08:41:18 -04:00
Lukas Hetzenecker
ebcfedb0e5 [1.8.x] Fixed #25019 -- Added UUID support in DjangoJSONEncoder 
Backport of 6355a6d4f5 and 2e05ef4e18 from master.
 2015-07-10 09:02:14 +02:00
Claude Paroz
0db2cdb1fa [1.8.x] Added stub release notes for 1.8.4 
Backport of 846cb6fef7 from master.
 2015-07-10 08:52:46 +02:00
Tim Graham
340c410d58 [1.8.x] Fixed #25048 -- Documented that runservers strips headers with underscores. 
refs 316b8d49746933d1845d600314b002d9b64d3e3d

Backport of 7b6d3104f263d9483982928604b2e51f06126ec1 from master
 2015-07-09 09:11:02 -04:00
Tim Graham
fe367db35f [1.8.x] Post-release version bump. 2015-07-08 16:00:59 -04:00
Tim Graham
4217f1cdeb [1.8.x] Bumped version for 1.8.3 release. 1.8.3 2015-07-08 15:23:19 -04:00
Shai Berger
8f9a4d3a2b [1.8.x] Fixed catastrophic backtracking in URLValidator. 
Thanks João Silva for reporting the problem and Tim Graham for finding the
problematic RE and for review.

This is a security fix; disclosure to follow shortly.
 2015-07-08 15:23:19 -04:00
Tim Graham
574dd5e0b0 [1.8.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 15:23:18 -04:00
Carl Meyer
66d12d1aba [1.8.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 15:23:18 -04:00
Tim Graham
64e8a5f1bb [1.8.x] Added security release note stubs. 2015-07-08 15:23:18 -04:00
Tim Graham
2dbef35714 [1.8.x] Removed a confusing sentence in tutorial 5. 
Backport of bdfce4db21d3a414dac4e7cd874fae655ce142de from master
 2015-07-08 15:12:24 -04:00
Luke Plant
5e1fa14006 [1.8.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:05:37 +01:00
Chris Bainbridge
b252e0f350 [1.8.x] Refs #23882 -- Added detection for moved files when using inotify polling 
Commit 15f82c7 ("used pyinotify as change detection system when
available") introduced a regression where editing a file in vim with
default settings (writebackup=auto) no longer causes the dev server
to be restarted. On a write, vim moves the monitored file to a backup
path and then creates a new file in the original. The new file is not
monitored as it has a different inode. Fixed this by also watching for
inotify events IN_DELETE_SELF and IN_MOVE_SELF.

Backport of e5cfa394d79b6ab1b412bd3b30c6a433b415d56b from master
 2015-07-07 12:26:36 -04:00
Andriy Sokolovskiy
6840aaf3c1 [1.8.x] Replaced try..except blocks by context manager in custom lookups tests 
Backport of 13dca01af02e91f25ae1d96b09b857993714c96d from master
 2015-07-07 12:04:21 -04:00
Alexey Sveshnikov
8c417564c7 [1.8.x] Fixed #25059 -- Allowed Punycode TLDs in URLValidator 
Backport of bc98bc56a52860688ea0ae2ec7b9e59ddb72a811 from master
 2015-07-06 15:11:43 -04:00
Tim Graham
73cbf08159 [1.8.x] Fixed #25051 -- Clarified return type of {% now %} tag. 
Backport of a871cf422d8f7a15d3029684538136e0c92f99dc from master
 2015-07-04 08:49:05 -04:00
Luke
e2acbfb69b [1.8.x] Fixed mistake in Model.from_db() example. 
Backport of fd869cceacafdaf2c5865cc525f88357b6a26aad from master
 2015-07-03 09:09:38 -04:00
Michael Manfre
342074f4a4 [1.8.x] Fixed #25055 -- Made m2m long name testing friendlier for 3rd party databases. 
Backport of f9c3587b51487179cf3fb92b509790f4610d6012 from master
 2015-07-03 09:00:36 -04:00
Tim Graham
cb3e9bc0d7 [1.8.x] Fixed #25056 -- Documented minimum version of jinja2 for testing. 
Backport of ca58181bac5366d3a1fb44e1b49fe9e365095138 from master
 2015-07-03 08:22:34 -04:00
Tim Graham
92e1ace575 [1.8.x] Backported .gitignore and .hgignore from master. 2015-07-01 10:31:13 -04:00
Tim Graham
08b0b81a6a [1.8.x] Fixed #25041 -- Clarified difference between syncdb and migrate. 2015-07-01 10:15:29 -04:00
Claude Paroz
805e5b88e0 [1.8.x] Fixed typo in writing migrations docs 
Backport of 3d7a713156 from master.
 2015-07-01 09:17:10 +02:00
Marten Kenbeek
42aa919de9 [1.8.x] Refs #23621 -- Fixed warning message when reloading models. 
Backport of aabb58428beae0bd34f32e5d620a82486b670499 from master
 2015-06-30 15:01:22 -04:00
Tim Graham
fdaf9359ab [1.8.x] Fixed #25038 -- Reverted incorrect documentation about inspectdb introspecting views. 
This reverts commit e69eea73d94c058728143416058a6257c765a9b8 (refs #24177).
 2015-06-30 14:25:45 -04:00
Tim Graham
8922266a8d [1.8.x] Fixed #25033 -- Added context_processors.auth to documented admin dependencies. 
Backport of f59667c121272ba7a1161e8bc4787654d929f6f1 from master
 2015-06-27 14:27:28 -04:00
Noam
fd61ce3817 [1.8.x] Fixed #25031 -- Fixed a regression in the unordered_list template filter. 
Backport of e291fc4757e952fd4f663d88adca416b016db13e from master
 2015-06-27 09:39:29 -04:00
Jason Hoos
4296801463 [1.8.x] Fixed #24958 -- Fixed inline forms using UUID-PK parents with auto-PK children. 
Backport of a50b66da30320887c23c73927f6b2ab41e0301bf from master
 2015-06-26 09:15:59 -04:00
薛丞宏
a97e50c5e6 [1.8.x] Fixed #25016 -- Reallowed non-ASCII values for ForeignKey.related_name on Python 3. 
Backport of d3e12c901777697b7bf08b25e2dd46f0b951db8c from master
 2015-06-26 08:35:13 -04:00
Marten Kenbeek
ae93aeed2b [1.8.x] Refs #24127 -- Added documentation for HttpRequest.current_app. 
Backport of 6364df68879efc0d9451d6427e34b4542e3d7e0b from master
 2015-06-25 14:11:16 -04:00
Tim Graham
ae1d663b79 [1.8.x] Renamed RemovedInDjango20Warning to RemovedInDjango110Warning. 2015-06-23 07:22:16 -04:00
Wim Feijen
7439039806 [1.8.x] Updated indentation of example template in docs/topics/i18n/translation.txt. 
Backport of 514b69cb9e1ec08f22f04a6a2ed29b130cb42258 from master
 2015-06-22 15:42:30 -04:00
Tim Graham
252867ed2a [1.8.x] Fixed #25001 -- Doc'd caveat about collectstatic and removing INSTALLED_APPS. 
Thanks aRkadeFR for the initial patch.

Backport of 5ae0dd6abf8f93b90c962e62b04c675fdd6ca755 from master
 2015-06-22 12:44:34 -04:00
Tim Graham
bb8f69e901 [1.8.x] Simplified wording of Python support policy. 
Backport of 256aebbdaad1a82ae55fc2e59df9064cb90a61c3 from master
 2015-06-22 12:20:20 -04:00
Bipin Suresh
6aa618bae3 [1.8.x] Fixed #24983 -- Clarified contrib.sites Site.domain is fully qualified. 
Backport of 34047b23e284fd3459903294a5776b67c3e33ed9 from master
 2015-06-22 09:41:18 -04:00
Tim Graham
5cc1f13d15 [1.8.x] Fixed #25010 -- Documented APP_DIRS default in startproject's settings.py 
Backport of 4a6656488893b6a832726cade2d2c5aa04f85ae2 from master
 2015-06-20 19:32:40 -04:00
Markus Holtermann
f64a3de2d4 [1.8.x] Fixed #24940 -- Made model managers hashable 
Thanks Federico Jaramillo Martínez for the report and Tim Graham for the
test and review.

Backport of d3d66d47222dd8765a20a15fdc754c0ed7635404 from master
 2015-06-19 19:15:01 +02:00
johannes.linke
aa00f48280 [1.8.x] Fixed #24881 -- Clarified Meta.order_with_respect_to documentation 
Backport of 27c839e0fce99254ad61322bb827a821f832e840 from master
 2015-06-19 07:03:16 -04:00
Tim Graham
f501f4d41c [1.8.x] Added Python version support policy 
Partial backport of 7f1168e387dc1db70b6093cfd23a4a6978f48109 from master
 2015-06-18 12:23:46 -04:00
Tim Graham
ac518c8722 [1.8.x] Fixed outdated Python version support info in docs/topics/install.txt 
Backport of ebd183a18cc334e3ac57efd8e4ec09c3954196a9 from master
 2015-06-17 11:28:48 -04:00
Tim Graham
9d5c45beae [1.8.x] Removed usage of string-based url() in auth docs. 
Backport of 58665dded006a4bbb9789e92cd280265a4f3dee8 from master
 2015-06-17 09:46:15 -04:00
Andriy Sokolovskiy
8abe2d0643 [1.8.x] Fixed #24948 -- Fixed crash when uploading bitmap images in forms.ImageField 
Backport of cf6ce279c7671a4c83c960c5c526f92679a4fac8 from master
 2015-06-16 14:38:25 -04:00
Tim Graham
8050e6282e [1.8.x] Refs #24987 -- Documented that Client.login() rejects inactive users. 
Backport of fbc618c13cc72b9c2f4c8dfd5ef8b8ab5a5d7caa from master
 2015-06-16 12:47:27 -04:00
Adam Brenecki
0e3a80fa68 [1.8.x] Fixed #24972 -- Fixed removing unique_together indexes on MySQL. 
Backport of 65296b3be376e9cd25216b6ad2b1758b03765781 from master
 2015-06-15 17:32:07 -04:00
Brian King
c58755d875 [1.8.x] Fixed #24912 -- Fixed prefetch_related failure for UUIDField primary keys 
This resolves a problem on databases besides PostgreSQL when using
prefetch_related with a source model that uses a UUID primary key.

Backport of bfb5b7150ff52571a7a3cf10e0dd0d1dbd45c4b5 from master
 2015-06-15 17:31:50 -04:00
Tim Graham
062ce508b0 [1.8.x] Fixed flake8 warnings on Python 3. 
Backport of 47fcbe506c04019a12e16221843e25a52249b1ab from master
 2015-06-15 13:01:41 -04:00