mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-09 15:59:41 +00:00
Code Issues 32 Releases Wiki Activity
16,091 Commits 29 Branches 441 Tags
Commit Graph

9828 Commits

Author SHA1 Message Date
Anssi Kääriäinen
3a66035107 Removed F.__deepcopy__() 
The method didn't change standard __deepcopy__ in any way.
 2013-10-17 17:45:56 +03:00
Bouke Haarsma
2fb5a51fa3 Fixed #18659 -- Deprecated request.REQUEST and MergeDict 
Thanks Aymeric Augustin for the suggestion.
 2013-10-17 09:42:28 -04:00
Alex Gaynor
98788d3c3a Remove some unnecesary uses of bool 2013-10-17 05:27:34 -07:00
Javed Khan
a921f06345 Fixed #21280 -- Don't generate empty migration files 2013-10-17 08:21:17 -04:00
Alex Gaynor
7f508a3673 Removed some dead code and simplified some other ocde 2013-10-17 05:15:08 -07:00
Alasdair Nicol
eb214452c3 Fixed #21270 -- Fixed E701 pep8 warnings 2013-10-17 12:12:40 +01:00
Claude Paroz
650b6fd90e Add get_migratable_models util method to ConnectionRouter 2013-10-16 18:02:49 +02:00
Claude Paroz
2992f42861 Fixed #19657 -- Made sql commands honor allow_migrate 
Thanks Manel Clos for the report and the initial patch, and
Marc Tamlyn and Tim Graham for the review.
 2013-10-16 18:02:32 +02:00
Tim Graham
91c77eeab8 Avoided hardcoding Permission.name max_length 
refs #18866.
 2013-10-16 11:31:07 -04:00
Bouke Haarsma
3918eeb9fd Fixed #7551 -- Made GFK allow None init argument. 
Thanks SamBull for the report.
 2013-10-16 07:03:46 -04:00
Andrew Godwin
763ac8b642 First pass on squashmigrations command; files are right, execution not. 2013-10-16 12:00:07 +01:00
Andrew Godwin
42f8666f6a Improve migration optimizer to be able to optimize through other ops 2013-10-16 11:09:33 +01:00
Alex Gaynor
694d7da6c5 Merge pull request #1744 from unaizalakain/ticket_7261 
Fixed #7261 -- support for __html__ for library interoperability
 2013-10-15 14:43:35 -07:00
Claude Paroz
2af58a2cef Made sqlite introspection also show views like other backends 
Refs #6730.
 2013-10-15 17:20:03 +02:00
Marc Tamlyn
349c12d3f5 Fixed #16855 -- select_related() chains as expected. 
select_related('foo').select_related('bar') is now equivalent to
select_related('foo', 'bar').

Also reworded docs to recommend select_related(*fields) over select_related()
 2013-10-15 15:59:36 +01:00
Claude Paroz
dd1ab8982b Moved misplaced import in backends init 2013-10-15 16:36:31 +02:00
Ryan Allen
f719d4afc7 Updated admin alert colors 
refs #21220.
 2013-10-15 10:18:51 -04:00
Claude Paroz
949076eb11 Fixed #21263 -- Fixed issue with override_settings in inherited classes 
When both parent and child classes are decorated with override_settings,
child class settings should take precedence.
Thanks Sephi for the report and Marc Tamlyn for the review.
 2013-10-15 15:38:27 +02:00
Unai Zalakain
c7634cd7fe Fixed #7603 -- Added a 'scheme' property to the HttpRequest object 
`HttpRequest.scheme` is `https` if `settings.SECURE_PROXY_SSL_HEADER` is
appropriately set and falls back to `HttpRequest._get_scheme()` (a hook
for subclasses to implement) otherwise.

`WSGIRequest._get_scheme()` makes use of the `wsgi.url_scheme` WSGI
environ variable to determine the request scheme.

`HttpRequest.is_secure()` simply checks if `HttpRequest.scheme` is
`https`.

This provides a way to check the current scheme in templates, for example.
It also allows us to deal with other schemes.

Thanks nslater for the suggestion.
 2013-10-15 09:04:12 -04:00
Marc Tamlyn
ce823d3710 Merge pull request #1382 from loic/ticket19617 
Fixed #19617 -- Refactored form metaclasses to support more inheritance scenarios.
 2013-10-15 04:22:34 -07:00
Florian Apolloner
ed8919cbcb Handle Apps with South migrations as unmigrated apps. 2013-10-15 11:57:30 +02:00
Tim Graham
975415a8ce Fixed a webdesign template tag docstring to prevent parsing as metadata. 
Previously admindocs would throw an error when processing it:
"Error in "default-role" directive: no content permitted."

refs #6681
 2013-10-14 19:48:24 -04:00
Unai Zalakain
af64429b99 Fixed #7261 -- support for __html__ for library interoperability 
The idea is that if an object implements __html__ which returns a string this is
used as HTML representation (eg: on escaping). If the object is a str or unicode
subclass and returns itself the object is a safe string type.

This is an updated patch based on jbalogh and ivank patches.
 2013-10-15 00:42:42 +02:00
Larry O'Neill
83b9bfea44 Fixed #21266 -- Fixed E201,E202 pep8 warnings. 2013-10-14 18:12:00 -04:00
Claude Paroz
42a67ec1cd Fixed #21269 -- Don't crash when CommandError contains non-ascii 
Thanks kontakt@eikefoken.de for the report.
 2013-10-14 21:21:07 +02:00
Loic Bistuer
b16dd1fe01 Fixed #8620 -- Updated the Form metaclass to support excluding fields by shadowing them. 2013-10-14 22:42:33 +07:00
Loic Bistuer
ac5ec7b8bc Fixed #19617 -- Refactored Form metaclasses to support more inheritance scenarios. 
Thanks apollo13, funkybob and mjtamlyn for the reviews.
 2013-10-14 21:59:30 +07:00
Marc Tamlyn
8ce3c3a928 Merge pull request #1733 from joaoxsouls/#18866 
Fixed #18866 -- added validation error for verbose_name longer than 39 characters
 2013-10-14 06:20:59 -07:00
joaoxsouls
1ab27e9a65 Fixed #18866 -- added validation error for verbose_name longer than 39 characters 
Added a validation error check when creating the permissions for model, to avoid
cryptic database error when the verbose_name is longer than 39 characters
thanks elena for reporting it
 2013-10-14 14:19:35 +01:00
Claude Paroz
1e8eadc94e Fixed #15888 -- Made tablename argument of createcachetable optional 
Thanks Aymeric Augustin for the report and the documentation and
Tim Graham for the review.
 2013-10-14 13:24:40 +02:00
Claude Paroz
ef22d512b5 Imported custom user classes in tests depending on it 
Without those imports, affected test files cannot be run
independently. Refs #21164.
 2013-10-14 10:14:24 +02:00
Aymeric Augustin
d9b6fb8f61 Fixed #21256 -- Error in datetime_safe.datetime.combine. 2013-10-13 19:09:26 +02:00
Aymeric Augustin
589dc49e12 Fixed #21198 -- Prevented invalid use of @python_2_unicode_compatible. 
Thanks jpic for the report and chmodas for working on a patch.

Reverts 2ea80b94. Refs #19362.
 2013-10-13 18:14:04 +02:00
Aymeric Augustin
570d9c2678 Fixed #19560 -- Identified field in warning for naive datetime. 
Thanks gcc for the report and vajrasky for the patch.
 2013-10-13 11:54:11 +02:00
Claude Paroz
00a73c1c69 Fixed #21173 -- Stopped fixing format for date-based widgets at init time 
Thanks Marc Tamlyn for the review.
 2013-10-12 18:31:19 +02:00
Claude Paroz
21c2bfdff3 Updated OpenLayers version from 2.11 to 2.13 2013-10-12 18:08:07 +02:00
Tai Lee
e527c0b6d8 Fixed #13252 -- Added ability to serialize with natural primary keys. 
Added ``--natural-foreign`` and ``--natural-primary`` options and
deprecated the ``--natural`` option to the ``dumpdata`` management
command.

Added ``use_natural_foreign_keys`` and ``use_natural_primary_keys``
arguments and deprecated the ``use_natural_keys`` argument to
``django.core.serializers.Serializer.serialize()``.

Thanks SmileyChris for the suggestion.
 2013-10-11 12:52:57 -04:00
Tim Graham
945e033a69 Fixed #8918 -- Made FileField.upload_to optional. 
Thanks leahculver for the suggestion and dc and vajrasky for work
on the patch.
 2013-10-11 08:07:25 -04:00
Tim Graham
b67ab75e82 Fixed assorted flake8 errors. 2013-10-11 07:25:14 -04:00
Claude Paroz
4b0f8d23c9 Sanitized test assertions in gdal tests 2013-10-10 23:02:31 +02:00
Tim Graham
1dae4ac177 Whitespace cleanup. 
* Removed trailing whitespace.
* Added newline to EOF if missing.
* Removed blank lines at EOF.
* Removed some stray tabs.
 2013-10-10 16:49:20 -04:00
Tim Graham
adedc31072 Fixed "redefinition of unused 'foo' from line X" pyflakes warnings. 2013-10-10 11:09:42 -04:00
Tim Graham
cec11a3336 Used "is" for comparisons with None. 2013-10-10 09:35:56 -04:00
Tim Graham
ff9e8eccf8 Removed unnecessary semicolons. 2013-10-10 08:50:32 -04:00
crccheck
4523fcd601 Fixed #19924 -- Fixed selectors in actions.js that did not use options. 2013-10-09 10:41:54 -04:00
Baptiste Mispelon
24f9967619 Fixed regression introduced by 20472aa827669d2b83b74e521504e88e18d086a1. 
The wrong exception was being caught when detecting the presence of GeoIP.
Thanks to ramiro for the report.
 2013-10-09 11:53:43 +02:00
Jaap Roes
40b95a24ae Fixed #20568 -- truncatewords_html no longer splits words containing HTML entities. 
Thanks yann0 at hotmail.com for the report.
 2013-10-08 08:24:58 -04:00
Tim Graham
58d555caf5 Fixed #16822 -- Added RawPostDataException 
Thanks jaylett for the patch.
 2013-10-08 08:05:39 -04:00
Russell Keith-Magee
ddb53856b6 Fixed #21164 -- Added documentation for issue with test users. 
The package renaming restores the older package names (which were also the
documented package names). This doesn't affect test discovery because the
module in question doesn't contain any tests.

Thanks to Carl for the design discussion.
 2013-10-08 10:32:56 +08:00
Russell Keith-Magee
8ff4303946 Refs #21197 -- Clarified upgrade check message. 
Thanks to Carl and Shai for the discussion.
 2013-10-08 10:00:39 +08:00