Commit Graph

12300 Commits

Author SHA1 Message Date
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
Tim Graham b1dc128a03 [1.8.x] Fixed #24578 -- Fixed crash with QuerySet.update() on FK to O2O fields.
Thanks Anssi Kääriäinen for review.

Backport of 10b4c010ab2cdaa6ba8bfaec3e3540299ea77be from master
2015-04-09 08:24:07 -04:00
Patryk Zawadzki 9f632dc702 [1.8.x] Fixed #24513 -- Made sure a model is only rendered once during reloads
This also prevents state modifications from corrupting previous states.
Previously, when a model defining a relation was unregistered first,
clearing the cache would cause its related models' _meta to be cleared
and would result in the old models losing track of their relations.

Backport of 0385dad073 from master
2015-04-07 14:56:33 +02:00
Jon Dufresne 551d4bb46a [1.8.x] Fixed #24584 -- Fixed microsecond handling with older MySQLdb
Backport of 2cf58e80d from master.
2015-04-06 22:45:36 +02:00
Marten Kenbeek 773387ce42 [1.8.x] Fixed #24278 -- Fixed serialization of migration operations.
Fixed MigrationWriter.serialize() to correctly handle migration
operations by utilizing OperationWriter.

Thanks Piotr Maliński for the report.

Backport of e8e4f978dd from master
2015-04-05 20:29:27 +02:00
Marten Kenbeek 651cc369ad [1.8.x] Refs #24278 -- Allowed multi-line serializations in OperationWriter.
Changed OperationWriter to support multi-line serialized values with
correct indentation.

Backport of d597174bd4 from master
2015-04-05 20:29:21 +02:00
Claude Paroz 3a76276212 [1.8.x] Fixed #24569 -- Made some translation functions accept None value
get_language() can return None when translations are deactivated.
Thanks Nicola Peduzzi for the reporti and Tim Graham for the review.
Backport of 7a0d9b5cda from master.
2015-04-04 10:58:54 +02:00
Claude Paroz 7821f856a6 [1.8.x] Fixed #24571 -- Restored testserver positional arguments parsing
Thanks Domas Lapinskas for the report and Tim Graham for the
review.
Backport of 426b63ba04 from master.
2015-04-04 10:48:40 +02:00
Preston Timmons 7ae7600d2b [1.8.x] Updated docstring for firstof tag to reflect new auto-escaping behavior.
Backport of a1842e3299 from master
2015-04-03 07:29:09 -04:00
Matt Hooks 5e4a69e07d [1.8.x] Fixed typo in django.core.files.File docstring.
Backport of 2c39f282b8 from master
2015-04-02 20:39:00 -04:00
Baptiste Mispelon 09188b5024 [1.8.x] Fixed #24566 -- Added support for serializing timedelta
Thanks to knbk for the report.

Backport of 30a3c2f74c from master.
2015-04-02 17:41:08 +02:00
Tim Graham 349c15b45e [1.8.x] Post-release version bump. 2015-04-01 16:18:03 -04:00
Tim Graham feac4c30ce [1.8.x] Bumped version for 1.8 release. 2015-04-01 15:46:45 -04:00
Claude Paroz 72de42cd40 [1.8.x] Refs #24500 -- Avoided locale.getpreferredencoding in makemessages
Fixes a regression introduced in 53c2cf1e.
Backport of 3f4e77840 from master.
2015-04-01 20:03:51 +02:00
Tim Graham 5c63c45512 [1.8.x] Fixed #23441, #24555 -- Improved the behavior of InclusionNode.
This change:

* Makes the InclusionNode cache-safe by removing render-time side effects
  to its nodelist.
* Ensures the render_context stack is properly scoped and reset by updating
  the render call to use Template.render rather than Nodelist.render.

Backport of 0808ccce38 from master
2015-04-01 13:12:18 -04:00
Tim Heap ff8eabc5cc [1.8.x] Fixed #24538 -- Allowed self in Jinja context
Rendering a Jinja template with self in the context threw an error.
While self is a reserved variable in Jinja, including self in the
context is not an error, so Django should respect that.

Backport of 4ea1909d3c from master
2015-04-01 12:27:52 -04:00
Claude Paroz 5483c66f85 [1.8.x] Fetched updated contrib translations from Transifex 2015-04-01 15:05:29 +02:00
Claude Paroz d1b206daf8 [1.8.x] Fetched updated core translations from Transifex 2015-04-01 14:54:32 +02:00
Markus Holtermann 2218f7617e [1.8.x] Refs #24554 -- Prevented rendering of unused migrations
Thanks Claude Paroz and Tim Graham for the review

Backport of 3e7d9d05ac from master
2015-04-01 11:14:55 +02:00
Markus Holtermann 0c7e2833d9 [1.8.x] Fixed #24554 -- Sped up migrations by rendering initial apps when they are first needed
Calling Migration.mutate_state() now also allows to do in_place
mutations in case an intermediate state is thrown away later.

Thanks Anssi Kääriäinen for the idea, Ryan Hall for parts of the patch,
and Claude Paroz and Tim Graham for the review

Backport of 57dc8dd3fa from master
2015-04-01 11:14:55 +02:00
Andriy Sokolovskiy 121c5f7d5b [1.8.x] Removed duplicate attribute in MySQL DatabaseSchemaEditor.
Backport of 29b4a3f513 from master
2015-03-30 19:24:06 -04:00
Moritz Sichert 44a05a8a91 [1.8.x] Fixed #24469 -- Refined escaping of Django's form elements in non-Django templates.
Backport of 1f2abf784a from master
2015-03-27 20:01:41 -04:00
Tim Graham b81ce2ed67 [1.8.x] Fixed #24532 -- Restored fallback support for allow_syncdb. 2015-03-24 10:33:50 -04:00
Josh Smeaton e654123f7f Fixed #24485 -- Allowed combined expressions to set output_field 2015-03-22 17:41:12 +11:00
Josh Smeaton 3a1886d111 [1.8.x] Fixed #24508 -- Made annotations commutative
Backport of 127b3873d0 from master
2015-03-22 17:35:22 +11:00
Pakal dc2cff5fcb [1.8.x] Fixed #24500 -- Fixed makemessages encoding problems retrieving gettext version.
Backport of 53c2cf1e7b from master
2015-03-21 09:10:01 -04:00
Claude Paroz 8e4b0d6010 [1.8.x] Fixed #24515 -- Fixed DjangoTranslation plural handling
Backport of 9e83f30cd3 from master.
2015-03-21 10:29:22 +01:00
Jon Walsh 2b267a70a1 [1.8.x] Fixed typo in escape_filter() docstring.
Backport of 8d90489fe0 from master
2015-03-19 07:22:21 -04:00
Tim Graham e3c9412d86 [1.8.x] Bumped version to 1.8 rc 1. 2015-03-18 19:23:22 -04:00
Tim Graham 770427c289 [1.8.x] Made is_safe_url() reject URLs that start with control characters.
This is a security fix; disclosure to follow shortly.
2015-03-18 19:23:21 -04:00
Tim Graham 5447709a57 [1.8.x] Fixed an infinite loop possibility in strip_tags().
This is a security fix; disclosure to follow shortly.
2015-03-18 19:23:21 -04:00
Karl Hobley a8c53041f9 [1.8.x] Fixed #24495 -- Allowed unsaved model instance assignment check to be bypassed.
Backport of 81e1a35c36 from master
2015-03-18 19:12:46 -04:00
Moritz Sichert 571e093a25 [1.8.x] Refs #24469 -- Fixed escaping of forms, fields, and media in non-Django templates.
Backport of 6bff343989 from master
2015-03-18 09:11:44 -04:00
Claude Paroz 1cd2584c98 [1.8.x] Updated translation catalogs
Strings are frozen in anticipation of the Django 1.8 release.
2015-03-18 09:29:12 +01:00
Claude Paroz 1bb712d79c [1.8.x] Removed translations from contrib.messages
The only one translatable string will be handled in the core catalog.
2015-03-18 09:28:28 +01:00
Josh Smeaton a0cebe82b5 [1.8.x] Refs #24485 -- Renamed some expression types
Backport of 88d798d71a from master
2015-03-17 08:40:45 -04:00
Josh Smeaton 34e09e532d [1.8.x] Fixed #24486 -- Fixed error with datetime and DurationField arithmetic
Backport of ff2aa40192 from master
2015-03-17 08:36:15 -04:00
John Giannelos e150bbd4d6 [1.8.x] Fixed #24427 -- Stopped writing migration files in dry run mode when merging.
Also added display of migration to stdout when verbosity=3.

Backport of 8758a63ddb from master
2015-03-16 19:45:55 -04:00
Marten Kenbeek febcbbf89d [1.8.x] Fixed #24488 -- Made create_default_site() use default pk of 1.
Fixed create_default_site() to use a default value in case
settings.SITE_ID isn't set; refs #23945.

Backport of 818182b514 from master
2015-03-16 13:31:22 -04:00
Tim Graham da8b3aa7eb [1.8.x] Fixed #24480 -- Marked strings in contrib.gis templates for translation.
Backport of 21ffbb06ec from master
2015-03-14 15:20:53 -04:00
Sævar Öfjörð Magnússon 8fe451d183 [1.8.x] Fixed #24478 -- Added NUMBER_GROUPING value for Icelandic
Backport of d8de9a64d7 from master.
2015-03-13 16:57:37 +01:00
Tim Graham aba74d6f1e [1.8.x] Fixed escaping regression in urlize filter.
Now that the URL is always unescaped as of refs #22267,
we should re-escape it before inserting it into the anchor.

Backport of 7b1a67cce5 from master
2015-03-10 19:12:20 -04:00
Tim Graham 449d1effb8 [1.8.x] Bumped version to 1.8 beta 2. 2015-03-09 10:22:51 -04:00
Erik Romijn d16e4e1d6f [1.8.x] Fixed #24464 -- Made built-in HTML template filter functions escape their input by default.
This may cause some backwards compatibility issues, but may also
resolve security issues in third party projects that fail to heed warnings
in our documentation.

Thanks Markus Holtermann for help with tests and docs.

Backport of fa350e2f30 from master
2015-03-09 09:31:07 -04:00
Anssi Kääriäinen 3a0fe942dd [1.8.x] Fixed #24171 -- Fixed failure with complex aggregate query and expressions
The query used a construct of qs.annotate().values().aggregate() where
the first annotate used an F-object reference and the values() and
aggregate() calls referenced that F-object.

Also made sure the inner query's select clause is as simple as possible,
and made sure .values().distinct().aggreate() works correctly.

Backport of fb146193c4 from master
2015-03-09 07:51:05 -04:00
Jean-Louis Fuchs 1ae2df6bfc [1.8.x] Fixed #24447 -- Made migrations add FK constraints for existing columns
When altering from e.g. an IntegerField to a ForeignKey, Django didn't
add a constraint.

Backport of f4f0060fea from master
2015-03-07 14:15:27 +01:00
Claude Paroz ac07890f95 [1.8.x] Fixed urlize regression with entities in query strings
Refs #22267.
Thanks Shai Berger for spotting the issue and Tim Graham for the
initial patch.
Backport of ec808e807 from master.
2015-03-06 22:22:51 +01:00
Josh Smeaton 823f8cdbc9 [1.8.x] Fixed #24420 -- Allowed ordering by case expressions
Backport of ceaf31adff from master
2015-03-06 13:31:43 +11:00
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 36a17be9f3 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 fe42bfaaff 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 a9e29fae10 from master
2015-03-04 15:44:38 +01:00
Mathias André 44dd65fb2c [1.8.x] Removed outdated docstring for get_admin_url().
Since a4b8a4b632 the admin
URL returned by get_admin_url() is no longer relative to
the Django admin index page.

Backport of 85757d0e79 from master
2015-03-03 07:47:32 -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
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 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 47b35b1844 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 65441bbdb0 from master
2015-02-24 20:05:16 -05:00
Stanislas Guerra a3fca05b05 [1.8.x] Fixed #24395 -- Ensured inline ModelsForms have an updated related instance.
Backport of 4c2f546b55 from master
2015-02-24 11:49:27 -05:00
Tim Graham 41d5ed480c [1.8.x] Fixed #24377 -- Fixed model inline formsets with primary key's that have defaults.
Backport of 1306cd1e8a from master
2015-02-23 09:01:00 -05:00
Emin Mastizada ff2e0896a3 [1.8.x] Added formats for the Azerbaijani locale.
Backport of dda2a3cf4c 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 f95122e541 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 78d43a5e10 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
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
Michael Angeletti 1feeefe918 [1.8.x] Fixed #24376 -- added verbose_name arg to UUIDField
Backport of ea3168dc6c from master
2015-02-21 14:26:47 -05:00
Don Kirkby 5131aec7d2 [1.8.x] Fixed typo in django/db/models/fields/files.py comment.
Backport of 99a1bbf985 from master
2015-02-20 20:11:58 -05:00
foresmac 3207fcd0a0 [1.8.x] Fixed #24341 -- Added specific error messages to RangeField subclasses
Backport of 1d1d5d1c31 from master
2015-02-20 16:50:41 -05:00
Aymeric Augustin e4e140c49b [1.8.x] Removed a non-obvious side-effect of assigning Context.template.
Explicit is better than implicit.

Backport of 51b606f from master
2015-02-20 22:28:24 +01:00
Anssi Kääriäinen 6f03a4ca91 [1.8.x] Fixed #24328 -- cleaned up Options._get_fields() implementation
Backport of bad5f262bf from master
2015-02-20 13:11:59 -05:00
Loic Bistuer 3a6c37fce4 [1.8.x] Fixed #24351, #24346 -- Changed the signature of allow_migrate().
The new signature enables better support for routing RunPython and
RunSQL operations, especially w.r.t. reusable and third-party apps.

This commit also takes advantage of the deprecation cycle for the old
signature to remove the backward incompatibility introduced in #22583;
RunPython and RunSQL won't call allow_migrate() when when the router
has the old signature.

Thanks Aymeric Augustin and Tim Graham for helping shape up the patch.

Refs 22583.

Conflicts:
	django/db/utils.py

Backport of bed504d70b from master
2015-02-20 21:55:50 +07:00
Marc Tamlyn b6ef67d752 [1.8.x] Fixed #24373 -- Added run_validators to ArrayField.
Thanks to DavidMuller for the report.

Backport of c490e410af from master
2015-02-20 11:53:17 +00:00
Marc Tamlyn 3886338c1d [1.8.x] Update converters to take a consistent set of parameters.
As suggested by Anssi. This has the slightly strange side effect of
passing the expression to Expression.convert_value has the expression
passed back to it, but it allows more complex patterns of expressions.

Backport of 32d4db66b9 from master
2015-02-20 11:47:48 +00:00
Marc Tamlyn c54d73ae01 [1.8.x] Fixed #24343 -- Ensure db converters are used for foreign keys.
Joint effort between myself, Josh, Anssi and Shai.

Conflicts:
	django/db/models/query.py
	tests/model_fields/models.py

Backport of 4755f8fc25 from master.
2015-02-20 11:46:57 +00:00
Alex Vidal 82f39bfb1a [1.8.x] Fixed typo in django.core.servers.basehttp message.
Backport of e467919c63 from master
2015-02-19 19:37:22 -05:00
Aymeric Augustin cc4effba0b [1.8.x] Set context.template instead of context.engine while rendering.
This opens more possibilities, like accessing context.template.origin.

It also follows the chain of objects instead of following a shortcut.

Backport of 1bfcc95 from master
2015-02-19 22:10:56 +01:00
Claude Paroz 84e7fec88d [1.8.x] Fixed #20889 -- Prevented BadHeaderError when Python inserts newline
Workaround for http://bugs.python.org/issue20747.
In some corner cases, Python 2 inserts a newline in a header value
despite `maxlinelen` passed in Header constructor.
Thanks Tim Graham for the review.
Backport of efb1f99f94 from master.
2015-02-19 20:19:38 +01:00
Shai Berger 66d37e593c [1.8.x] Fixed #24307: Avoided redundant column nullability modifications on Oracle
Thanks Joris Benschop for the report, and Tim Graham for the tests.

Backport of ceadc94f09 from master
2015-02-19 02:44:08 +02:00
Marten Kenbeek 84c9b24c5a [1.8.x] Fixed #24291 - Fixed migration ModelState generation with unused swappable models
Swapped out models don't have a _default_manager unless they have
explicitly defined managers. ModelState.from_model() now accounts for
this case and uses an empty list for managers if no explicit managers
are defined and a model is swapped out.

Backport of 15dc8d1c9d from master
2015-02-18 19:11:51 +01:00
Adam Chainz 4abadc4872 [1.8.x] Removed unused foreign_key_re variables in MySQL/Oracle DB backends
Backport of e9282747a4 from master
2015-02-18 10:24:40 -05:00
Tim Graham 1153bccc1b [1.8.x] Refs #24324 -- Fixed crash in {% debug %} tag on Python 2.
If Django is installed in a path that contains non-ASCII characters,
the tag failed with UnicodeDecodeError.

Backport of 098fa12dd3 from master
2015-02-18 07:35:56 -05:00
Tim Graham 09da1b465e [1.8.x] Refs #24324 -- Fixed UnicodeDecodeError in MigrationWriter on Python 2.
Backport of fa66ea7532 from master
2015-02-17 18:50:15 -05:00
Tim Graham f9a99c410e [1.8.x] Refs #24324 -- Fixed UnicodeDecodeError in template_backends tests
The message for the SuspiciousFileOperation exception needs to
be a unicode string.

Backport of bebc1e53a3 from master
2015-02-17 18:45:07 -05:00
Tim Graham a1fa0135ec [1.8.x] Refs #24324 -- Fixed get_app_template_dirs() UnicodeDecodeError on Python 2.
The function implemented most of upath(), but skipped the check for
strings that are already unicode.

Backport of bad6280c4e from master
2015-02-17 08:24:36 -05:00
Tim Graham ba3a7636f1 [1.8.x] Refs #24324 -- Fixed UnicodeDecodeError in makemigrations.
If the project path contained a non-ASCII character, Python 2 crashed.

Backport of c9ece2e6b9 from master
2015-02-17 08:14:01 -05:00
Tim Graham 4f43e5c435 [1.8.x] Refs #24324 -- Fixed UnicodeEncodeError in SQLite backend while testing.
If 'name' contained non-ASCII characters, the comparison raised a
UnicodeEncodeError on Python 2.

Backport of 63c5c98701 from master
2015-02-17 08:11:38 -05:00
Tim Graham 9dba901d9c [1.8.x] Refs #24324 -- Fixed makemessages crash when Django is installed in a non-ASCII path.
Backport of 81a94cc616 from master
2015-02-17 08:08:28 -05:00
Tim Graham bcb3bfa5a2 [1.8.x] Refs #24324 -- Fixed management command discovery on non-ASCII paths.
Backport of 4a0aeac1b5 from master
2015-02-17 07:29:30 -05:00
Tim Graham 730fb593ad [1.8.x] Fixed #24335 -- Bumped required psycopg2 version to 2.4.5 (2.5 for contrib.postgres).
Backport of 3adc5f1ee6 from master
2015-02-17 06:21:59 -05:00
Aymeric Augustin d027993ed1 [1.8.x] Removed 'autocommit' options for the psycopg2 backend.
It was documented as not having any effect since Django 1.6.

Backport of a73c8540a8 from master
2015-02-17 06:21:37 -05:00
Aymeric Augustin 30e5356c2e [1.8.x] Cleaned up init_connection_state in the psycopg2 backend.
settings_dict['TIME_ZONE'] is set in ConnectionHandler.ensure_defaults.

Backport of 28e97a9bdc from master
2015-02-17 06:21:24 -05:00
Preston Timmons 2b79a35a83 [1.8.x] Removed unnecessary __init__ definition from DebugLexer.
Backport of ad9ecc2c20 from master
2015-02-16 18:06:53 -05:00
Tim Graham ad2c6a756b [1.8.x] Moved contrib.contenttypes tests out of contrib.
Backport of 664c038f2c from master
2015-02-16 18:06:13 -05:00
Tim Graham 77e3f7dd58 [1.8.x] Fixed #24299 -- Added an auth migration to ensure contenttypes is migrated.
Without this migration, the auth signal handlers will fail if migrating
only auth.

Backport of 4538cbf17d from master
2015-02-16 14:55:24 -05:00
Sergey Fedoseev 870d900cdc [1.8.x] Refs #24299 -- Made contenttypes migrations signal handler more robust.
Backport of d392c1e150 from master
2015-02-16 13:44:04 -05:00
Markus Holtermann a1ba462793 [1.8.x] Fixed #24225, #24264, #24282 -- Rewrote model reloading in migration project state
Instead of naively reloading only directly related models (FK, O2O, M2M
relationship) the project state needs to reload their relations as well
as the model changes as well. Furthermore inheriting models (and super
models) need to be reloaded in order to keep inherited fields in sync.

To prevent endless recursive calls an iterative approach is taken.

Backport of b29f3b5120 from master
2015-02-16 19:38:02 +01:00
Markus Holtermann 681efedce4 [1.8.x] Explicitly checked for LookupError in contenttypes migration
Backport of 4dd1f4c5eb from master
2015-02-16 17:14:33 +01:00
Aymeric Augustin e8950668ca [1.8.x] Deprecated TEMPLATE_DEBUG setting.
Backport of 15b711b from master.
2015-02-15 20:48:48 +01:00
Michael Angeletti e13dca859c [1.8.x] Added missing return value to DurationField.prepare_value(); refs #24339.
Backport of 49647bec6e from master
2015-02-14 18:39:17 -05:00
Aymeric Augustin 87e9cad4a4 [1.8.x] Fixed #24318 -- Set the transaction isolation level with psycopg >= 2.4.2.
Backport of 76356d96 from master
2015-02-14 18:52:28 +01:00