mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-07 23:16:46 +00:00
Code Issues 32 Releases Wiki Activity
20,413 Commits 29 Branches 441 Tags
Commit Graph

6598 Commits

Author SHA1 Message Date
Tim Graham
632a917c11 [1.8.x] Refs #23843 -- Updated Oracle annotations workaround to reflect latest status. 
Backport of f9636fdf922fe49ff82d02b17d6b34469fcf1fda from master
 2015-08-14 13:52:33 -04:00
Fabrizio Ettore Messina
c652383379 [1.8.x] Fixed #25267 -- Corrected message for admin.E122 system check. 
Backport of ece78684d9e09c477c4a0f10236c0aec45bac726 from master
 2015-08-13 13:14:17 -04:00
Tim Graham
e4b813c0e7 [1.8.x] Fixed #25160 -- Moved unsaved model instance data loss check to Model.save() 
This mostly reverts 5643a3b51be338196d0b292d5626ad43648448d3 and
81e1a35c364e5353d2bf99368ad30a4184fbb653.

Thanks Carl Meyer for review.

Backport of 5980b05c1fad69eef907e0076aa2dc837edab529 from master
 2015-08-10 11:31:22 -04:00
Claude Paroz
cda66497aa [1.8.x] Updated Wikipedia links to use https 
Backport of 64982cc2fb from master.
 2015-08-08 12:09:53 +02:00
mlavin
ac46eb7e83 [1.8.x] Fixed #25231 -- Added recording of squashed migrations in the migrate command. 
Ensured squashed migrations are recorded as applied when the
migrate command is run and all of the original migrations
have been previously applied.

Backport of 69db1c745506bf63026def25d6854755179feaa8 from master
 2015-08-07 18:16:37 -04:00
Tim Graham
ad2ac53054 [1.8.x] Fixed #25233 -- Fixed HStoreField.has_changed() handling of initial values. 
Thanks Simon Charette for review.

Backport of a7b7f27c05244d69a11545261eb3bbd73791b3d2 from master
 2015-08-07 14:31:05 -04:00
Curtis Maloney
473af19273 [1.8.x] Fixed #25215 -- Solved reference to forms.HStoreField in declaration of HStoreField 
Correct test which was using the model field in a test form.

Backport of 9f73009e98c51986a50cc45844b8bca72673e955 from master
 2015-08-04 19:19:05 +10:00
Alasdair Nicol
7a8460191e [1.8.x] Fixed #25206 -- Fixed error message when checking a ModelAdmin fieldset's fields. 
Backport of 8972818289452d611d97fac0f4a6d24625987b31 from master
 2015-08-03 08:59:13 -04:00
Tim Graham
6bb8258255 [1.8.x] Fixed #25204 -- Added missing space in runserver logging. 
Backport of 1a76257b1b385ac8afd67bd36d061f508613e4d2 from master
 2015-08-01 08:31:32 -04:00
Adam Chainz
b46dad1bef [1.8.x] Fixed #25176 -- Prevented TestCase.setUpTestData() exception from leaking transaction. 
Backport of 0abb06930fc0686cb35079934e5bb40df66f5691 from master
 2015-08-01 07:38:20 -04:00
Claude Paroz
22e9c87bb8 [1.8.x] Updated GeoIP test for newer versions 
Backport of 3f9dca62cb31a2b4b279b7d312a850660d21e91f from master
 2015-07-30 18:16:45 -04:00
Tim Graham
77566dcc6e [1.8.x] Fixed #25183 -- Fixed non-deterministic GeoIP test. 
google.com doesn't always resolve to an IP inside the United States.

Backport of 5b6ca150730cddb09ff8622d49b273d57b9c6703 from master
 2015-07-30 18:12:37 -04:00
Matt Johnson
05c7129bf2 [1.8.x] Fixed #12768 -- Fixed QuerySet.raw() regression on FK with custom db_column. 
Backport of e063ac2fae007a2eecaeab5ce17064c31230ce29 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 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
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
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
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
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
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
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
Tim Graham
ae1d663b79 [1.8.x] Renamed RemovedInDjango20Warning to RemovedInDjango110Warning. 2015-06-23 07:22:16 -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
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
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
Rivo Laks
76c526f80e [1.8.x] Fixed #24769 -- Cast optparse verbosity argument to an integer for better backwards compatibility. 
Using `BaseCommand.options_list` makes Django use the legacy optparse
parser, which does not set the verbosity attribute correctly. Now the
verbosity argument is always cast to int. Regression in 8568638 (#19973).

Initial report and patch from blueyed.

Backport of a0047c6242fd48068eb444e0a58f7a5d2bc1bcd3 from master
 2015-06-09 19:05:16 -04:00
Tim Graham
8bc18ebf0f [1.8.x] Fixed #24903 -- Fixed assertRaisesMessage on Python 2.7.10. 
A regression in Python 2.7.10 rc1 wasn't reverted in the final
release: https://bugs.python.org/issue24134

Backport of two commits from master:
* c2bc1cefdcbbf074408f4a4cace88b315cf9d652
* e89c3a46035e9fe17c373a6c9cd63b9fd631d596
 2015-06-09 17:54:33 -04:00
Tomasz Kontusz
b62dc60c98 [1.8.x] Fixed ImportError message in utils.module_loading.import_string() 
Backport of c2b4967e76fd671e6199e4dd54d2a2c1f096b8eb from master
 2015-06-06 11:55:56 -04:00
Andriy Sokolovskiy
66496c8403 [1.8.x] Added missing tests for transforms usage with subquery for PostgreSQL fields 
Backport of 2a7c59cd885b4c9f0584015c34c17c9ebca6d417 from master
 2015-06-06 09:12:07 -04:00
Andriy Sokolovskiy
b4b13759f8 [1.8.x] Fixed #24744 - Fixed relabeled_clone for the Transform 
Backport of 08232ef84d4959826ad5136f183c9fc5bedf0599 from master
 2015-06-06 09:11:46 -04:00
Mark Lavin
0cfb7ed5c5 [1.8.x] Fixed #24924 -- Join promotion for multiple Case expressions 
Backport of 541f4ea546ad3065852db816769ba6b584e3f373 from master
 2015-06-05 12:23:08 -04:00
Andriy Sokolovskiy
469f1e362b [1.8.x] Fixed #24833 -- Fixed Case expressions with exclude(). 2015-06-05 11:03:41 -04:00
Carl Meyer
2358c1e5d7 [1.8.x] Cleaned up docstring style, per Tim Graham review. 
Backport of 57dbc87ade5533d78089690ec7795034ff69177a from master.
 2015-06-03 19:21:23 -06:00
Carl Meyer
feed5ad2a0 [1.8.x] Refs #24628 -- Added a second test and a docstring comment to avoid regression. 
Backport of 5c085ea7b3f3ff10389aeed327e018581791876a from master.
 2015-06-03 15:48:53 -06:00
Tim Graham
f082813d67 [1.8.x] Fixed typo in runtests.py vendor check. 2015-06-03 12:22:39 -04:00
Tim Graham
2009525c8b [1.8.x] Applied db_table conversion to fix schema tests on Oracle. 
Backport of 7c637a3aaec311269bf863c220bf894eebbe7c7c from master
 2015-06-02 19:45:24 -04:00
Carl Meyer
efdcd13c34 [1.8.x] Fixed #24628 -- Fixed applied status for squashed migrations. 
Backport of 492537ac18df56c36f8a2335d773aa0fa01a61a3 from master.
 2015-06-02 16:21:58 -06:00
Carl Meyer
c37c6dc410 [1.8.x] Improved isolation of applied-migrations table in migration tests. 
Backport of 335fc44f6872f4678e48f65e91961ef19d6439b4 from master.
 2015-06-02 16:21:03 -06:00
Carl Meyer
98b40ffe61 [1.8.x] Fixed #24895 -- Fixed loading a pair of squashed migrations with a dependency. 
Backport of 84522c0d165076d01cd034d7c381b75044daec8d from master.
 2015-06-02 12:10:04 -06:00
zauddelig
7f92b6e576 [1.8.x] Fixed #24897 -- Allowed using choices longer than 1 day with DurationField 
Backport of 262d4db8c4c849b0fdd84550fb96472446cf90df from master
 2015-06-02 12:42:31 -04:00
Andriy Sokolovskiy
9d83de8ff3 [1.8.x] Fixed #24831 -- Fixed pickling queryset with prefetch_related() after deleting objects. 
Backport of 2913d6b77d8b2082dc79df5503b7dd3ddd05fcc1 from master
 2015-06-02 10:07:45 -04:00
Tim Graham
1c57d7e7fa [1.8.x] Fixed #24893 -- Fixed lack of unique constraint when changing a field from primary_key=True to unique=True 
Backport of e1e6399c2ce39a3656155c4d704340eac83926a7 from master
 2015-06-02 09:32:22 -04:00