1
0
mirror of https://github.com/django/django.git synced 2024-12-26 19:16:11 +00:00
Commit Graph

12019 Commits

Author SHA1 Message Date
Paul McMillan
1525874238 Improved get_random_string().
Improved the behavior of get_random_string to re-seed itself each time it is called
if the system does not have a secure random number generator. This will change the
properties of the random string produced, but will be unpredictable to an attacker.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-23 22:51:14 +00:00
Paul McMillan
239e41f7c5 Cleanup to use get_random_string consistently.
Removes several ad hoc implementations of get_random_string()
and removes an innapropriate use of settings.SECRET_KEY.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-23 21:39:12 +00:00
Julien Phalip
f2de5f4cab Added some Selenium tests for the admin's filter_horizontal and filter_vertical widgets. Ref #13614, #15220.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-23 08:07:07 +00:00
Aymeric Augustin
6daad896fb Reverted r17577 because it's actually possible to use a time zone that isn't the system time zone without pytz, thanks to the TZ environment variable.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-22 21:42:50 +00:00
Aymeric Augustin
8842183448 Noted that TIME_ZONE must be the server time zone when time zone support is enabled and pytz isn't installed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-22 21:13:36 +00:00
Aymeric Augustin
8b53616198 Fixed #17728 -- When filtering an annotation, ensured the values used in the filter are properly converted to their database representation. This bug was particularly visible with timezone-aware DateTimeFields. Thanks gg for the report and Carl for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-22 19:40:27 +00:00
Julien Phalip
c870318996 Stopped hiding the original exception's message when a selenium driver's instantiation fails.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-22 07:14:20 +00:00
Julien Phalip
a65eed3942 Enabled the admin selenium tests to run on Chrome.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-22 07:14:10 +00:00
Carl Meyer
354c84d277 Fixed #17678 -- Corrected setup of _meta.proxy_for_model and added _meta.concrete_model. Thanks Anssi Kääriäinen.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-22 05:26:50 +00:00
Chris Beaven
3ac0961e1e Don't let ALLOWED_INCLUDE_ROOTS be accidentally set to a string rather than a tuple. Thanks to Florian Apolloner for pointing this out.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-22 00:42:19 +00:00
Paul McMillan
a3bb4df895 Improved CSRF error message.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-21 23:54:02 +00:00
Aymeric Augustin
5b560ec0c0 Fixed a few typos in the aggregation functions reference.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-21 18:28:35 +00:00
Chris Beaven
0e54c23caf Fixed #17660 -- Standardize extends tag token parsing
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-21 02:59:05 +00:00
Timo Graham
7d7d2d354c Fixed #16758 - Added a warning regarding overriding default settings; thanks cyclops for the suggestion & Aymeric Augustin for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-20 19:08:22 +00:00
Timo Graham
9e62428c28 Fixed #17390 - Added a note to topics/auth.txt regarding how to decorate class-based generic views; thanks zsiciarz for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-20 18:57:51 +00:00
Julien Phalip
e1bbf3b6bc Moved an import statement to handle the case where selenium isn't installed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-19 16:53:55 +00:00
Julien Phalip
f0c2228709 Fixed #13068 (again) -- Corrected the admin stacked inline template to allow prepopulated fields to work (Thanks Stanislas Guerra for the report). Also fixed a regression introduced in [16953] where prepopulated fields wouldn't be recognized any more due to the additional "field-" CSS class name prefix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-19 16:42:12 +00:00
Aymeric Augustin
cfd0cb0064 Fixed #17319 -- Made the example for set_language less error-prone. Thanks Anna Dolma Alonso for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-19 09:19:38 +00:00
Aymeric Augustin
1d78897c5d Fixed #17166 -- Documented how FIXTURE_DIRS works in the inital data how-to, and edited related bits in the settings reference.
Performed minor edits for consistency while I was there.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-19 09:02:52 +00:00
Aymeric Augustin
9d0bf66273 Fixed #17316 -- Mentionned that the MultipleProxyMiddleware provided as an example must run rather early.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-19 08:09:20 +00:00
Aymeric Augustin
7a7ec73efe Fixed #16452 -- Clarified that the DATE/DATETIME/TIME_INPUT_FORMATS settings have no effect when USE_L10N is True. Thanks Travis Brooks.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-19 08:00:06 +00:00
Aymeric Augustin
0fe4218427 Fixed #17573 -- Documented MySQL's switch to InnoDB as default storage engine. Thanks Lenz Hirsch for the report and Claude Paroz for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-19 07:39:05 +00:00
Timo Graham
03aa030f07 Fixed #17706 - Improved short description example in Tutorial 2; thanks xbito and claudep.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-18 21:50:48 +00:00
Timo Graham
25a68c6574 Fixed #17685 - Typo in BaseDateListView.get_dated_items(); thanks ejb.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-18 21:40:00 +00:00
Jannis Leidel
7dd0ceba2e Fixed #17720 -- Stopped the LocaleMiddleware from overeagerly using the request path for language activation if it's actually not wanted. Thanks to Anssi Kääriäinen for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-18 13:37:30 +00:00
Aymeric Augustin
52b06e29c7 Prevented the generic views from automatically creating a HEAD method when there is no GET. Reverts r16105, refs #17449.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17545 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-18 09:50:03 +00:00
Aymeric Augustin
8d221e554c Fixed #17674 -- DECIMAL_SEPARATOR and THOUSAND_SEPARATOR were swapped in the Croatian locale. Thanks deni for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17544 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-18 09:36:58 +00:00
Julien Phalip
b039bd3fb0 Fixed #16618 -- Corrected the admin interface's breadcrumbs in the tutorials' screenshots. Many thanks to Claude Paroz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17543 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-18 09:32:18 +00:00
Adrian Holovaty
c1bdfd6f6f Changed various non-breaking space characters from [17478] to use the code representation rather than the actual character, which is too hard to overlook because it just looks like a space
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-17 20:23:42 +00:00
Carl Meyer
2a1a0f47bb Fixed typo in GIS testing docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-17 20:09:40 +00:00
Adrian Holovaty
7981efe04f Documentation (and some small source code) edits from [17432] - [17537]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-17 20:04:11 +00:00
Adrian Holovaty
9fa536dc4f Added note to coding-style.txt about how we should NOT be religious about line lengths.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-17 20:03:40 +00:00
Adrian Holovaty
7ecb6813c9 Fixed missing periods in django-admin help for startproject from [17432]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-17 16:51:22 +00:00
Aymeric Augustin
9d7b5558ee Fixed a few typos and updated an example in the URLs docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 21:59:22 +00:00
Aymeric Augustin
5b37a02ba3 Used Sphinx markup for PEPs and fixed a typo in the 1.4-beta-1 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 18:27:42 +00:00
Jannis Leidel
758a0cd0f1 Fixed #17689 -- Stopped the CachedStaticFilesStorage from trying to hash paths that aren't files.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 14:40:32 +00:00
Jannis Leidel
8f4d12ead2 Fixed download URL in setup.py.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 11:45:57 +00:00
Alex Gaynor
19e1a3556f Fix a reST foul up.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 04:32:42 +00:00
James Bennett
50c64ed379 Accommodate new version numbering scheme.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 04:01:58 +00:00
James Bennett
46671e9b68 Bump version numbers for 1.4 beta 1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 02:12:20 +00:00
James Bennett
e5e45d8afc Update beta release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 02:10:48 +00:00
Paul McMillan
c05930c858 Added an explicit warning about cookie session store to release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 02:08:11 +00:00
Gabriel Hurley
ea8af819ab Corrected a sentence fragment in the release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 02:06:59 +00:00
Paul McMillan
06da2be00f Fix broken test introduced by r17526.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17527 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 01:37:12 +00:00
Alex Gaynor
b9b3e9f0ef Use Python's changed comparisons, which makes this a bit more readable.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 01:10:21 +00:00
Paul McMillan
6072e108e2 Fixed #17693. Input validation and tests for base36 conversion utils. Thanks Keryn Knight for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 00:58:49 +00:00
Julien Phalip
41256d2341 Fixed #17652 -- Removed all mentions to Windmill from the docs as that project doesn't integrate well with Django at this time.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-15 17:33:51 +00:00
Aymeric Augustin
2000f375cd Fixed #17675 -- Changed the implementation of the {% regroup %} template tag to use the context properly when resolving expressions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-14 21:29:50 +00:00
Jannis Leidel
803de60c08 Stopped the collectstatic management from being wastful with file handlers. Refs r17519.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-14 09:55:09 +00:00
Jannis Leidel
bd13cfa917 Added a note to the release notes about the new format strings added in r17473.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-13 20:57:44 +00:00