p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
16,108 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

16108 Commits

Author SHA1 Message Date
Claude Paroz 5f52590368 Fixed #21291 -- Ensured inactive users cannot reset their passwords 
Thanks kz26 for the report and the suggested fix. Refs #19758.
 2013-10-19 10:43:06 +02:00
Claude Paroz 59a8808632 Cleaned formatting/comments in PasswordResetFormTest 2013-10-19 10:43:06 +02:00
Juergen Schackmann f8632572ad Fixed #21212 -- Documented the reverse name for OneToOneField. 
Thanks bjb at credil.org for the report.
 2013-10-18 16:19:05 -04:00
Tim Graham a3372f67cb Added a warning regarding session security and subdomains. 2013-10-18 09:42:45 -04:00
Tim Graham 651bb73ab3 Fixed ReST error in 1.6. release notes. 2013-10-18 08:47:28 -04:00
Tim Graham ac4fec5ca2 Fixed bug causing CSRF token not to rotate on login. 
Thanks Gavin McQuillan for the report.
 2013-10-18 08:31:19 -04:00
Alasdair Nicol a800036981 Fixed #21287 -- Fixed E123 pep8 warnings 2013-10-18 10:07:39 +01:00
Alex Gaynor 65750b8352 Merge pull request #1768 from alasdairnicol/ticket_21268 
Fixed #21268 -- Fixed E303 pep8 warnings
 2013-10-17 17:58:14 -07:00
Alasdair Nicol bab9123daa Fixed #21268 -- Fixed E303 pep8 warnings 2013-10-18 01:46:24 +01:00
Alasdair Nicol 65d1d65d52 Fixed #21267 -- Fixed E502 pep8 warnings 2013-10-18 01:28:32 +01:00
Alasdair Nicol dfb4cb9970 Fixed #21285 -- Fixed E121,E122 pep8 warnings 2013-10-17 20:20:11 -04:00
Tim Graham d97bec5ee3 Removed 1.6 release note text regarding password limit length. 
This changed was reverted in 5d74853e15.
 2013-10-17 18:58:24 -04:00
Kathryn Killebrew 7e5d7a76bf Fixed #21259 -- Fixed formstools wizard for InlineFormSet. 2013-10-17 14:01:02 -04:00
Tim Graham 9833b931b7 Removed importing formtools tests in __init__.py 
Unnecessary since introduction of DiscoveryTestRunner in 9012833af8.
 2013-10-17 13:51:36 -04:00
Claude Paroz 3514bcb251 Fixed #21284 -- Prevented KeyError swallowing in fetch_command 
Thanks wildfire for the report.
 2013-10-17 18:57:44 +02:00
Claude Paroz a14f087233 Fixed #21282 -- Made HttpResponse.serialize_headers accept latin-1 
Thanks Raphaël Barrois for the report and the initial patch and
Aymeric Augustin for the review.
 2013-10-17 18:14:35 +02:00
Loic Bistuer 5008706345 Added test for a921f06 - refs #21280. 
This commit also lays the groundwork for future tests for the
makemigrations command.
 2013-10-17 12:08:17 -04:00
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
Alex Gaynor cce42d4cf2 Merge pull request #1762 from alasdairnicol/ticket_21270 
Fixed #21270 -- Fixed E701 pep8 warnings
 2013-10-17 05:12:19 -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
Tim Graham 6138186848 Merge pull request #1755 from loic/typo 
Fixed DeprecationWarning caused by assertEquals.
 2013-10-15 12:30:02 -07:00
Loic Bistuer 776b6470c1 Fixed DeprecationWarning caused by assertEquals. 2013-10-16 02:28:04 +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
Daniele Procida ec0e780e7f Merge pull request #1751 from tmaster/ticket_21006_improvement 
Improvement on InlineFormSet doc, refs #21006
 2013-10-15 06:56:25 -07:00
Tianyi Wang 944a2bb7c1 Improvement on InlineFormSet doc, refs #21006 2013-10-15 14:51:45 +01: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
Tianyi Wang 9bfe66164e Fixed #21006 -- Added example code for overriding methods on an InlineFormSet. 
Thanks treysta at gmail.com for the suggestion.
 2013-10-15 07:34:29 -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
Sorcha Bowler 018e2c055a Fixed #21223 -- Added form.id_for_label to topic guide. 
Thanks ebertti at yahoo.com.br for the suggestion.
 2013-10-14 18:41:22 -04: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
Ramiro Morales 8ab5f1fe47 Close file after tests added in 945e033a69. 
Avoids failures on Windows. Refs #8918.
 2013-10-14 15:34:43 -03:00