4 Commits

Author	SHA1	Message	Date
Matt Johnson	05c7129bf2	[1.8.x] Fixed #12768 -- Fixed QuerySet.raw() regression on FK with custom db_column. ... Backport of e063ac2fae from master	2015-07-23 18:44:58 -04:00
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 24620d71f2 from master	2015-07-13 17:55:19 -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