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

15340 Commits

Author SHA1 Message Date
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
Claude Paroz 1d874ce0f9 [1.6.x] Set 'bidi' Urdu property to True 
Refs #20454.
Backport of e4a67fd90 from master.
 2013-08-30 12:04:17 +02: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
Anssi Kääriäinen cd10e998b6 [1.6.x] Removed stale add_q() comment 
Backport of 13be3bfef1 from master
 2013-08-30 09:46:16 +03:00
Jorge C. Leitão 60df34d477 [1.6.x] Added links to file docs. 
Backport of d72f83c410 from master
 2013-08-29 12:49:27 -04: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 58157be5ad [1.6.x] Fixed #20984 -- Stopped decoding bytes in sqlite3 adapter on Python 3 
Thanks lvella at gmail.com for the report.
Backport of 169637649 from master.
 2013-08-29 08:43:35 +02:00
Phaneendra Chiruvella 68eca2b36f [1.6.x] Minor spelling correction in ModelForms docs 
Backport of 2fbf949760 from master
 2013-08-28 07:12:38 -04:00
Krzysztof Jurewicz 544a190ebf [1.6.x] Fixed #20981 -- Noted the default value of disable_existing_loggers. 
Backport of 095643e691 from master
 2013-08-27 10:27:44 -04:00
Jan Böcker c4e2e4f630 [1.6.x] Fixed typo in docs/topics/conditional-view-processing.txt 
Backport of 5fd2c979cb from master
 2013-08-27 09:22:31 -04:00
Matt Robenolt 28026c3e26 [1.6.x] Updated instructions for running contrib tests. 
Backport of 08e7a64369 from master
 2013-08-27 08:24:31 -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
Ramiro Morales 2a166623a6 [1.6.x] Typos introduced in 57c82f909b. 2013-08-22 22:33:59 -03: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
Kevin Christopher Henry bf9382fb02 [1.6.x] Documentation -- Clarified use of 'view' in test client introduction. 
Backport of 2e926b041c from master
 2013-08-22 09:39:14 -04:00
Marc Tamlyn 8d02c378ab [1.6.x] Fixed #20944 -- Removed inaccurate statement about View.dispatch(). 
Backport of bac4d03ce6 from master
 2013-08-22 09:21:28 -04:00
Ramiro Morales 26a4c83598 [1.6.x] Made description of LANGUAGE_CODE setting more clear. 
297f5af222 from master.
 2013-08-22 08:29:59 -03:00
Claude Paroz ff92a6eb5b [1.6.x] Moved translator comment just above the target string 
Backport of 8cd874298 from master.
 2013-08-22 09:54:35 +02: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
Kevin Christopher Henry 69a4594cb7 [1.6.x] Documentation -- Corrected error about Model.full_clean() 
Although the ModelForm validation code was changed to call
Model.full_clean(), the documentation still said otherwise. The
offending phrase was removed.

Backport of bb011cf809 from master
 2013-08-21 17:46:18 -04:00
Tim Graham 28b1317fd8 [1.6.x] Fixed #20949 -- Typo #2 in docstring 
Backport of 0073f1d94f from master
 2013-08-21 10:50:27 -04:00
Tim Graham b0821e6d3a [1.6.x] Fixed docstring typo, thanks minddust. 
Backport of d3ed15b79d from master
 2013-08-21 09:02:19 -04:00
Kevin Christopher Henry e7d4d41a30 [1.6.x] Documentation - Noted that OneToOneField doesn't respect unique. 
Added OneToOneField to the list of model fields for which the unique
argument isn't valid. (OneToOneFields are inherently unique, and if
the user supplies a value for unique it is ignored / overwritten.)
 2013-08-20 21:20:55 -07: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
Simon Charette e7a6eaf5fe [1.6.x] Correctly format missing Pillow/PIL exceptions messages. refs #19934 
Backport of b9590a6935 from master.
 2013-08-19 18:51:22 -04:00
Harm Geerts a6ac4f90d0 [1.6.x] Fixed #20829 -- Skip postgis metadata tables with introspection 
Backport of 24088618 from master.
 2013-08-16 21:21:41 +02:00
Claude Paroz 1b48de06c3 [1.6.x] Updated translation templates 2013-08-16 15:13:31 +02: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 7825fb8788 [1.6.x] Fixed #20891 -- Removed part of the tutorial that requires pytz 
Thanks AtomicSpark for the report.

Backport of 55339a7669 from master
 2013-08-15 15:31:57 -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
James Bennett d2419bb2b8 [1.6.x] Added release date to 1.5 release notes. 
Forwardport of 61283a8208 from 1.5.x
 2013-08-15 07:41:53 -04:00
Alasdair Nicol 52741004f6 [1.6.x] Updated docs following deprecation of django.views.defaults.shortcut 
Follows 3f2befc

Backport of 354009d67e from master
 2013-08-15 07:07:15 -04:00
Tim Graham 8bd5251fd5 [1.6.x] Added some doc links for django.contrib.messages 
Backport of b6178fa24b from master
 2013-08-14 12:58:19 -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
Loic Bistuer 39db994790 [1.6.x] Fixed overflow for the "Recent Actions" widget on the admin index. 
Previously the CSS targeted "li.changelink" and therefore didn't
work for the "add" and "delete" actions.

Refs #14868.

Backport of 33fc083b0d from master
 2013-08-13 13:26:37 -04:00
Tim Graham 529afa7138 Added 1.4.6/1.5.2 release notes. 2013-08-13 11:17:07 -05:00
Jacob Kaplan-Moss 57dc238d0e Bumped version numbers for 1.6b2. 2013-08-13 11:12:07 -05: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
Jacob Kaplan-Moss 79594b40c0 Fixed is_safe_url() to reject URLs that use a scheme other than HTTP/S. 
This is a security fix; disclosure to follow shortly.
 2013-08-13 11:05:41 -05:00
Tim Graham 4f470f5186 [1.6.x] Added missing release notes for older versions of Django 
Backport of 3f6cc33cff from master
 2013-08-12 14:07:58 -04:00
Tim Graham 43f12f368b [1.6.x] Fixed #20890 -- Added missing import in class-based view docs. 
Thanks André Augusto.

Backport of ab680725bf from master
 2013-08-10 18:08:27 -04:00
Tim Graham 2cd1439c06 [1.6.x] Fixed #20868 -- Added an email to django-announce as a security step. 
Thanks garrison for the report.

Backport of 5737c57d95 from master
 2013-08-09 16:02:54 -04:00
Tim Graham 7c5d43eea0 [1.6.x] Added an anchor for django.forms.Form.clean in docs 
Backport of 8442268869 from master
 2013-08-08 14:14:14 -04:00
Jaime Irurzun 7836bd502c [1.6.x] Clarifed meaning of models.User.is_authenticated() 
Backport of f96fe3cd1e from master
 2013-08-08 10:27:34 -04:00