Jason Myers
6f07027385
Merging Upstream
...
Signed-off-by: Jason Myers <jason@jasonamyers.com>
2013-11-02 23:52:24 -05:00
Jason Myers
7a61c68c50
PEP8 cleanup
...
Signed-off-by: Jason Myers <jason@jasonamyers.com>
2013-11-02 23:50:49 -05:00
Alex Gaynor
0fdb692c6c
Fixed the remaining E302 violations int eh django package
2013-11-02 23:50:48 -05:00
Ray Ashman Jr
8f85e73458
Checkout prior commit of _doctest.py
2013-11-02 23:50:48 -05:00
Ray Ashman Jr
776ee92f00
Revert change to django/test/_doctest.py
2013-11-02 23:50:48 -05:00
Ray Ashman Jr
5732bc52f1
Correct flake8 E302 violations
2013-11-02 23:50:48 -05:00
Jason Myers
3f115776e1
PEP8
...
Signed-off-by: Jason Myers <jason@jasonamyers.com>
2013-11-02 23:50:38 -05:00
coagulant
8eec2d93b6
Fixed all E261 warnings
2013-11-02 23:50:33 -05:00
Jason Myers
c3791463a5
Fixing E302 Errors
...
Signed-off-by: Jason Myers <jason@jasonamyers.com>
2013-11-02 23:48:47 -05:00
Alex Gaynor
fe995e6cbd
Fixed the remaining E302 violations int eh django package
2013-11-02 17:37:15 -07:00
Alex Gaynor
393cdbfaa2
Merge pull request #1854 from rayashmanjr/master
...
Correct flake8 E302 violations
2013-11-02 17:22:01 -07:00
Ray Ashman Jr
e459893e34
Checkout prior commit of _doctest.py
2013-11-02 20:20:53 -04:00
Ray Ashman Jr
8d7ddec17c
Revert change to django/test/_doctest.py
2013-11-02 20:11:21 -04:00
Ray Ashman Jr
e2ae8b048e
Correct flake8 E302 violations
2013-11-02 19:53:29 -04:00
coagulant
3bc0d46a84
Fixed all E261 warnings
2013-11-02 18:20:39 -04:00
Anssi Kääriäinen
2a03a9a9a1
Fixed syntax error in queries/tests.py
2013-11-02 22:42:42 +02:00
Anssi Kääriäinen
bec0b2a8c6
Fixed #14511 -- bug in .exclude() query
2013-11-02 22:35:45 +02:00
Alex Gaynor
7548aa8ffd
More attacking E302 violators
2013-11-02 13:12:09 -07:00
Alex Gaynor
65c4ac3b24
Merge pull request #1849 from brabadu/master
...
Fixed flake8 E241
2013-11-02 12:57:58 -07:00
Alex Gaynor
4ad9f4d4ea
Replaced a hardcoded "2" with the right named constant
2013-11-02 12:55:36 -07:00
Boryslav Larin
e737c009b8
Fixed flake8 E241
2013-11-02 21:45:40 +02:00
Alex Gaynor
ee48f4af99
Merge pull request #1848 from rayashmanjr/master
...
Correct flake8 violation E261
2013-11-02 12:34:34 -07:00
Ray Ashman Jr
dcfc8fa972
Correct flake8 violation E261
2013-11-02 15:27:47 -04:00
Tim Graham
36ded01527
Fixed #21302 -- Fixed unused imports and import *.
2013-11-02 15:24:56 -04:00
Anssi Kääriäinen
9f76ea1eaa
Fixed #21375 -- related_name='+' clashed with other '+' names
2013-11-02 21:18:35 +02:00
Alex Gaynor
18c642b96c
Merge pull request #1847 from Bouke/docs/django
...
Django should be capitalized in text
2013-11-02 12:17:38 -07:00
Bouke Haarsma
9367b9e828
Django should be capitalized in text
2013-11-02 20:15:40 +01:00
Anssi Kääriäinen
b44d42be6d
Fixed #21366 -- regression in join promotion logic
...
The regression was caused by ecaba36028
and affected OR connected filters.
2013-11-02 20:44:19 +02:00
Claude Paroz
88b9d4ff3a
Fixed #21373 -- Typo fixed in i18n docs
...
Thanks rpq at winscores.com for the report.
2013-11-02 19:13:29 +01:00
Unai Zalakain
99b681e227
Fixed #21341 -- Eased https requests with the test client
...
All request methods of ``django.test.client.Client`` receive a ``secure``
argument that defaults to ``False`` indicating whether or not to make the
request through https.
Thanks Aymeric Augustin for the review.
2013-11-02 19:03:13 +01:00
Alex Gaynor
19256f300e
Continue to attack E302 violations
2013-11-02 10:18:46 -07:00
Aymeric Augustin
8b3d9d96ed
Merge pull request #1799 from Bouke/tickets/9523
...
Fixed #9523 -- Restart runserver after translation MO files change
2013-11-02 06:57:50 -07:00
Bouke Haarsma
073b974e66
Fixed #21354 -- Documented contrib.redirects defaults to 301 redirects
...
Thanks glarrain for the suggestion.
2013-11-02 09:52:28 -04:00
Bouke Haarsma
6107435386
Fixed #21324 -- Translate CSRF failure view
...
Thanks to Claude Paroz for the original patch.
2013-11-02 11:22:30 +01:00
Bouke Haarsma
c3936c0d79
Fixed #9523 -- Restart runserver after translation MO files change
...
Thanks to Krzysztof Kulewski for the initial patch.
2013-11-02 10:29:07 +01:00
Tim Graham
090315f5df
Fixed spelling ("dependant" -> "dependent")
...
Dependent means reliant on.
A dependant is a person like a child or spouse.
Thanks Andrew Wilcox for the report.
2013-11-01 21:29:39 -04:00
Tim Graham
ede04f94bd
Merge pull request #1839 from sbellem/small-typo-fix
...
Fixed typo -- "a" user, not "an" user
2013-11-01 16:26:35 -07:00
Sylvain Bellemare
c7dabe49dd
Fixed typo -- "a" user, not "an" user
2013-11-01 15:15:36 +01:00
Claude Paroz
89116cf24a
Fixed #21364 -- Specified InnoDB full-text support from MySQL 5.6.4 on
...
Thanks thevlad at gmail.com for the report.
2013-11-01 10:59:16 +01:00
Claude Paroz
67c6c1a7cb
Fixed #21359 -- Corrected MySQL collation name in databases docs
...
Thanks k_sze for the report.
2013-11-01 10:46:03 +01:00
Aymeric Augustin
2bba0d275b
Improved resource limits handling in the kqueue autoreloader.
...
Refs #21356 . Thanks Loïc.
2013-11-01 10:31:01 +01:00
Ole Laursen
f4f01fb03c
Fixed #18508 -- tests for repeated deletion bug in ModelFormSet
...
The ticket's issue was already fixed by patch for #14877 .
2013-10-31 19:39:10 +02:00
Claude Paroz
c64efe3734
Fixed #15529 -- More permissive geojson syntax in constructor
...
Thanks Wouter Klein Heerenbrink for the report.
2013-10-31 18:15:54 +01:00
Claude Paroz
0d9c149990
Fixed #21339 -- Documented removal of some form field error messages
2013-10-31 17:52:06 +01:00
Alex Gaynor
726ded5708
Started attackign the next flake8 violation
2013-10-31 08:42:28 -07:00
Aymeric Augustin
a023a84c06
Merge pull request #1830 from aaugustin/instant-reload-os-x
...
Add instant autoreload on platforms supporting kqueue.
Fix #21356 .
2013-10-31 02:21:56 -07:00
Aymeric Augustin
47217f2f29
Reduce the set of events that trigger a reload.
...
This seems to avoid multiple reloads.
2013-10-31 10:15:42 +01:00
Aymeric Augustin
8f09ec61f8
Add instant autoreload on platforms supporting kqueue.
2013-10-30 23:08:12 +01:00
Anssi Kääriäinen
ed516a5fc8
Merge pull request #1829 from akaariai/ticket_14877
...
Fixed #14877 -- repeated deletion using formsets
Reviewed by Loic Bistuer
2013-10-30 14:16:27 -07:00
Anssi Kääriäinen
efb0100ee6
Fixed #14877 -- repeated deletion using formsets
...
When a formset contained deletion for an existing instance, and the
instance was already deleted, django threw an exception. A common cause for
this was resubmit of the formset.
Original patch by Trac alias olau.
In addition this commit cleaned some code in _construct_form(). This
was needed as the primary key value the user submitted wasn't converted
correctly to python value in case the primary key field was also a
related field.
2013-10-30 22:40:15 +02:00