mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
11,852 Commits 30 Branches 460 Tags
be1082b3fe027c5f3ead0da40e408b18b9d84f6c
Commit Graph

11852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Phalip
a343a84ce6 Added the wait_until() and wait_loaded_tag() methods to AdminSeleniumWebDriverTestCase to prevent some concurrency issues with in-memory SQLite database access in the admin Selenium tests. Thanks to Florian Apolloner, Anssi Kääriäinen and Aymeric Augustin for their help debugging this problem. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-28 22:20:30 +00:00
Jannis Leidel
46c12d1293 Fixed #17455 -- Extended CachedStaticFilesStorage slightly to handle some URLs better that are used to add support for webfonts to IE 6-8. Also ignore data: URLs and fragment-only URLs (e.g. #default#VML). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 22:49:24 +00:00
Aymeric Augustin
ae0ce4373f Moved calls to addCleanup before assertions in admin_scripts tests, so that cleanup occurs even when tests fails. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 15:35:41 +00:00
Aymeric Augustin
12206bdf0f Fixed a test that was failing under Windows. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17280 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 15:04:05 +00:00
Aymeric Augustin
cac7818e5e Removed Python 2.3 compatibility code from the admin_scripts tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 14:54:00 +00:00
Aymeric Augustin
a62ce30661 Fixed #17463 -- Conditionally skipped tests that Windows isn't able to run. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17278 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 09:28:50 +00:00
Aymeric Augustin
e8a6fee6e6 Fixed a CacheKeyWarning under Windows. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 08:22:55 +00:00
Karen Tracey
b045783729 Fixed #17462: Adjusted staticfiles CachedFilesMixin code so its tests pass on Windows. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-25 19:44:20 +00:00
Karen Tracey
5df784ab42 Fixed deletion of the runtests temp tree to work on Windows even when the tree contains non-ASCII filenames. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-25 18:53:29 +00:00
Jannis Leidel
db2b1458b1 Fixed #17047 -- Improved django.db.utils.load_backend to raise a better exception when using a unqualified database backend name. Thanks, Jonas Obrist. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-25 13:24:39 +00:00
Jannis Leidel
ff1f423d29 Fixed a few tests to run on Python 2.5. Thanks, Florian Apolloner. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-25 12:47:13 +00:00
Aymeric Augustin
4403ce10b7 Removed a redundant paragraph from the templates builtins doc. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-24 20:48:19 +00:00
Aymeric Augustin
4c445fdfaa Fixed #17110 -- Mentionned that the {% filter %} tag doesn't support the 'safe' and 'escape' filters. Thanks benspaulding. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-24 20:45:58 +00:00
Aymeric Augustin
d72c0bdc46 Fixed #17457 -- Marked strings used in hash descriptions for translation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-24 19:38:37 +00:00
Timo Graham
fe876f0119 Fixed #17442 - Broken link in refs/templates/builtins.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-24 11:58:49 +00:00
Aymeric Augustin
91f5970bb4 Added a lower level test for numberformat when grouping is 0 and force_grouping is True. Thanks Claude Paroz. Refs #17414. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-24 11:15:26 +00:00
Aymeric Augustin
ddb2a9eb9e Fixed #17414 -- Prevented numberformat from trying to group digits when the number of digits per group is zero. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17267 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-24 11:01:57 +00:00
Luke Plant
1c16907199 Added a password reset link to default admin login page if a password reset URL is available. 
You no longer have to override the admin login page just to get that link to
appear!

Also provided much better docs for how to plug in the provided password
reset mechanism with minimum effort.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-24 00:14:45 +00:00
Gabriel Hurley
14ba0df3d0 Cleanup of typos, links, etc. in timezone docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17265 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 19:18:44 +00:00
Jannis Leidel
6fcbe90954 Minor fixes to the release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 19:13:10 +00:00
Gabriel Hurley
27f5fefc54 Fixed #17454 -- corrected year in release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 18:46:29 +00:00
Jannis Leidel
2a9ae71780 Fixed various links in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 12:19:05 +00:00
Ramiro Morales
7c6e265a9f Refactored the internals of makemessages management command for better readability. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17261 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 11:24:35 +00:00
Jannis Leidel
64066a59d9 Fixed #17450 -- Added missing import to auth models module forgotten in r17253. Thanks, aalbrecht. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17260 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 11:22:13 +00:00
Jannis Leidel
7a67102e8d Fixed django.utils.timezone.__all__ to include correct function names. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17259 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 11:19:00 +00:00
Paul McMillan
2d1a681f77 Added password hashing improvements to 1.4 alpha 1 release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17258 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 05:00:51 +00:00
James Bennett
d49fd627a6 Also we use HTTPS now. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 04:04:43 +00:00
James Bennett
3e2edad9c7 Missed one. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 04:03:27 +00:00
James Bennett
0e29e48c05 Bump to 1.4 alpha 1. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 04:00:26 +00:00
Paul McMillan
90e05aaeac Renovated password hashing, including the forgotten files in r17253. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17254 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 03:53:56 +00:00
Paul McMillan
dce820ff70 Renovated password hashing. Many thanks to Justine Tunney for help with the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 03:46:06 +00:00
Gabriel Hurley
a976159db0 Corrections and improvements to the 1.4 release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-23 01:49:32 +00:00
Gabriel Hurley
a0721a3017 Fixed #15900 -- Calls to reverse with nested namespaced urls are escaped properly and capture parameters as expected. 
Thanks to teolicy for the report, and dmclain for the patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17251 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 23:03:48 +00:00
Jannis Leidel
4c376852fe Updated English base translation files in preparation of the alpha release so Transifex can pick them up. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 23:02:28 +00:00
Jannis Leidel
0e9b1041d7 Fixed a broken translation string in the flatpages' forms module. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 23:01:53 +00:00
Jannis Leidel
cbe82411cc Added yet another missing with_statement import. Thanks, Florian Apolloner. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17248 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 22:46:05 +00:00
Jannis Leidel
ad1c376d39 Fixed a missing exception (WindowsError) when using the rmtree error handler on non-Windows systems. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 22:38:10 +00:00
Jannis Leidel
a9a0f0b03f Fixed #17042 -- Extended startproject and startapp management commands to better handle custom app and project templates. Many thanks to Preston Holmes for his initial patch and Alex Gaynor, Carl Meyer, Donald Stufft, Jacob Kaplan-Moss and Julien Phalip for code reviewing. 
* Added ability to pass the project or app directory path as the second argument
* Added ``--template`` option for specifying custom project and app templates
* Cleaned up admin_scripts tests a little while I was there

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 22:38:02 +00:00
Adrian Holovaty
98c974c70b Fixed super-edge-case bug in debug view where exc_value.args was empty. I managed to trigger this in some template code 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 22:08:32 +00:00
Ramiro Morales
287565779d Added support for modifying the effect of `DISTINCT` clauses so they 
only consider some fields (PostgreSQL only).

For this, the ``distinct()`` QuerySet method now accepts an optional
list of model fields names and generates ``DISTINCT ON`` clauses on
these cases. Thanks Jeffrey Gelens and Anssi Kääriäinen for their work.

Fixes #6422.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 20:42:40 +00:00
Jannis Leidel
03eb2907d5 Re-enabled the cleanup of STATIC_ROOT in the staticfiles tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 20:29:18 +00:00
Jacob Kaplan-Moss
2f18d8b4b0 Added 1.4 alpha release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 20:18:54 +00:00
Julien Phalip
2f02a05ffb Fixed #2879 -- Added support for the integration with Selenium and other in-browser testing frameworks. Also added the first Selenium tests for contrib.admin. Many thanks to everyone for their contributions and feedback: Mikeal Rogers, Dirk Datzert, mir, Simon G., Almad, Russell Keith-Magee, Denis Golomazov, devin, robertrv, andrewbadr, Idan Gazit, voidspace, Tom Christie, hjwp2, Adam Nelson, Jannis Leidel, Anssi Kääriäinen, Preston Holmes, Bruno Renié and Jacob Kaplan-Moss. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 08:33:58 +00:00
Julien Phalip
45e3dff5ac Ensured that makemessages doesn't leave any temporary file over if the parsing of a template file fails. Refs #8536. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-21 15:35:58 +00:00
Jannis Leidel
39109b0e44 Fixed Sphinx warning. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-21 11:05:43 +00:00
Aymeric Augustin
295fd50752 Fixed a typo in the model fields reference. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-20 17:03:13 +00:00
Ramiro Morales
554f0601b5 Stopped unconditionally reversing admin model add/change URLs. 
Starting with [16857] this could cause HTTP 500 errors when
`ModelAdmin.get_urls()` has been customized to the point it doesn't
provide these standard URLs.

Fixes #17333. Refs #15294.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-19 14:59:14 +00:00
Julien Phalip
259ebcdeea Fixed #17408 -- Cleaned up some namings in contrib.formtools. Thanks, Stephan Jaekel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17236 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-19 13:52:40 +00:00
Julien Phalip
355f7fc564 Fixed #17163 -- Added the NamedUrlWizardView.get_step_url() method. Thanks, Bradley Ayers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17235 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-19 13:36:32 +00:00
Julien Phalip
1ef6841cad Fixed #17162 -- Removed the useless WizardView.get_wizard_name() method. Thanks, Bradley Ayers and Stephan Jaekel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-19 13:13:41 +00:00