mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-16 21:33:33 +00:00
Code Issues 32 Releases Wiki Activity
20,146 Commits 29 Branches 430 Tags
Commit Graph

20146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 36a17be9f3cf6081f7e6f83fcfeae3d09ce8a72b 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 fe42bfaaff93e6b4af34ab48892e20c9cdee0c1a 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 a9e29fae105d1ddd4e0ac2059cbe62b0ee348bc8 from master
 2015-03-04 15:44:38 +01:00
Mathias André
44dd65fb2c [1.8.x] Removed outdated docstring for get_admin_url(). 
Since a4b8a4b632dbb6d9fed1a8654aed99a9c53560d4 the admin
URL returned by get_admin_url() is no longer relative to
the Django admin index page.

Backport of 85757d0e79f4237d7cf3ee1785946315aa6959eb 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 6b28e957df364532109a1897c73a1fa8b1416bd4 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 a40a34a4b2d79dbf798df538c26222148d42b17c 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 fea45eff5a2f2ad10b2788603db80e5a4fe6be06 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 fde4857fb83101d27ae4cb3552a6a6cf20d3d8ce 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 f7bf135f62297c580e9b36af4c2470adb652fbaf 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 dcdef1fe2ec59a7aeca39efc5a29f0d238d0c560 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 2b19b3a031e7d5b5264bc9e880d0192301289bc2 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 71820721a19f5628b3176f16813d47378cb2c3cb 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 aca73737da8ba173ad9435b1e9e1fe5d8516f3b3 from master
 2015-02-25 09:03:38 -05:00
Tim Graham
b8f9fd7591 [1.8.x] Updated trove classifier to beta. 1.8b1 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 47b35b1844b2adc167e64674824873991e9c4c2b 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 65441bbdb02427655869c42791a0bc5a9c631292 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 0af3822dc362b6253bda1c9699466dd0bbbf6066.
It's obsoleted by refs #24395.

Backport of d298b1ba5043eaa40f3f4bebe3c7634b359ba34b 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 4c2f546b55c029334d22e69bb29db97f9356faa3 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 8e129b42ad9c9adca599228ae2ad68271fa46d44 from master
 2015-02-24 09:22:25 -05:00
Preston Timmons
b22d20dd18 [1.8.x] Combined TemplateTests and TemplateRegressionTests. 
Backport of 32c108a221c54a4f680afe32175d70b5d2e92593 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 25a0b5cdcd5e70a6563116639a477b915ee5784e 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 3d8fee605184d8ffa47a32546298b52b52d7a087 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 f6d087b628a61a7b036cc468328497082031dc8e from master
 2015-02-24 09:21:54 -05:00
Preston Timmons
d8114552a0 [1.8.x] Moved RequestContextTests into test_context. 
Backport of 250a3d199310a954a95fb1ffa4915f0e51ba1767 from master
 2015-02-24 09:18:28 -05:00
Preston Timmons
c1bf9e47ec [1.8.x] Moved TemplateTagLoading cases into test_custom. 
Backport of ff67ce5076c1f4d3dc32fd755a1b65d3310c6cb1 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 06ffc764a9b2d2521e6a574d279b66ad411cc65c 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 441a47e1efd46001ca454b80e0d5f8c5ea4e235b from master
 2015-02-24 09:09:52 -05:00
Tim Graham
210bf24ddb [1.8.x] Cleaned up template loader tests. 
Backport of 1827aa902481cd80d2fb154e7b073f139936d5fc from master
 2015-02-24 08:59:05 -05:00
Nik Nyby
3e0df285fd [1.8.x] Fixed typos in flatpages_tests comments. 
Backport of 2be6b526568aaaae5353a4a600a085d3c2135363 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 a8fe12417f778a76837f8e4f8503779f52a396ba 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 934400759de817471ff37d736686201d7ae34e82 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 e83aba0e2cce16cd1b32d1c172239a4e20867e95 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 1306cd1e8acfb13602ee8dc40993b2505cd7523b 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 00fbd8fd527fd6ee0319361bf194cd51a1ac1bfb from master
 2015-02-23 07:46:00 -05:00
Emin Mastizada
ff2e0896a3 [1.8.x] Added formats for the Azerbaijani locale. 
Backport of dda2a3cf4cc29d01de180f66d19441f300732e52 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 f95122e541df5bebb9b5ebb6226b0013e5edc893 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 78d43a5e1064b63db1c486516c4263ef1c4c975c from master
 2015-02-23 12:55:43 +01:00
Michael Manfre
ed941ef2d0 Fixed signature of BaseDatabaseOperations.date_interval_sql() 
Backport of 7fa7dd48c4 from master
 2015-02-23 00:04:57 -05:00
Aymeric Augustin
19c2fe04a8 [1.8.x] Fixed a few uses of Template that relied on a default engine. 
Refs #24389.

Backport of 556a748 from master
 2015-02-22 23:22:19 +01:00
Tim Graham
ddc1e0c0fb [1.8.x] Updated tutorial to use explicit relative imports. 
Backport of b2f331dc68ec3c5a34285f7af9614e4178e9a371 from master
 2015-02-22 14:20:25 -05:00
Tim Graham
576c1096d2 [1.8.x] Corrected sqlmigrate output in tutorial 1. 
Backport of ff5e47e7a4a638a30424331222e0abdb60842ddd from master
 2015-02-22 12:29:39 -05:00
Tim Graham
fbddd946ad [1.8.x] Fixed #24371 -- Cautioned against trying to switch databases. 
Backport of 7901eccf2e591447850be00011a7bb556a3c53f2 from master
 2015-02-22 10:12:15 -05:00
Aymeric Augustin
c564033408 [1.8.x] Fixed #24389 -- Isolated the CSRF view from the TEMPLATES setting. 
Thanks uranusjr for the report and analysis.

Backport of 88a5f17 from master
 2015-02-22 15:47:11 +01:00
Sean Wang
f0780df608 [1.8.x] Fixed #24358 -- Corrected code-block directives for console sessions. 
Backport of eba6dff581aa8bd6a1c08456e83e68ad09ae4ec3 from master
 2015-02-22 09:36:51 -05:00
Michael Angeletti
1feeefe918 [1.8.x] Fixed #24376 -- added verbose_name arg to UUIDField 
Backport of ea3168dc6ced391d848c511a14cfcecfeac9d401 from master
 2015-02-21 14:26:47 -05:00
Aymeric Augustin
481d3bd617 [1.8.x] Removed obsolete reference to media directory. 
Backport of 787dd6519a791f210dc8275eaf2fd41454bf9670 from master
 2015-02-21 13:08:15 -05:00