innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
20,550 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

12300 Commits

Author SHA1 Message Date
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
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
Andriy Sokolovskiy d5e3eb986d [1.8.x] Removed unreachable code 
Backport of 4359be023b from master
 2015-08-13 13:12:52 -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
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
Tim Graham ca13fb021f [1.8.x] Fixed import order in django/core/serializers/json.py 2015-07-22 07:01:03 -04:00
Tim Graham 2cad91cac6 [1.8.x] Fixed #25147 -- Fixed debug view copy-paste/interactive toggle. 
The whitespace added in 1101467ce0
broke the initial comparison.

Backport of d7848c11e0 from master
 2015-07-20 11:52:44 -04:00
Cesar Canassa 83b32422aa [1.8.x] Fixed #25123 -- Corrected makemessages --extension help text 
Backport of 561c018d88 from master
 2015-07-14 07:36:17 -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
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
Tim Graham fe367db35f [1.8.x] Post-release version bump. 2015-07-08 16:00:59 -04:00
Tim Graham 4217f1cdeb [1.8.x] Bumped version for 1.8.3 release. 2015-07-08 15:23:19 -04: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
Chris Bainbridge b252e0f350 [1.8.x] Refs #23882 -- Added detection for moved files when using inotify polling 
Commit 15f82c7 ("used pyinotify as change detection system when
available") introduced a regression where editing a file in vim with
default settings (writebackup=auto) no longer causes the dev server
to be restarted. On a write, vim moves the monitored file to a backup
path and then creates a new file in the original. The new file is not
monitored as it has a different inode. Fixed this by also watching for
inotify events IN_DELETE_SELF and IN_MOVE_SELF.

Backport of e5cfa394d7 from master
 2015-07-07 12:26:36 -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
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 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
Mark Lavin 0cfb7ed5c5 [1.8.x] Fixed #24924 -- Join promotion for multiple Case expressions 
Backport of 541f4ea546 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
Alasdair Nicol 2aa65460d5 [1.8.x] Removed comment from Form.changed_data; refs #24191 
Backport of 5987b3c46d from master
 2015-06-04 13:52:25 -04:00
Carl Meyer 2358c1e5d7 [1.8.x] Cleaned up docstring style, per Tim Graham review. 
Backport of 57dbc87ade 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 5c085ea7b3 from master.
 2015-06-03 15:48:53 -06:00
Carl Meyer efdcd13c34 [1.8.x] Fixed #24628 -- Fixed applied status for squashed migrations. 
Backport of 492537ac18 from master.
 2015-06-02 16:21:58 -06:00
Carl Meyer 98b40ffe61 [1.8.x] Fixed #24895 -- Fixed loading a pair of squashed migrations with a dependency. 
Backport of 84522c0d16 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 262d4db8c4 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 2913d6b77d 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 e1e6399c2c from master
 2015-06-02 09:32:22 -04:00
Tim Graham 8911d2e20f [1.8.x] Fixed #24892 -- Fixed quoting of SQL when renaming a field to AutoField in PostgreSQL 
Backport of 5ab8680983 from master
 2015-06-02 09:15:08 -04:00
Tim Graham 2456276b02 [1.8.x] Fixed #24851 -- Fixed crash with reverse one-to-one relation in ModelAdmin.list_display 2015-05-28 10:37:31 -04:00
Andriy Sokolovskiy f65d4db8a8 [1.8.x] Fixed #24817 -- Prevented loss of null info in MySQL field renaming. 
Backport of 80ad5472ce from master
 2015-05-28 10:08:14 -04:00
Paweł Marczewski 7ee6043dba Fixed #24847 -- Prevented items set on a RequestContext from being lost. 
Backport of 300e8baf94 from master
 2015-05-27 10:08:31 -04:00
Tim Graham b16f84f15b [1.8.x] Refs #24836 -- Reverted "Simplified the lazy CSRF token implementation in csrf context processor." 
This reverts commit 8099d33b65 as it caused
a regression that cannot be solved without changing force_text() which has
a small risk of introducing regressions. This change will remain in master
along with an update to force_text().
 2015-05-27 09:29:45 -04:00
Andrea Grandi 62c19a21b6 Fixed #24844 -- Corrected has_changed implementation for HStoreField. 
Backport of 43b2d88a5b from master
 2015-05-25 21:10:07 -04:00
Paweł Marczewski 2aa2b9f291 [1.8.x] Fixed #24835 -- Fixed QuerySet.exists() after an annotation with Count() 
QuerySet.exists() incorrectly handled query.group_by = True
case (grouping by all select fields), causing GROUP BY
expressions to be wiped along with select fields.

Backport of 801a84ae32 from master
 2015-05-25 20:47:28 -04:00
Marten Kenbeek 1ac4c7d415 [1.8.x] Fixed #24848 -- Fixed ValueError for faulty migrations module. 
Added apps to unmigrated apps if the migrations module is a file
or a folder missing __init__.py.

Thanks to Ernest0x for the bug report.

Backport of d73176a842 from master
 2015-05-25 13:56:37 -04:00
Villiers Strauss 4311fd2c0a [1.8.x] Fixed #24841 -- Made BaseRangeField.prepare_value() call base_field's prepare_value() 
Backport of 614bec41b5 from master
 2015-05-25 12:07:25 -04:00
I am Clinton 87934c4b68 [1.8.x] Fixed typos in HTTP decorator docs. 
Backport of 0b0bb6100d from master
 2015-05-25 07:39:06 -04:00
Tim Graham 20e7e77ef7 [1.8.x] Post-release version bump. 2015-05-20 14:10:05 -04:00
Tim Graham 1d3d733a10 Bumped version for 1.8.2 release 2015-05-20 13:49:57 -04:00
Tim Graham 31cb25adec [1.8.x] Fixed incorrect session.flush() in cached_db session backend. 
This is a security fix; disclosure to follow shortly.

Thanks Sam Cooke for the report and draft patch.
 2015-05-20 13:49:07 -04:00
Anssi Kääriäinen db65660928 [1.8.x] Fixed #24705 -- Fixed negated Q objects in expressions. 
Avoided split_exclude() for Q when used as an expression.

Backport of bc87061a3c from master
 2015-05-20 09:41:42 -04:00
Tim Graham aeafdf9398 [1.8.x] Fixed #24784 -- Fixed visibility regression in admin's FK widget. 
Backport of fb94e7b8cf from master
 2015-05-19 21:27:57 -04:00
Claude Paroz cdf7f90f95 [1.8.x] Fixed #24791 -- Added fallback when 'postgres' database isn't available 
Thanks Carl Meyer and Tim Graham for the reviews.
Backport of 322605035 from master.
 2015-05-15 18:46:05 +02:00
Bo Lopker 3c659856eb [1.8.x] Fixed #24799 -- Fixed session cookie deletion when using SESSION_COOKIE_DOMAIN 
Backport of 2dee853ed4 from master
 2015-05-15 11:24:18 -04:00
Claude Paroz 6a0d9f068f [1.8.x] Fixed #24757 -- Recreated MySQL index when needed during combined index removal 
Thanks Thomas Recouvreux for the report and Tim Graham for the tests and
review.
Backport of ae635cc36 from master.
 2015-05-15 17:08:49 +02:00
Tim Graham 30e5703844 [1.8.x] Fixed #24802 -- Delayed GDAL check for OSMGeoAdmin 
Backport of a37dcfd0a3 from master
 2015-05-15 09:20:04 -04:00
Tim Graham df0674eabb [1.8.x] Fixed #24751 -- Fixed HStoreField isnull lookup. 
Backport of 3c8fe5dddf from master
 2015-05-13 10:34:15 -04:00
Abhaya Agarwal 290c9d6654 [1.8.x] Fixed #24698, #24712 -- Added ForeignKey.get_db_prep_value() 
Fixed crashes with ForeignKey to UUIDField and inheritance with UUIDField
primary keys.
 2015-05-12 19:37:37 -04:00
Anssi Kääriäinen d5ce2dd7bc [1.8.x] Fixed #24748 -- Fixed incorrect GROUP BY on MySQL in some queries 
When the query's model had a self-referential foreign key, the
compiler.get_group_by() code incorrectly used the self-referential
foreign key's column (for example parent_id) as GROUP BY clause
when it should have used the model's primary key column (id).

Backport of adc57632bc from master
 2015-05-11 11:52:14 -04:00
Anssi Kääriäinen 056a91dbfa [1.8.x] Fixed #24766 -- Added join promotion for Case expressions 
Backport of be9d645346 from master
 2015-05-11 11:17:37 -04:00
Tim Graham 6a7b27c743 [1.8.x] Fixed #24758 -- Corrected Options.get_fields() docstring. 
Backport of b99114f67f from master
 2015-05-08 13:19:32 -04:00
Tim Graham 39ed6d960e [1.8.x] Fixed #24750 -- Updated two contrib.gis comment links 
Backport of 783572abc4 from master
 2015-05-06 12:08:33 -04:00
Anssi Kääriäinen 5b5858575c [1.8.x] Fixed #24752 -- query crash when reusing Case expressions 
Case expressions weren't copied deep enough (self.cases list was
reused resulting in an error).

Backport of 7b05d2fdae from master
 2015-05-05 11:38:48 -04:00
Milan Broum 0d6b7e4a88 [1.8.x] Allowed using the sqlite3 backend as much as possible without _sqlite3. 
The inner import was dropped during the reorganizing of the database
backends in commit 28308078f3.

Backport of 95058606c8 from master
 2015-05-04 13:00:23 -04:00
Aymeric Augustin 1f0a6082ec [1.8.x] Fixed #24685 -- Fixed check for template name unicity. 
Thanks Preston Timmons for the report.

Backport of 1563b89 from master
 2015-05-04 07:39:28 +02:00
Tim Graham 47374103de [1.8.x] Post-release version bump. 2015-05-01 16:46:49 -04:00
Tim Graham 3d128dcadd [1.8.x] Bumped version for 1.8.1 release. 2015-05-01 16:26:55 -04:00
Tim Graham d7ea279f76 [1.8.x] Fixed #24724 -- Fixed GIS initialization crash on Windows. 
Backport of 3c4fca271b from master
 2015-05-01 16:18:53 -04:00
Tim Graham 77ed1548f2 [1.8.x] Fixed #24676 -- Fixed help text positioning in ``contrib.admin`` filter_* widgets. 
Backport of 2c3ce26beb from master
 2015-05-01 15:32:45 -04:00
daphshez c45fd57f68 [1.8.x] Fixed #23271 -- Fixed makemessages crash/test failure for some locales. 
Backport of 57202a112a from master
 2015-05-01 10:30:19 -04:00
Aric Coady 6b05d3a2e3 [1.8.x] Fixed #24729 -- Removed test db flush when using --keepdb. 2015-04-30 09:50:46 -04:00
Claude Paroz cb370f8510 [1.8.x] Updated translations from Transifex 
Updates for languages: Indonesian, Belarusian, Persian, and Dutch.
 2015-04-30 14:27:51 +02:00
Markus Holtermann bf4dc5733f [1.8.x] Fixed #24725 -- Allowed renaming of target models in ManyToMany relations 
This is a regression caused by introducing rendered migration states in
1aa3e09c20 and the _meta refactoring in fb48eb0581.

Thanks to Danilo Bargen for reporting the issue and Marten Kenbeek and
Tim Graham for triaging the bug and providing the initial test case.

Backport of 63f9b633f9 from master
 2015-04-30 13:46:24 +02:00
Aric Coady b67bd1b483 [1.8.x] Fixed #24719 -- Restored the ability to use interators as queryset related object filters. 
Backport of 9c2d8cde77 from master
 2015-04-28 11:00:58 -04:00
Markus Holtermann 419f296259 [1.8.x] Fixed #24701 -- Converted model manager names to unicode in migrations 
Thanks to Reto Aebersold for reporting the issue and Tim Graham and
Claude Paroz for the review.

Backport of faad6070ee from master
 2015-04-25 18:18:40 +02:00
Markus Holtermann 0cacb8f8ba [1.8.x] Fixed #24573 -- Considered new related models for reloading 
Thanks tttomekkk for the report.

Backport of b93690c465 from master
 2015-04-21 12:06:11 +02:00
Matthew Wilkes 697317f334 [1.8.x] Refs #24354 -- Prevented repointing of relations on superclasses when migrating a subclass's name change 
The issue was hidden on 1.8+ until #24573 due to a bug inside the model
reloading process.

Forwardport of patch from ae87ad005f
 2015-04-21 12:02:27 +02:00
Marten Kenbeek 516907540b [1.8.x] Refs #24591 -- Optimized cloning of ModelState objects. 
Changed ModelState.clone() to create a deepcopy of self.fields.
 2015-04-20 19:23:15 -04:00
Eric Whitmire 901de5fbce [1.8.x] Fixed #24655 -- Fixed JavaScript path of contrib.admin's related field widget 2015-04-17 11:22:22 -04:00
Claude Paroz bbfcd9618b [1.8.x] Fixed #24595 -- Prevented loss of null info in MySQL field alteration 
Thanks Simon Percivall for the report, and Simon Charette and Tim
Graham for the reviews.
Backport of 02260ea3f6 from master.
 2015-04-17 11:01:36 +02:00
Anssi Kääriäinen 581afddc77 [1.8.x] Fixed #24605 -- Fixed incorrect reference to alias in subquery. 
Thanks to charettes and priidukull for investigating the issue, and to
kurevin for the report.

Backport of 355c5edd93 from master
 2015-04-16 09:31:29 -04:00
Anssi Kääriäinen 70ff455a35 [1.8.x] Fixed #24615 -- ordering by expression not part of SELECT 
Fixed queries where an expression was used in order_by() but the
expression wasn't in the query's select clause (for example the
expression could be masked by .values() call)

Thanks to Trac alias MattBlack85 for the report.
Backport of fb5c7748da from master.
 2015-04-16 09:42:42 +02:00
Andrew Pinkham b1d83209d0 [1.8.x] Fixed #24635 -- Updated deprecated urls.py examples in default project template. 
Backport of 0b5abb0321 from master
 2015-04-14 12:58:31 -04:00
peterfarrell 309142dba1 [1.8.x] Fixed #24637 -- Fixed database introspection with SQLite 3.8.9. 
Backport of f8e8853b51 from master
 2015-04-14 11:30:21 -04:00
Joe Borg 6724ae1185 [1.8.x] Added missing periods in migrate help messages. 
Backport of 503bbc49d8 from master
 2015-04-14 08:10:39 -04:00
Jay Wineinger 496800b3bf [1.8.x] Fixed #24611 -- Fixed update() crash with related UUID pk object. 
Backport of 923da0274a from master
 2015-04-13 12:20:41 -04:00
Markus Holtermann 3862826fed [1.8.x] Fixed #24625 -- Prevented arbitrary file inclusion in admindocs 
Thanks Tim Graham for the review.

Backport of 09595b4fc6 from master
 2015-04-11 21:12:09 +02:00
Claude Paroz 774d09a7dd [1.8.x] Fixed #24624 -- Replaced obsoleted rel.opts in admindocs view 
Thanks Scott Sanders for the report, and Markus Holtermann and
Tim Graham for the reviews. Refs #24381.
Backport of 4e7ed8d0d from master.
 2015-04-11 15:34:02 +02:00