mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-24 09:14:39 +00:00
Code Issues 32 Releases Wiki Activity
22,889 Commits 29 Branches 441 Tags
Commit Graph

22889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olexander Yermakov
7c57f5cf8c [1.10.x] Fixed #27154 -- Allowed comparing CallableBool with bitwise or. 
Thanks Tim for the review.

Backport of b7fb608142a0be568bc5dce952de5e6aefc2488c from master
 2016-08-31 08:28:47 -04:00
Mike Fiedler
c6c1d940c1 [1.10.x] Fixed typo in docs/topics/testing/overview.txt 
Backport of b961b51eaf5b57fabcee89ca09a76fdebfd6500d from master
 2016-08-31 07:35:09 -04:00
Tim Graham
f79dce16bc [1.10.x] Fixed #27145 -- Updated Storage.save() docs for refs #18899. 
Backport of 3f16e4df494dc9143d110b886c8e8608f9d2b584 from master
 2016-08-30 21:41:27 -04:00
Ed Morley
255456becd [1.10.x] Fixed #19914 -- Fixed test failures with pylibmc. 
Backport of 674e3fe13e5156344bfafbea59018b8837eb3044 from master
 2016-08-29 16:28:22 +01:00
Ed Morley
306545d805 [1.10.x] Fixed #27132 -- Allowed testing MemcachedCache and PyLibMCCache during the same test run. 
Backport of 047c1d48a613cc2a16f078a9094cc799f06e6b0c from master
 2016-08-29 16:28:16 +01:00
Ed Morley
547c7e6756 [1.10.x] Refs #27132 -- Added pylibmc to test requirements. 
Backport of 5d978c46216df53884fbca590a9abe660a739774 from master
 2016-08-29 16:28:02 +01:00
Ed Morley
5756edd46d [1.10.x] Refs #19914 -- Split the test_invalid_keys cache test into two. 
The first half of the test fails when using pylibmc (so will need
to be skipped).

Backport of cfd1f93d55d3b9317bdf26b426fe21d935ab3399 from master
 2016-08-29 10:26:41 -04:00
Ed Morley
fb8eea5680 [1.10.x] Fixed #27124 -- Excluded cull-related cache configs from memcached tests. 
Since the `cull` and `zero_cull` test cache configs set `MAX_ENTRIES`
and `CULL_FREQUENCY` in `OPTIONS`, which are only intended for use with
the locmem, filesystem, and database backends. This prevents test
failures once refs #20892 is fixed.

Backport of 606a303856afee684563f9349c2a55578854f1ba from master
 2016-08-29 10:24:13 -04:00
Tim Graham
4541ff2e39 [1.10.x] Added Django 1.11, 2.0 to Python version support table. 
Backport of 38cf9ef390eb0cd0703d99893f826153865f6ba6 from master
 2016-08-26 17:23:09 -04:00
Baptiste Mispelon
0cb1032982 [1.10.x] Fixed incorrect variable name in {% regroup %} docs. 
Backport of 7968bb7fada503b79d8b0e8c92aa076d60c17241 from master
 2016-08-26 16:25:39 -04:00
Tim Graham
325dd0befe [1.10.x] Fixed #27039 -- Fixed empty data fallback to model field default in model forms. 
Backport of 4bc6b939944183533ae74791d21282e613f63a96 from master
 2016-08-24 19:37:04 -04:00
Berker Peksag
c4ee93128f [1.10.x] Fixed #27111 -- Fixed KeyError if USERNAME_FIELD isn't in UserCreationForm.fields. 
Backport of 3c18f8a3d2f61669493f9ff2015ddc027eada3d6 from master
 2016-08-24 13:23:50 -04:00
Tim Graham
6f006f40f7 [1.10.x] Fixed #27104 -- Corrected shell example in tutorial 5. 
Backport of cf2cd4053fe3eed50ab2b7269ed72d25712c970a from master
 2016-08-24 10:08:54 -04:00
Tim Graham
c135adda8e [1.10.x] Fixed #27115 -- Corrected a screenshot in the tutorial. 
Backport of b40d24960c43091f792dd711e6a5ca7a708b12ad from master
 2016-08-24 09:00:06 -04:00
Simon Charette
0b454804db [1.10.x] Fixed #27100 -- Included already applied migration changes in the pre-migrate state. 
Refs #24100.

Thanks Tim for the review.

Backport of d5c4ea524679a787fe11c927448e44e95646096b from master
 2016-08-24 01:38:30 -04:00
Simon Charette
1c60765d63 [1.10.x] Fixed #27044 -- Included already applied migration changes in the post-migrate state when the execution plan is empty. 
Refs #24100.

Thanks tkhyn for the report and Tim for the review.

Backport of d1757d8df486b689172d2584ded52fad916bcc33 from master
 2016-08-24 01:37:53 -04:00
Tim Graham
46f604244a [1.10.x] Fixed #27089 -- Added database alias to InconsistentMigrationHistory message. 
Backport of ad25fe73506d80ffcaac135ad0a8d09552b70d70 from master
 2016-08-23 20:48:29 -04:00
Tim Graham
6be255a22a [1.10.x] Fixed #24650 -- Documented how to change an unmanaged model to managed. 
Backport of 80c03b06ad1461c1a07091806dc0414a4e98905e from master
 2016-08-23 17:35:55 -04:00
Collin Anderson
4073780219 [1.10.x] Fixed #26998 -- Reverted some admin checks from checking field.many_to_many back to isinstance(field, models.ManyToManyField). 
This partially reverts 983c158da7723eb00a376bd31db76709da4d0260

Backport of 384f89f8f843953ac11cf211f85291b5c14baeb9 from master
 2016-08-23 16:06:41 -04:00
Helen Sherwood-Taylor
ae0f55eb49 [1.10.x] Fixed #27018 -- Fixed admindocs crash with a view in a class. 
Generated correct admindocs URLs on Python 3. URLs generate 404s on
Python 2, as in older versions of Django.

Backport of bc1e2d8e8edde6cc7d2657c68242a13ee65a15b8 from master
 2016-08-20 10:02:22 -04:00
Tim Graham
7c0c3fb6b1 [1.10.x] Fixed #27013 -- Clarified commands to install argon2/bcrypt packages. 
Backport of 9f27735612fc775380d7801c68af0ea1c97cf5a3 from master
 2016-08-19 19:23:51 -04:00
Tim Graham
f878b860d1 [1.10.x] Fixed #27085 -- Corrected a screenshot in the tutorial. 
Backport of 44c306218ff5f1b1748040ee3ffd767c4bc33533 from master
 2016-08-19 18:05:30 -04:00
Abhishek Bera
a77d979cbd [1.10.x] Fixed #26987 -- Documented using QuerySet.get() without arguments. 
Backport of f3b601f11a7b56777ac1173a390787d176f95fe3 from master
 2016-08-19 17:17:57 -04:00
Tim Graham
33783a9e06 [1.10.x] Fixed #26571 -- Corrected recommendation for converting timestamps to tz-aware datetimes. 
Backport of d60386d0f5333c7fef4c5906a3358b00cf9de3bf from master
 2016-08-19 14:47:38 -04:00
Vincent Zhang
e5103de2d1 [1.10.x] Refs #26747 -- Corrected a method name in tutorial05. 
Backport of 7b08e01c1358aedbd46fa26c91d4613d642ff609 from master
 2016-08-19 11:10:40 -04:00
Brightcells
557c1a6a42 [1.10.x] Replaced old DateTimeAwareJSONEncoder with DjangoJSONEncoder in docs. 
Backport of d301c61bcb72af864229e51d2ebc6076bea1e5ff from master
 2016-08-19 09:16:31 -04:00
Tim Graham
a033b351b5 [1.10.x] Refs #25854 -- Completed a RequestContext docs example. 
Backport of f8c338ec6a372841559e3134cf4d4329c460f8c7 from master
 2016-08-18 21:13:47 -04:00
Tim Graham
3342f24ff6 [1.10.x] Fixed #26807 -- Documented how to replicate SubfieldBase's assignment behavior. 
Backport of 518eaf1fa2d86dc1b0ba7adba22b30bcc8f3a497 from master
 2016-08-18 21:09:02 -04:00
Loïc Bistuer
21f18e5372 [1.10.x] Fixed #27073 -- Removed duplicated managers in Model._meta.managers. 
Backport of d4eefc7e2af0d93283ed1c03e0af0a482982b6f0 from master
 2016-08-19 01:27:43 +07:00
Timothy Allen
0cab98e084 [1.10.x] Corrected text from Python's Windows installer. 
Backport of 8cd900c8193198080672603f0f266a4e8df78860 from master
 2016-08-18 14:05:28 -04:00
Jim Nicholls
16f032e69f [1.10.x] Fixed #27054 -- Fixed makemigrations crash with a read-only database. 
Backport of 76ab8851181675a59425f9637bdbf3f2de95f6f1 from master
 2016-08-18 08:45:41 -04:00
Chris Lamb
c24a47b3e6 [1.10.x] Refs #26983 -- Added test for isnull lookup to CharField with primary_key=True. 
Backport of 97513269d73520d10722bbd10404be6ac4d48d07 from master
 2016-08-17 21:19:22 -04:00
Mattias Loverot
04f0c2ab39 [1.10.x] Fixed #27069 -- Doc'd which gettext functions may be aliased as _. 
Backport of 35ea6d83c8ecea76f49da26d6646c8d21936500f from master
 2016-08-17 16:35:19 -04:00
Kevin Christopher Henry
3db01b2d58 [1.10.x] Fixed #26616 -- Clarified model usage in AppConfig.ready(). 
Backport of ff445f4c19a0fdf6696c99efefa38b1409b8709f from master
 2016-08-17 10:35:29 -04:00
Jon Dufresne
f6af24fe40 [1.10.x] Fixed incorrect doc reference to Field.initial. 
Backport of 4773ed2e313c67ed9d4a77d5fe24ca7ed34172cf from master
 2016-08-17 10:27:46 -04:00
Tim Graham
8df2da3637 [1.10.x] Fixed #19222 -- Documented that default managers aren't used for related queries. 
Backport of 8fb53c50ce1c759c740960c9e1cef3cef39cabc5 from master
 2016-08-16 13:13:10 -04:00
Tim Graham
020ba4bf91 [1.10.x] Fixed #27058 -- Reallowed the {% for %} tag to unpack any iterable. 
Thanks Sergei Maertens for the report and patch.

Backport of 937d752d3deabebe60dfbe9ff9823772730f336a from master
 2016-08-15 15:40:34 -04:00
Tim Graham
54771f6605 [1.10.x] Refs #13408 -- Removed obsolete code/comments from {% for %} unpacking deprecation. 
Backport of ba749f8f87dd60b20aeaefb84ee182f192746ebf from master
 2016-08-15 15:40:31 -04:00
Daniel Wiesmann
201198136d [1.10.x] Fixed #27014 -- Fixed annotations with database functions on PostGIS. 
Thanks Sean Mc Allister for providing a test.

Backport of 89f17e7caf0d1e70417253d135607c9fd6ebac56 from master
 2016-08-15 14:23:48 -04:00
Timothy Allen
7d11d61087 [1.10.x] Documented how allow_migrate() interacts with makemigrations. 
Backport of df92f6f2e3ad2c6b1e4da7f4225d313e2640d30f from master
 2016-08-15 13:35:05 -04:00
Victor Oliveira da Silva
dad8ec49c4 [1.10.x] Made cosmetic edits to Field.default docs. 
Backport of d7804662f8d929a3d363ef7a73e6cad9243acd96 from master
 2016-08-15 10:46:02 -04:00
Tim Graham
eea74edc70 [1.10.x] Fixed #27048 -- Documented that refresh_from_db() doesn't reload @cached_properties. 
Backport of 9556005425ca3d1c8c2a0e8b48e228e63a0bdd32 from master
 2016-08-12 18:49:42 -04:00
Tim Graham
f8307c4b8c [1.10.x] Removed some unnecessary repetition in PostgreSQL operations docs. 
Backport of e1acc9dc6638379513648b301e870ff2a40001fd from master
 2016-08-12 18:04:03 -04:00
Jon Dufresne
d8cda352b1 [1.10.x] Fixed #27037 -- Prevented required attribute on ClearableFileInput when initial data exists. 
Backport of fab46ce6f5a0a58c4e5e39c9e5e412702beb4a64 from master
 2016-08-12 13:59:23 -04:00
Tim Graham
13fd711f10 [1.10.x] Fixed typo in docs/releases/1.9.txt 
Backport of 5eab1f6f8348497e87c19112786efb970e41f36e from master
 2016-08-12 07:30:05 -04:00
Kevin Christopher Henry
80e0ff7f91 [1.10.x] Documented the cache_control() decorator. 
Backport of b785927b442d1e4b59f2afa40729a4ca1a7ed3ab from master
 2016-08-11 16:48:43 -04:00
Moritz Sichert
6977eaf844 [1.10.x] Refs #23960 -- Documented how to restore absolute redirect URLs. 
Backport of 08b8c4697112e8dae90e72afc7d85bd31ead0410 from master
 2016-08-11 16:36:21 -04:00
Tim Graham
ff1f46444c [1.10.x] Clarified session verification with respect to the current session. 
Backport of 4c2a6fe75bad592972eafc79debc35bf944f38f7 from master
 2016-08-11 12:12:26 -04:00
Tim Graham
adca9effe7 [1.10.x] Fixed #27050 -- Corrected django.setup()'s parameter name in docs. 
Backport of 6b83f61e72637326605614d8a8e9e0077040d994 from master
 2016-08-11 07:04:59 -04:00
an0o0nym
c52350bc6c [1.10.x] Fixed #26957 -- Corrected authenticate() docs regarding User.is_active. 
Backport of c412aaca735c7cc1c766b85c1512f9ff434ce63a from master
 2016-08-10 19:52:49 -04:00