1
0
mirror of https://github.com/django/django.git synced 2024-12-24 01:55:49 +00:00
Commit Graph

13917 Commits

Author SHA1 Message Date
Honza Král
a05ab448f7 Merge pull request #781 from zsiciarz/ticket_19854
Fixed #19854 -- Added test runner option to skip Selenium tests
2013-02-23 08:55:34 -08:00
Zbigniew Siciarz
1cd2f51eb4 Added test runner option to skip Selenium tests (#19854). 2013-02-23 17:45:26 +01:00
Claude Paroz
335a060fa6 Minor cleanups in templates test imports 2013-02-23 17:45:05 +01:00
Lennart Regebro
687d2e967d Fixed #19827 -- Kept stacktrace in defaulttags exception reraising
Thanks Kronuz for the report and the initial patch.
2013-02-23 17:43:17 +01:00
Honza Král
0ad76843b5 Merge pull request #777 from khalas/ticket_19811
Fixed #19811 - Added language code fallback in get_language_info
2013-02-23 08:30:27 -08:00
Tim Graham
f3ae67a62f Updated example to use staticfiles static template tag, thanks reinout for the suggestion, refs #19675. 2013-02-23 11:05:38 -05:00
Honza Král
129d2e8f85 Merge pull request #775 from HiddenData/ticket-18899
Fixed #18899 -- FileSystemStorage.save should support any file-like objects
2013-02-23 08:04:41 -08:00
Konrad Hałas
6bd6a56896 Fixed #19811 - Added language code fallback in get_language_info. 2013-02-23 17:02:07 +01:00
Mathijs de Bruin
8c1cc4b3b0 Fixed regression introduced in 146ed13a.
As override_settings was used after the initialization of the session backend,
we need to use a new session backend here.
2013-02-23 16:53:31 +01:00
Aymeric Augustin
5278776a88 Merge pull request #751 from bmispelon/ticket-6271 2013-02-23 07:47:58 -08:00
Marcin Biernat
664855b74e #18899 FileSystemStorage.save should support any file-like objects 2013-02-23 16:40:50 +01:00
Tim Graham
8d17114899 Fixed #19752 - Changed Postgres version numbers to 9.x to avoid having to update them each minor release. 2013-02-23 10:40:19 -05:00
Tim Graham
9e959e8d58 Updated static file example in overview to use static template tag, refs #19675.
Thanks jezdez for the note.
2013-02-23 10:35:22 -05:00
Vladimir A Filonov
f49e9a517f Fixed #17906 - Autoescaping {% cycle %} and {% firstof %} templatetags.
This commit adds "future" version of these two tags with auto-escaping
enabled.
2013-02-23 16:16:39 +01:00
Tim Graham
a61dbd6219 Fixed #19675 - Added mention of static files to overview.
Thanks Dwight Gunning for the patch.
2013-02-23 10:00:23 -05:00
Honza Král
6cb6e1128f Merge pull request #769 from oinopion/ticket19816
Fixed #19816 -- pre-evaluate queryset on m2m set
2013-02-23 06:55:09 -08:00
Tomek Paczkowski
3dddbc0f23 Fixed #19816: pre-evaluate queryset on m2m set
In ReverseManyRelatedObjectsDescriptor.__set__, evaluate possible
queryset to avoid problems when clear() would touch data this queryset
returns.
2013-02-23 15:50:33 +01:00
Tim Graham
722683f508 Fixed #19887 - Noted when callables may be used in ModelAdmin.fields and ModelAdmin.fieldset.
Thanks Patrick Strasser for the suggestion and Zbigniew Siciarz for the patch.
2013-02-23 09:45:34 -05:00
Tim Graham
1b7fb29dfb Changed "mysite/mytemplates/" -> "mysite/templates" in tutorial.
Thanks James Pic.
2013-02-23 09:19:32 -05:00
Baptiste Mispelon
069280a689 Used token.split_contents() for tokenisation in template tags accepting variables.
Fixed #6271, #18260.
2013-02-23 15:15:30 +01:00
Jannis Leidel
6bbf4e57c8 Fixed embarrassing typo in last commit. 2013-02-23 14:59:51 +01:00
Florian Apolloner
67c39a64e0 Merge pull request #759 from erikr/master
Fix #17751: Added stripping of whitespace for IPAddressField/GenericIPAddressField
2013-02-23 05:58:48 -08:00
Tim Graham
c89717fabe Fixed #17094 - Typo in class-based views doc.
Thanks alej0 for the report.
2013-02-23 08:52:33 -05:00
Jannis Leidel
bb2705d3db Merge pull request #758 from FakoTB/master
Fixed #19572 - Remove document_root argument from staticfiles views.
2013-02-23 05:47:20 -08:00
Erik Romijn
21f333bcef Fix #17751: Added stripping of whitespace for IPAddressField/GenericIPAddressField 2013-02-23 14:44:57 +01:00
fako
2db9cbe97c Removes document_root argument from django.contrib.staticfiles.views.serve
This argument can be removed, because the new way of finding static files doesn't take document_root into account at all.
2013-02-23 14:38:13 +01:00
Jannis Leidel
c12891e8cd Fixed #19850 -- Use configured staticfiles storage to find the URL of a static file in the admin. 2013-02-23 14:36:51 +01:00
Horst Gutmann
2f4a4703e1 Fixed #19758 -- Avoided leaking email existence through the password reset form. 2013-02-23 14:31:21 +01:00
Aymeric Augustin
7acabbb980 Merge pull request #750 from vanschelven/master
Fixed #17663 -- Marked BaseModelFormSet.save as alters_data.
2013-02-23 04:12:11 -08:00
Klaas van Schelven
91c9470664 Method "save" in BaseModelFormSet is marked as alters_data
Fixes #17663
2013-02-23 13:01:28 +01:00
Honza Král
6000600cc5 Merge pull request #749 from ecabuk/master
Fixed #19752 -- Remove the exact Postgresql version from gis doc
2013-02-23 02:35:32 -08:00
Evrim Çabuk
48a9194755 Remove the exact Postgresql version number from gis install documentation
ref #19752
2013-02-23 11:53:10 +02:00
Claude Paroz
7ec2a21be1 Fixed #19686 -- Added HTML5 number input type
Thanks Simon Charette for his help on the patch. Refs #16630.
2013-02-23 10:18:08 +01:00
Anssi Kääriäinen
dcf651c27e Fixed Oracle specific failures in commands_sql tests 2013-02-23 01:08:48 +02:00
Claude Paroz
e5a8df06be Fixed #19846 -- Optimized a dict of lists in BlockContext class
Thanks Curtis Maloney for the report and the patch.
2013-02-22 23:55:11 +01:00
Anssi Kääriäinen
f565c6f999 Marked a test as expected failure. Refs #19884 2013-02-23 00:33:02 +02:00
Anssi Kääriäinen
88c726bea0 Skipped a test on Oracle 2013-02-23 00:33:02 +02:00
Anssi Kääriäinen
ce094e570e Fixed Oracle regression in last_executed_query() with unicode strings
The regression was likely caused by the fix in #19606 which adjusted
Oracle's unicode detection, though it seems this would have been an
issue in some configurations even before.
2013-02-23 00:27:39 +02:00
Anssi Kääriäinen
09fcb70c80 Fixed empty strings + to_field regression on Oracle
Querying the reverse side of nullable to_field relation, where both
sides can contain null values resulted in incorrect results. The reason
was not detecting '' as NULL.

Refs #17541
2013-02-23 00:05:31 +02:00
Claude Paroz
60fff6fc94 Documented jQuery upgrade
Refs #14571.
2013-02-22 22:02:53 +01:00
Baptiste Mispelon
f13bfbec70 Fixed #19882 -- Smarter tokenizing of {% for %} tag arguments. 2013-02-22 19:19:33 +01:00
Aymeric Augustin
5488437ab6 Factored code and added a missing docstring. 2013-02-21 21:26:40 +01:00
Anssi Kääriäinen
3c6318e831 Fixed #19870 -- Regression in select_related in inheritance cases
There was a regression in case two models inherited the same parent,
and one contained a foreign key to other. When select_related travelled
the foreign key the other model reused the parent join made by the
first model. This was likely caused by Query.join_parent_model()
addition in commit 68985db482.

Thanks to Trac alias loic84 for report & tests.
2013-02-21 12:01:23 +02:00
Preston Holmes
649118961c Fixed #19868 -- Clarified purpose of custom user example 2013-02-20 15:32:35 -08:00
Anssi Kääriäinen
50677b29af Made a couple of selenium tests wait for page loaded
The admin_widgets tests were issuing click() to the browser but
didn't wait for the effects of those clicks. This caused the resulting
request to be processed concurrently with the test case. When using
in-memory SQLite this caused weird failures.

Also added wait_page_loaded() to admin selenium tests for code
reuse.

Fixed #19856
2013-02-20 23:56:57 +02:00
Alex Gaynor
4e36e0a8b3 Clarified the language used in the documentation. Thanks to Mike Smith for the report. 2013-02-20 13:09:40 -08:00
Anssi Kääriäinen
e8fc3f3783 Added a test for negated Q object querying
The added test is from the patch in ticket #19672 (written by Ian
Kelly). Fixed #19672, refs #19849.
2013-02-20 21:45:36 +02:00
Anssi Kääriäinen
10f9ba046f Cleaned up join promotion in query.combine() with OR
Refs #19849
2013-02-20 21:45:36 +02:00
Anssi Kääriäinen
edf93127bf Removed join() promote kwarg
The join promote=True was over-aggressive in select_related handling.
After that was removed, the only other user was query.combine(). That
use case is very easy to handle locally, so there is no more need for
the join(promote=True) flag.

Refs #19849.
2013-02-20 21:43:44 +02:00
Anssi Kääriäinen
3fef304ff2 Refactored negated IS NULL handling
This one cleaned up add_filter() negated filter generation. As a side
effect split_exclude() was cleaned up, too.

Refs #19849
2013-02-20 21:34:01 +02:00