Baptiste Mispelon
bdca494464
Fixed python3 breakage introduced by c0a2388a1c.
2013-11-04 23:57:43 +01:00
Aymeric Augustin
da235c9a84
Improved changelog for runserver in 1.7.
2013-11-04 23:29:09 +01:00
Aymeric Augustin
859a20560e
Merge pull request #1868 from Bouke/tickets/18419
...
Fixed #18149 -- Changed language codes for Chinese
2013-11-04 14:17:34 -08:00
Bouke Haarsma
c0a2388a1c
Fixed #18149 -- Changed language codes for Chinese
...
Language codes for Chinese are zh_Hans (Simplified) and zh_Hant (Traditional).
Added support for browsers that still send the deprecated language codes.
Thanks to Olli Wang for the report.
2013-11-04 23:03:28 +01:00
Aymeric Augustin
cb2c3ce154
Merge pull request #1821 from Bouke/tickets/14170
...
#14170 -- Reset i18n cache when settings changed
2013-11-04 13:50:21 -08:00
Aymeric Augustin
37a2e70cec
Updated the set of watched files after each request.
...
Otherwise the kqueue-based autoreloader may not see changes to files
that weren't imported when the server started.
Thanks Bouke Haarsma for the report and Loïc Bistuer for locating the
problem.
2013-11-04 22:37:36 +01:00
Alex Gaynor
8ecba51ea0
Simplify (and very very slightly speed up) the pbkdf2 implementation
2013-11-04 09:45:27 -08:00
Unai Zalakain
cb32175bfd
Fixed ticket #21172
...
LiveServerThread.join() now behaves like threading.Thread.join().
LiveServerThread.terminate() is instead used to ask live http server to
terminate and close.
2013-11-04 01:14:24 +01:00
Bouke Haarsma
9b95fa7777
Fixed #21322 -- Error message when CSRF cookie is missing
...
Thanks to Henrik Levkowetz and olau for their reports and initial patches.
2013-11-03 20:05:10 +01:00
Alex Gaynor
f67e18f39e
Fixed all E251 violations
2013-11-03 10:17:58 -08:00
Alex Gaynor
c347f78cc1
Fixed all E226 violations
2013-11-03 10:08:55 -08:00
Alex Gaynor
7288e1b02b
Merge pull request #1852 from jasonamyers/cleanup/PEP8
...
Cleanup/pep8 tests
2013-11-03 09:51:49 -08:00
Alex Gaynor
91078f5669
Merge pull request #1861 from milmazz/E251
...
Fixed flake8 E251 violations
2013-11-03 09:42:31 -08:00
Jason Myers
4f151da1e5
Merging in master
...
Signed-off-by: Jason Myers <jason@jasonamyers.com>
2013-11-03 07:19:25 -06:00
Florian Apolloner
08e2ecee3b
Fixed some testfailures on jenkins.
...
Depending on the order of the tests beeing run, 10 can be a valid pk,
0 can never be a valid pk and as such we will get the wanted ValidationError.
2013-11-03 14:16:48 +01:00
Florian Apolloner
f40f90d63b
Fixed regressions from 36ded01527.
...
Refs #21302
2013-11-03 12:45:15 +01:00
Jim Bailey
539e3693d4
Fixed #20849 -- ModelForms do not work well with prefetch_related.
...
model_to_dict() (used when rendering forms) queries the database
to get the list of primary keys for ManyToMany fields. This is
unnecessary if the field queryset has been prefetched, all the
keys are already in memory and can be obtained with a simple
iteration.
2013-11-03 12:27:54 +02:00
Milton Mazzarri
cbc7cbbc5b
Fixed flake8 E251 violations
2013-11-03 03:22:11 -06:00
Alex Gaynor
4202d9cf0c
Whitespace fix
2013-11-03 01:53:28 -07:00
Alex Gaynor
6c1b55d61a
Re-expose Count here
2013-11-03 01:52:40 -07:00
Bouke Haarsma
d0669843d0
Fixed #14170 -- Reset i18n cache when settings change
2013-11-03 09:36:09 +01:00
Aymeric Augustin
881851f3bb
Merge pull request #1853 from loic/dst
...
Fixed failing test around DST change.
2013-11-03 01:14:17 -07:00
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
Loic Bistuer
757945b47d
Fixed failing test around DST change.
...
The timezone arithmetic done in JS can be off by one hour around DST
change. We work around this issue by adding one extra hour to the test
error margin when we detect a DST change is near.
Refs #20663 .
2013-11-02 18:57:35 -05: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
