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

4329 Commits

Author SHA1 Message Date
Tim Graham 778d4da9cc [1.6.x] Fixed #21098 -- Applied sensitive_post_parameters to MultiValueDict 
Thanks simonpercivall for the report and bmispelon for the review.

Backport of 2daada800f from master
 2013-09-18 09:56:01 -04:00
Tim Graham dbad65ded7 [1.6.x] Fixed bad backport in last commit; refs #21118 2013-09-18 09:52:29 -04:00
Tim Graham 14e139ecdf [1.6.x] Fixed #21118 -- Isolated a test that uses the database. 
Thanks rmboggs for the report.

Backport of 4f40b97d97 from master
 2013-09-18 09:43:10 -04:00
Tim Graham 275497c570 [1.6.x] Fixed #15625 -- Made message in MultiValueDictKeyError less verbose. 
Thanks margieroginski for the suggestion.

Backport of 893198509e from master
 2013-09-18 06:49:59 -04:00
Anssi Kääriäinen 4c4954a3c1 [1.6.x] Added tests for double-pickling a QuerySet 
Refs #21102.

Backpatch of 74b91b3888
 2013-09-14 10:36:48 +03:00
Tim Graham 536cc64240 [1.6.x] Prevented arbitrary file inclusion with {% ssi %} tag and relative 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 21:03:51 -04:00
Aymeric Augustin f9f792eb04 [1.6.x] Took advantage of django.utils.six.moves.urllib.*. 
Backport of 6a6428a36 from master.
 2013-09-10 21:29:31 +02:00
Aymeric Augustin b085e7c303 [1.6.x] Further hardening. Refs #18766. 
Backport of c687bf0 from master.
 2013-09-08 20:43:33 +02:00
Aymeric Augustin 0035a0ce2e [1.6.x] Hardened the test introduced in ded11aa6. Refs #18766. 
Inputs acceptable to time.mktime are platform-dependent.

Backport of 1a1e1478 from master.
 2013-09-08 19:41:34 +02:00
Aymeric Augustin 7c31e195db [1.6.x] Fixed #18766 -- Pointed to pytz when LocalTimezone fails. 
Thanks void for the report.

Backport of ded11aa6 from master.
 2013-09-08 09:17:03 +02:00
Tim Graham be9930d7be [1.6.x] Fixed deprecation warning on Python 3 
Backport of b7451b72 from master.
 2013-09-07 13:15:13 -05:00
Aymeric Augustin 7fcd6aa669 [1.6.x] Fixed #20530 -- Properly decoded non-ASCII query strings on Python 3. 
Thanks mitsuhiko for the report.

Backport of 65b6eff3 and adaptation of 8aaca65 from master.
 2013-09-07 12:06:38 -05:00
Aymeric Augustin fac5735a3d [1.6.x] Fixed #20557 -- Properly decoded non-ASCII cookies on Python 3. 
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-07 10:45:24 -05:00
Aymeric Augustin f855058c35 [1.6.x] Fixed #11811 -- Data-loss bug in queryset.update. 
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-06 21:59:28 -05:00
Russell Keith-Magee 2a2ac5c140 Merge pull request #1566 from adamsc64/ticket_11857 
Fixed #11857 -- Added missing 'closed' property on TemporaryFile class.

Backport of 926bc42 from trunk.
 2013-09-06 19:44:25 -05:00
Russell Keith-Magee 3df9647ad9 [1.6.x] Merge pull request #1582 from rca/12756-missing-yaml-module-serializer-error-message 
Fixed #12756: Improved error message when yaml module is missing.

Backport of 4f5faa1916 from master.
 2013-09-06 19:01:24 -05:00
Russell Keith-Magee 99952bab30 [1.6.x] Merge pull request #1580 from ianawilson/ticket_16502 
Fixed #16502 -- Fixed a TemplateDoesNotExist error that should be an ImproperlyConfigured.

Assistance on the patch from #jambronrose.

Backport of 9b2dc12b83 from master.
 2013-09-06 17:39:16 -05:00
Russell Keith-Magee b917458f47 Merge pull request #1579 from ianawilson/ticket_21058 
[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 122020fdb9 from master.
 2013-09-06 17:11:07 -05:00
Eric Boersma 180b9955cc [1.6.x] Fixed #21035 -- Changed docs to treat the acronym SQL phonetically. 
The documentation and comments now all use 'an' to
refer to the word SQL and not 'a'.

Backport of 4d13cc56de from master
 2013-09-05 20:16:14 -04:00
Tim Graham 77cf0d6519 [1.6.x] Fixed #21041 -- Removed a duplicate form in tests. 
Thanks tuxcanfly.

Backport of bab039d74c from master
 2013-09-05 06:32:26 -04:00
Aymeric Augustin 115318051c [1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0. 
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 07:34:45 -05:00
Carl Meyer 21a3efcf48 [1.6.x] Fixed #20999 - Allow overriding formfield class with choices, without subclass restrictions. 
Refs #18162. Thanks claudep and mjtamlyn for review.

Backport of 7211741fc5 from master.
 2013-08-30 17:45:14 -06:00
Anssi Kääriäinen 76e38a2177 [1.6.x] Fixed #20988 -- Added model meta option select_on_save 
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 e973ee6a98 from master

Conflicts:
	django/db/models/options.py
	tests/basic/tests.py
 2013-08-30 09:47:34 +03:00
Tim Graham 10d15f79e5 [1.6.x] Fixed #14786 -- Fixed get_db_prep_lookup calling get_prep_value 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 12:14:40 -04:00
Tim Graham ef1259342b [1.6.x] Fixed #16433 -- Fixed a help_text/read only field interaction that 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 09:45:02 -04:00
Claude Paroz 2c08d474a8 [1.6.x] Fixed #20961 -- Fixed HttpResponse default empty content 
Thanks epandurski at gmail.com for the report.
Backport of f4e980456 from master.
 2013-08-24 18:10:50 +02:00
Tim Graham 5f061986b9 [1.6.x] Fixed #20922 -- Allowed customizing the serializer used by 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 17:55:01 -04:00
Anssi Kääriäinen 161e26c2ec [1.6.x] Fixed #20955 -- select_related regression 
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 8d65b6082c.

Conflicts:

	django/db/models/sql/compiler.py
	tests/queries/tests.py
 2013-08-22 10:59:59 +03:00
Florian Apolloner 12d364a9b0 [1.6.x] Fixed #20933 -- Allowed loaddata to load fixtures from relative paths. 
Backport of 6e846f7627 from master.
 2013-08-20 21:28:14 +02:00
Anssi Kääriäinen b189169ed0 [1.6.x] Fixed invalid testing fixture 
Backport of 86f4459f9e from master
 2013-08-20 17:49:00 +03:00
Anssi Kääriäinen 2b1101a4a6 [1.6.x] Fixed #20820 -- Model inheritance + m2m fixture loading regression 
Tests by Tim Graham, report from jeroen.pulles@redslider.net.

Backport of 1ed77e7782 from master
 2013-08-20 17:15:52 +03:00
Simon Charette 3ae585b449 [1.6.x] Fixed a test failure introduced in f0bc2865ff. 
`classobj` objects cannot be weakly referenced on Python 2.6
 2013-08-20 04:08:41 -04:00
Simon Charette f0bc2865ff Fixed #20943 -- Weakly reference senders when caching their associated receivers 
Backport of e55ca60903 from master.
 2013-08-20 02:12:50 -04:00
Tim Graham c769c26601 [1.6.x] Revert "Fixed #18491 -- deleting a proxy doesn't show warning about cascade deletes" 
This reverts commit 2b48fcc607.

It introduced a regression (#20777) which we can't easily fix in 1.6.
 2013-08-16 07:59:16 -04:00
Alasdair Nicol 919934602f [1.6.x] Fixed #20895 -- Made check management command warn if a BooleanField 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
 2013-08-15 20:33:02 -04:00
Tim Graham ccff25b143 [1.6.x] Fixed #17778 -- Prevented class attributes on context from resolving as template variables. 
Thanks KyleMac for the report, regebro for the patch, and Aymeric for the test.

Backport of 71b5617c24 from master.
 2013-08-15 10:22:56 -04:00
Florian Apolloner b720ece065 [1.6.x] Removed unneeded conditional_escapes from the testsuite. 
Backport of 4e50e40654 from master.
 2013-08-13 22:24:14 +02:00
Jacob Kaplan-Moss bfbae15c66 Apply autoescaping to AdminURLFieldWidget. 
This is a security fix; disclosure to follow shortly.
 2013-08-13 11:06:00 -05:00
Collin Anderson e3e0cf8a0f [1.6.x] Fixed #20865 -- Fixed raw_id_fields to work with callable limit_choices_to. 
Backport of d53e574676 from master
 2013-08-06 13:44:31 -04:00
Alex Cucu 80b95a2b1f [1.6.x] Fixed #19918 -- Modified select_for_update to run on the write database. 
Backport of 1c64a0f29e from master
 2013-08-06 10:58:32 -04:00
Anssi Kääriäinen 363b81c59c [1.6.x] Fixed ordering related test failure 
Also PEP8 + python_2_unicode_compatible cleanup done.

Backport of 263b873599 from master
 2013-08-06 10:34:42 +03:00
Tim Heap 891cdf120a [1.6.x] Fixed #20850 -- Added MultiWidget.needs_multipart_form 
Backport of 75c87e2d38 from master
 2013-08-05 10:13:48 -04:00
Aymeric Augustin 2eac989985 [1.6.x] Fixed #20822 -- Set content type of default error pages to 'text/html'. 
Thanks Jimmy Song for the patch.

Backport of 7843775 from master.
 2013-08-04 11:04:58 +02:00
Petr Dlouhý 4e7745cc1c [1.6.x] Fixed LogEntry.get_admin_url() for non-existent models. 
Regression introduced by [369b6fa]; refs #18169.

Backport of 1b47508ac8 from master
 2013-08-02 12:51:46 -04:00
Loic Bistuer 4f8fb19994 [1.6.x] Fixed #18681 -- GenericInlineModelAdmin.get_formset() no longer bypasses get_fieldsets(). 
Refs 23e1b59 which already fixed this issue for ModelAdmin and InlineModelAdmin.

Backport of a0ed2f9260 from master
 2013-08-02 10:45:58 -04:00
Aleksandra Sendecka 6e4fd816c4 [1.6.x] Fixed #18777 -- Localized form fields with as_text/as_hidden 
Thanks croldan for the report.

Backport of 893d8de6f5 from master
 2013-08-02 08:43:19 -04:00
Tim Graham 196cc875b2 [1.6.x] Fixed #17519 -- Fixed missing SQL constraints to proxy models. 
Thanks thibaultj for the report, jenh for the patch,
and charettes for the tests.

Backport of aa830009de from master
 2013-08-02 08:42:19 -04:00
Baptiste Mispelon badca4716f [1.6.x] Fixed #10491 -- Allowed passing lazy objects to HttpResponseRedirect. 
Thanks liangent for the report.

Backport of 3c45fb8589 from master
 2013-07-30 13:40:18 -04:00
Florian Apolloner 081a27c358 [1.6.x] Simplified smart_urlquote and added some basic tests. 
Backport of b70c371fc1 from master.
 2013-07-28 10:07:01 +02:00
Tim Graham dbbd2b1272 [1.6.x] Fixed #20805 -- Removed an extra colon beside checkboxes in the admin. 
Thanks CollinAnderson for the report.

Backport of 8676318d2d from master
 2013-07-26 14:47:58 -04:00