summaryrefslogtreecommitdiff
path: root/django
AgeCommit message (Collapse)Author
2013-09-10[1.6.x] Bump version number for 1.6 beta 3 security release.1.6b3James Bennett
2013-09-10[1.6.x] Prevented arbitrary file inclusion with {% ssi %} tag and relative ↵Tim Graham
paths. Thanks Rainer Koirikivi for the report and draft patch. This is a security fix; disclosure to follow shortly. Backport of 7fe5b656c9 from master
2013-09-10[1.6.x] Took advantage of django.utils.six.moves.urllib.*.Aymeric Augustin
Backport of 6a6428a36 from master.
2013-09-09[1.6.x] Fixed #20707 -- Added explicit quota assignment to Oracle test userСадовский Николай
To enable testing on Oracle 12c
2013-09-08[1.6.x] Fixed #18766 -- Pointed to pytz when LocalTimezone fails.Aymeric Augustin
Thanks void for the report. Backport of ded11aa6 from master.
2013-09-07[1.6.x] Fixed 9244447c -- incomplete backport.Aymeric Augustin
The test client had been refactored in the mean time. This commit de-factors the fix. Refs #20530.
2013-09-07[1.6.x] Fixed #20530 -- Properly decoded non-ASCII query strings on Python 3.Aymeric Augustin
Thanks mitsuhiko for the report. Backport of 65b6eff3 and adaptation of 8aaca65 from master.
2013-09-07[1.6.x] Fixed an encoding issue in the test client.Aymeric Augustin
Refs #20530. Backport of 7bb62793 and 476b0764 from master. Conflicts: django/test/client.py
2013-09-07[1.6.x] Fixed #20557 -- Properly decoded non-ASCII cookies on Python 3.Aymeric Augustin
Thanks mitsuhiko for the report. Non-ASCII values are supported. Non-ASCII keys still aren't, because the current parser mangles them. That's another bug. Simplified backport of 8aaca651 and f5add47 from master.
2013-09-06[1.6.x] Fixed #11811 -- Data-loss bug in queryset.update.Aymeric Augustin
It's now forbidden to call queryset.update(field=instance) when instance hasn't been saved to the database ie. instance.pk is None. Conflicts: tests/queries/tests.py Backport of b4cd8169 from master.
2013-09-06Merge pull request #1566 from adamsc64/ticket_11857Russell Keith-Magee
Fixed #11857 -- Added missing 'closed' property on TemporaryFile class. Backport of 926bc42 from trunk.
2013-09-06[1.6.x] Fixed Python 3 syntax error introduced in [c72392da]Tim Graham
Backport of 498014ccd5 from master
2013-09-06[1.6.x] Merge pull request #1582 from ↵Russell Keith-Magee
rca/12756-missing-yaml-module-serializer-error-message Fixed #12756: Improved error message when yaml module is missing. Backport of 4f5faa1916e7c8cb72cc9ebf1a1fd964ba6e707b from master.
2013-09-06[1.6.x] Merge pull request #1580 from ianawilson/ticket_16502Russell Keith-Magee
Fixed #16502 -- Fixed a TemplateDoesNotExist error that should be an ImproperlyConfigured. Assistance on the patch from #jambronrose. Backport of 9b2dc12b8332389d1bfb9e83123a088a084a6a47 from master.
2013-09-06Merge pull request #1579 from ianawilson/ticket_21058Russell Keith-Magee
[1.6.x] Fixed #21058 -- Fixed debug view blowing up when no template is provided to the template rendering functions. Assistance on this commit from @jambonrose. Backport of 122020fdb93980df850ae02f61d97da27e2cb515 from master.
2013-09-06[1.6.x] Fixed #21049 -- Fixed autoreload for Python 3Max Burstein
Changed th system module values check to return a list. In Python 3 it returns a dict_view which could occassionally produce a runtime error of "dictionary changed size during iteration". Backport of 559cb826b8 from master
2013-09-05[1.6.x] Fixed #21035 -- Changed docs to treat the acronym SQL phonetically.Eric Boersma
The documentation and comments now all use 'an' to refer to the word SQL and not 'a'. Backport of 4d13cc56de from master
2013-09-04[1.6.x] Tested exc_type instead of exc_value in __exit__.Aymeric Augustin
exc_value might be None even though there's an exception, at least on Python 2.6. Thanks Thomas Chaumeny for the report. Fixed #21034.
2013-09-04Updated six to version 1.4.1.Aymeric Augustin
2013-09-03[1.6.x] Fixed #21026 -- Corrected help for manage.py test command.Carl Meyer
Backport of 8f7f8bf6884ada8622bc3696c7465c904164d314 from master.
2013-09-03Used six.moves.zip_longest, new in six 1.4.0.Aymeric Augustin
2013-09-03[1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0.Aymeric Augustin
Conflicts: django/db/backends/oracle/base.py django/db/backends/sqlite3/base.py django/db/models/base.py Backport of 365c3e8b from master.
2013-09-03[1.6.x] Updated the bundled version of six to 1.4.0.Aymeric Augustin
Backport of 42920970 from master.
2013-09-03[1.6.x] Fixed #21003 -- Ensured geometry widget return value has SRIDClaude Paroz
Thanks Mathieu Leplatre for the report and initial patch. Backport of dd656073ad from master.
2013-09-03[1.6.x] Isolated map creation JS codeClaude Paroz
Backport of 3550b27a8 from master.
2013-09-03[1.6.x] Prevented rendering attrs to be squashed in OSMWidgetClaude Paroz
Backport of b6889c68d7 from master.
2013-09-03[1.6.x] Fixed syntax error in OSMWidgetClaude Paroz
Backport of 6ecbac21a from master.
2013-09-02[1.6.x] Fixed gis test to run on non gis-enabled settingsClaude Paroz
Refs #20998. Backport of 973502c0 from master.
2013-09-02[1.6.x] Fixed #20998 -- Allow custom (de)serialization for GIS widgetsClaude Paroz
Thanks Mathieu Leplatre for the report and the initial patch. Backport of 102f26c92 from master.
2013-08-30[1.6.x] Fixed #20999 - Allow overriding formfield class with choices, ↵Carl Meyer
without subclass restrictions. Refs #18162. Thanks claudep and mjtamlyn for review. Backport of 7211741fc5d50425 from master.
2013-08-30[1.6.x] Set 'bidi' Urdu property to TrueClaude Paroz
Refs #20454. Backport of e4a67fd90 from master.
2013-08-30[1.6.x] Fixed #20988 -- Added model meta option select_on_saveAnssi Kääriäinen
The option can be used to force pre 1.6 style SELECT on save behaviour. This is needed in case the database returns zero updated rows even if there is a matching row in the DB. One such case is PostgreSQL update trigger that returns NULL. Reviewed by Tim Graham. Refs #16649 Backport of e973ee6a9879969b8ae05bb7ff681172cc5386a5 from master Conflicts: django/db/models/options.py tests/basic/tests.py
2013-08-30[1.6.x] Removed stale add_q() commentAnssi Kääriäinen
Backport of 13be3bfef1 from master
2013-08-29[1.6.x] Fixed #14786 -- Fixed get_db_prep_lookup calling get_prep_value ↵Tim Graham
twice if prepared is False. Thanks homm for the report and Aramgutang and lrekucki for work on the patch. Backport of f19a3669b8 from master
2013-08-29[1.6.x] Fixed #16433 -- Fixed a help_text/read only field interaction that ↵Tim Graham
caused an admin crash. Thanks chris at cogdon.org for the report and admackin for the patch. Backport of af953c45cc from master
2013-08-29[1.6.x] Fixed #20984 -- Stopped decoding bytes in sqlite3 adapter on Python 3Claude Paroz
Thanks lvella at gmail.com for the report. Backport of 169637649 from master.
2013-08-24[1.6.x] Fixed #20961 -- Fixed HttpResponse default empty contentClaude Paroz
Thanks epandurski at gmail.com for the report. Backport of f4e980456 from master.
2013-08-22[1.6.x] Fixed #20922 -- Allowed customizing the serializer used by ↵Tim Graham
contrib.sessions Added settings.SESSION_SERIALIZER which is the import path of a serializer to use for sessions. Thanks apollo13, carljm, shaib, akaariai, charettes, and dstufft for reviews. Backport of b0ce6fe656 from master
2013-08-22[1.6.x] Moved translator comment just above the target stringClaude Paroz
Backport of 8cd874298 from master.
2013-08-22[1.6.x] Fixed #20955 -- select_related regressionAnssi Kääriäinen
In cases where the same connection (from model A to model B along the same field) was needed multiple times in a select_related query, the join setup code mistakenly reused an existing join. Backpatch of 8d65b6082c8bf5df25608d8733470879a8a61d7d. Conflicts: django/db/models/sql/compiler.py tests/queries/tests.py
2013-08-21[1.6.x] Fixed #20949 -- Typo #2 in docstringTim Graham
Backport of 0073f1d94f from master
2013-08-21[1.6.x] Fixed docstring typo, thanks minddust.Tim Graham
Backport of d3ed15b79d from master
2013-08-20[1.6.x] Fixed #20933 -- Allowed loaddata to load fixtures from relative paths.Florian Apolloner
Backport of 6e846f7627ecf0dc15053624a23bfbf47535972d from master.
2013-08-20[1.6.x] Fixed #20820 -- Model inheritance + m2m fixture loading regressionAnssi Kääriäinen
Tests by Tim Graham, report from jeroen.pulles@redslider.net. Backport of 1ed77e7782 from master
2013-08-20Fixed #20943 -- Weakly reference senders when caching their associated receiversSimon Charette
Backport of e55ca60903 from master.
2013-08-19[1.6.x] Correctly format missing Pillow/PIL exceptions messages. refs #19934Simon Charette
Backport of b9590a6935 from master.
2013-08-16[1.6.x] Fixed #20829 -- Skip postgis metadata tables with introspectionHarm Geerts
Backport of 24088618 from master.
2013-08-16[1.6.x] Updated translation templatesClaude Paroz
2013-08-16[1.6.x] Revert "Fixed #18491 -- deleting a proxy doesn't show warning about ↵Tim Graham
cascade deletes" This reverts commit 2b48fcc607010065c0f8107baf669dd41b164f3c. It introduced a regression (#20777) which we can't easily fix in 1.6.
2013-08-15[1.6.x] Fixed #20895 -- Made check management command warn if a BooleanField ↵Alasdair Nicol
does not have a default value Thanks to Collin Anderson for the suggestion and Tim Graham for reviewing the patch. Backport of 22c6497f99 from master