mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
20,440 Commits 30 Branches 460 Tags
6acf0df86255ef4d2097f24cbfa39fdb44de19e3
Commit Graph

6610 Commits

Author SHA1 Message Date
Aymeric Augustin
2b08b36488 [1.8.x] Made the autoreloader survive all exceptions. 
Refs #24704.

Backport of b79fc11d73 from master
 2015-08-29 23:13:12 +02:00
Aymeric Augustin
dc8786ce94 [1.8.x] Ensured gen_filenames() yields native strings. 
This also fixes a test failure on Python 2 when Django is installed in a
non-ASCII path. This problem cannot happen on Python 3.

Backport of c2fcba2ac7 from master
 2015-08-29 23:10:55 +02:00
Aymeric Augustin
6af1e47aab [1.8.x] Refactored autoreload tests. 
* Added helpers to test uncached and cached access.
* Fixed test_project_root_locale: it duplicated test_locale_paths_setting.
* Rewrote test_only_new_files: test more cases.

Backport of dfa712efb8 from master
 2015-08-29 23:09:57 +02:00
Aymeric Augustin
b18bb65fd2 [1.8.x] Accounted for error files in the autoreloader. 
* When some old files contain errors, the second call to
  gen_filenames() should return them.
* When some new files contain errors, the first call to
  gen_filenames(only_new=True) should return them.

Backport of 23620cb8e0 from master
 2015-08-29 23:08:06 +02:00
Tim Graham
0d368bfb47 [1.8.x] Fixed #25323 -- Fixed selenium test failures with chromedriver 2.18. 
Backport of 7ac0cd445e from master
 2015-08-28 14:38:18 -04:00
Tim Graham
3cc67a637a [1.8.x] Fixed #25299 -- Fixed crash with ModelAdmin.list_display value that clashes with a model reverse accessor. 
Backport of 9607a04041 from master
 2015-08-28 09:03:34 -04:00
Claude Paroz
c177d0690e [1.8.x] Fixed #25295 -- Restored 'no active translation' after language override 
Thanks David Nelson Adamec for the report and Tim Graham for the review.
Backport of 9324935c3 from master.
 2015-08-25 10:37:54 +02:00
Kai Richard Koenig
181528726e [1.8.x] Fixed #25040 -- Fixed migrations state crash with GenericForeignKey 
Backport of 60f795c060 from master
 2015-08-22 08:50:19 -04:00
Tim Graham
0e3a8c22df [1.8.x] Fixed typo in tests/migrations/test_autodetector.py. 
Backport of 01966bb2a7 from master
 2015-08-20 14:52:36 -04:00
Tim Graham
ffe755e990 [1.8.x] Fixed #24951 -- Fixed AssertionError in delete queries involving a foreign/primary key. 
Thanks Anssi Kääriäinen for help.

Backport of 333cbdcd2d from master
 2015-08-20 08:46:08 -04:00
Tim Graham
2eb86b01d7 [1.8.x] Fixed DoS possiblity in contrib.auth.views.logout() 
Thanks Florian Apolloner and Carl Meyer for review.

This is a security fix.
 2015-08-18 08:15:15 -04:00
Caio Ariede
29fa1b5800 [1.8.x] Fixed #25180 -- Prevented varchar_patterns_ops and text_patterns_ops indexes for ArrayField. 
Backport of dad8434d6f from master
 2015-08-15 10:11:09 -04:00
Tim Graham
632a917c11 [1.8.x] Refs #23843 -- Updated Oracle annotations workaround to reflect latest status. 
Backport of f9636fdf92 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 ece78684d9 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 5643a3b51b and
81e1a35c36.

Thanks Carl Meyer for review.

Backport of 5980b05c1f 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 69db1c7455 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 a7b7f27c05 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 9f73009e98 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 8972818289 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 1a76257b1b 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 0abb06930f from master
 2015-08-01 07:38:20 -04:00
Claude Paroz
22e9c87bb8 [1.8.x] Updated GeoIP test for newer versions 
Backport of 3f9dca62cb 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 5b6ca15073 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 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
Yosuke Yasuda
269315d81a [1.8.x] Fixed #25108 -- Fixed a test which failed on Pillow 2.9+ 
Backport of a2b999dfca 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 13dca01af0 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 bc98bc56a5 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 f9c3587b51 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 ca58181bac 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 aabb58428b 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 e291fc4757 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 a50b66da30 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 d3e12c9017 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 d3d66d4722 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 cf6ce279c7 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 65296b3be3 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 bfb5b7150f from master
 2015-06-15 17:31:50 -04:00
Tim Graham
062ce508b0 [1.8.x] Fixed flake8 warnings on Python 3. 
Backport of 47fcbe506c 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 a0047c6242 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:
* c2bc1cefdc
* e89c3a4603
 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 c2b4967e76 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 2a7c59cd88 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 08232ef84d from master
 2015-06-06 09:11:46 -04:00