mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-28 12:06:22 +00:00
Code Issues 30 Releases Wiki Activity
20,005 Commits 28 Branches 426 Tags 680 MiB
3a0fe942dd
Commit Graph

20005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anssi Kääriäinen
3a0fe942dd [1.8.x] Fixed #24171 -- Fixed failure with complex aggregate query and expressions 
The query used a construct of qs.annotate().values().aggregate() where
the first annotate used an F-object reference and the values() and
aggregate() calls referenced that F-object.

Also made sure the inner query's select clause is as simple as possible,
and made sure .values().distinct().aggreate() works correctly.

Backport of fb146193c4 from master
 2015-03-09 07:51:05 -04:00
Tim Graham
83269b2935 [1.8.x] Fixed typo in docs/howto/custom-template-tags.txt 
Backport of 63f2dd4ad7 from master
 2015-03-09 07:06:32 -04:00
Rik
930fc4db7b [1.8.x] Fixed #21661 -- Expanded authentication views documentation 
Backport of eb9b7abb83 from master.
 2015-03-08 20:40:33 +01:00
Aymeric Augustin
311b880fa9 [1.8.x] Prevented some tests from writing in the CWD. 
Backport of 90b069c33f from master
 2015-03-07 10:40:17 -05:00
Jean-Louis Fuchs
1ae2df6bfc [1.8.x] Fixed #24447 -- Made migrations add FK constraints for existing columns 
When altering from e.g. an IntegerField to a ForeignKey, Django didn't
add a constraint.

Backport of f4f0060fea from master
 2015-03-07 14:15:27 +01:00
Claude Paroz
ac07890f95 [1.8.x] Fixed urlize regression with entities in query strings 
Refs #22267.
Thanks Shai Berger for spotting the issue and Tim Graham for the
initial patch.
Backport of ec808e807 from master.
 2015-03-06 22:22:51 +01:00
Josh Smeaton
823f8cdbc9 [1.8.x] Fixed #24420 -- Allowed ordering by case expressions 
Backport of ceaf31adff from master
 2015-03-06 13:31:43 +11:00
Marten Kenbeek
bd7c879d5a [1.8.x] Stressed authentication should be successful before logging in a user. 
Backport of 8e744fa150 from master
 2015-03-05 12:18:13 -05:00
Aymeric Augustin
2bef57f3fb [1.8.x] Improved get_media_prefix template tag example. 
Backport of 9a4a9a8a49 from master
 2015-03-05 10:00:05 -05:00
Benjamin Wohlwend
3bc35f7e08 [1.8.x] Moved definition of chunks out of timesince function. 
This speeds up the timesince function/filter substantially.

Backport of d6969ab from master.
 2015-03-04 22:31:27 +01:00
Tim Graham
20bf320502 [1.8.x] Fixed #24426 -- Displayed admin actions panel when show_full_result_count=False. 
Backport of 36a17be9f3 from master
 2015-03-04 13:56:51 -05:00
Tim Graham
4fa61e0e4f [1.8.x] Used format_html() in contrib.admin.utils for consistency. 
Backport of fe42bfaaff from master
 2015-03-04 10:44:44 -05:00
Markus Holtermann
bff446c205 [1.8.x] Fixed #24435 -- Prevented m2m field removal and addition in migrations when changing blank 
Thanks Mark Tranchant for the report and Tim Graham for the test and
review.

Backport of a9e29fae10 from master
 2015-03-04 15:44:38 +01:00
Mathias André
44dd65fb2c [1.8.x] Removed outdated docstring for get_admin_url(). 
Since a4b8a4b632 the admin
URL returned by get_admin_url() is no longer relative to
the Django admin index page.

Backport of 85757d0e79 from master
 2015-03-03 07:47:32 -05:00
Ross Brunton
72539a5f29 [1.8.x] Fixed #24379 -- Documented that remote user example disables ModelBackend. 
Backport of 6b28e957df from master
 2015-03-02 19:57:12 -05:00
Tim Graham
cc525e31bb [1.8.x] Fixed #13015 -- Clarified language about model instances attached to forms. 
Backport of a40a34a4b2 from master
 2015-03-02 18:45:27 -05:00
Andrew Pinkham
ac6bc2c090 [1.8.x] Fixed #24439 -- Removed incorrect make_object_list attributes in CBV docs. 
Backport of fea45eff5a from master
 2015-03-02 13:33:42 -05:00
Ian Lee
ed25758556 [1.8.x] Added syntax highlighting for apache code blocks 
Backport of fde4857fb8 from master
 2015-03-02 12:37:07 -05:00
Brent O'Connor
761b97c344 [1.8.x] Updated contributing link in the README. 
Backport of f7bf135f62 from master
 2015-03-02 08:23:52 -05:00
Claude Paroz
c0df8d1be9 [1.8.x] Fixed #24413 -- Prevented translation fallback for English 
Thanks Tomasz Kontusz for the report, Baptiste Mispelon for
analysis and Tim Graham for the review.
Backport of 3cf1c02695 from master.
 2015-02-28 10:09:01 +01:00
Alex Shaindlin
5a3b59370c [1.8.x] Improved wording in tutorial 1. 
Backport of dcdef1fe2e from master
 2015-02-27 17:54:27 -05:00
Claude Paroz
b825ec38c1 [1.8.x] Fixed #24418 -- Prevented crash in refresh_from_db with null fk 
Thanks Johannes Lerch for the report, Tim Graham for the test case,
and Simon Charette for the review.
Backport of 5cf96b49e4 from master.
 2015-02-27 20:25:12 +01:00
Tim Graham
9d6f0dce13 [1.8.x] Fixed #24359 -- Cleaned up docs/ref/exceptions.html 
Backport of 2b19b3a031 from master
 2015-02-27 13:51:29 -05:00
Tim Graham
31a1f96bd3 [1.8.x] Added stub release notes for 1.7.6. 
Backport of 71820721a1 from master
 2015-02-25 09:11:43 -05:00
Tim Graham
a9ab8bd4dd [1.8.x] Added release date for 1.7.5 release. 
Backport of aca73737da from master
 2015-02-25 09:03:38 -05:00
Tim Graham
b8f9fd7591 [1.8.x] Updated trove classifier to beta. 2015-02-25 08:29:14 -05:00
Tim Graham
3fff408a27 [1.8.x] Bumped version to 1.8 beta 1. 2015-02-25 08:26:23 -05:00
Tim Graham
dfcdf64d47 [1.8.x] Fixed #24411 -- Avoided dict key/method clash in admin delete views. 
Backport of 47b35b1844 from master
 2015-02-25 08:07:25 -05:00
Michael Angeletti
278b698794 [1.8.x] Fixed #24391 -- Made BoundField.value() cache callable values. 
Backport of 65441bbdb0 from master
 2015-02-24 20:05:16 -05:00
Tim Graham
81911f29b7 [1.8.x] Reverted "Fixed #24325 -- Documented change in ModelForm.save() foreign key access." 
This reverts commit 0af3822dc3.
It's obsoleted by refs #24395.

Backport of d298b1ba50 from master
 2015-02-24 11:51:10 -05:00
Stanislas Guerra
a3fca05b05 [1.8.x] Fixed #24395 -- Ensured inline ModelsForms have an updated related instance. 
Backport of 4c2f546b55 from master
 2015-02-24 11:49:27 -05:00
Preston Timmons
450b42eafe [1.8.x] Cleaned up template directory handling in template tests. 
Backport of 8e129b42ad from master
 2015-02-24 09:22:25 -05:00
Preston Timmons
b22d20dd18 [1.8.x] Combined TemplateTests and TemplateRegressionTests. 
Backport of 32c108a221 from master
 2015-02-24 09:22:20 -05:00
Preston Timmons
2e7414cdf4 [1.8.x] Moved test_token_smart_split into ParserTests. 
Backport of 25a0b5cdcd from master
 2015-02-24 09:22:15 -05:00
Preston Timmons
e15292daa0 [1.8.x] Moved ifchanged tests into syntax_tests/test_if_changed.py. 
Backport of 3d8fee6051 from master
 2015-02-24 09:22:05 -05:00
Preston Timmons
f3a49c628e [1.8.x] Moved cache tests into syntax_tests/test_cache.py. 
Backport of f6d087b628 from master
 2015-02-24 09:21:54 -05:00
Preston Timmons
d8114552a0 [1.8.x] Moved RequestContextTests into test_context. 
Backport of 250a3d1993 from master
 2015-02-24 09:18:28 -05:00
Preston Timmons
c1bf9e47ec [1.8.x] Moved TemplateTagLoading cases into test_custom. 
Backport of ff67ce5076 from master
 2015-02-24 09:17:45 -05:00
Preston Timmons
272208c124 [1.8.x] Moved include tests into syntax_tests/test_include.py. 
Backport of 06ffc764a9 from master
 2015-02-24 09:10:01 -05:00
Preston Timmons
cdb73ec8cd [1.8.x] Moved ssi tests into syntax_tests/test_ssi.py. 
Backport of 441a47e1ef from master
 2015-02-24 09:09:52 -05:00
Tim Graham
210bf24ddb [1.8.x] Cleaned up template loader tests. 
Backport of 1827aa9024 from master
 2015-02-24 08:59:05 -05:00
Nik Nyby
3e0df285fd [1.8.x] Fixed typos in flatpages_tests comments. 
Backport of 2be6b52656 from master
 2015-02-24 06:31:59 -05:00
Aymeric Augustin
e3953de900 [1.8.x] Normalized usage of the tempfile module. 
Specifically stopped using the dir argument.

Backport of a8fe12417f from master
 2015-02-23 15:26:35 -05:00
Aymeric Augustin
fae31f2348 [1.8.x] Guaranteed removal of temporary files during tests. 
Dropped the DJANGO_TEST_TEMP_DIR environment variable.

Before this change, proper removal depended on the developer passing
dir=os.environ['DJANGO_TEST_TMP_DIR'] to tempfile functions.

Backport of 934400759d from master
 2015-02-23 15:26:26 -05:00
Kenneth Kam
a752a2c951 [1.8.x] Fixed #23762 -- clarified CACHE_MIDDLEWARE_ANONYMOUS_ONLY deprecation in docs 
Backport of e83aba0e2c from master
 2015-02-23 09:23:49 -05:00
Tim Graham
41d5ed480c [1.8.x] Fixed #24377 -- Fixed model inline formsets with primary key's that have defaults. 
Backport of 1306cd1e8a from master
 2015-02-23 09:01:00 -05:00
Ian Lee
04c262aea9 [1.8.x] Broke long lines in code examples. 
The website only renders code blocks at 96 chars, and therefore
long code lines get wrapped. Manually breaking the lines prevents
the wrapping from occurring.

Backport of 00fbd8fd52 from master
 2015-02-23 07:46:00 -05:00
Emin Mastizada
ff2e0896a3 [1.8.x] Added formats for the Azerbaijani locale. 
Backport of dda2a3cf4c from master
 2015-02-23 07:37:42 -05:00
Anssi Kääriäinen
155a127afb [1.8.x] Fixed #24381 -- removed ForeignObjectRel opts and to_opts 
These cached properies were causing problems with pickling, and in
addition they were confusingly defined: field.rel.model._meta was
not the same as field.rel.opts.

Instead users should use field.rel.related_model._meta inplace of
field.rel.opts, and field.rel.to._meta in place of field.rel.to_opts.

Backport of f95122e541 from master
 2015-02-23 07:26:10 -05:00
Marten Kenbeek
980dfca717 [1.8.x] Fixed #24366 -- Optimized traversal of large migration dependency graphs. 
Switched from an adjancency list and uncached, iterative depth-first
search to a Node-based design with direct parent/child links and a
cached, recursive depth-first search. With this change, calculating
a migration plan for a large graph takes several seconds instead of
several hours.

Marked test `migrations.test_graph.GraphTests.test_dfs` as an expected
failure due to reaching the maximum recursion depth.

Backport of 78d43a5e10 from master
 2015-02-23 12:55:43 +01:00