mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 18:16:19 +00:00
Code Issues 25 Releases Wiki Activity
5,729 Commits 28 Branches 426 Tags 666 MiB
ff420b4364
Commit Graph

5729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Malcolm Tredinnick
c6a2bd9b96 Fixed #6353 (again) by making force_unicode() and smart_str() a bit more robust 
in the face of funky Exception instances. This is slightly symptomatic of
problems in the calling code, but we don't want to raise a secondary exception
whilst trying to display the first one. Based on a patch from Karen Tracey.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 18:53:51 +00:00
Brian Rosner
5dd68fa74a Marked a couple of unmarked strings in edit_inline templates and corrected a marked string. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 18:15:19 +00:00
Brian Rosner
5a72589d7a Fixed #7984 -- 'View on site' links now work in inlines. Thanks philwo for the report and initial patch by julianb. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8586 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 18:07:36 +00:00
Brian Rosner
05a4439581 Fixed #8560 -- Corrected a typo in a comment of docs/intro/tutorial02.txt to be consistent with the change in [8432]. Thanks ramiro for catching this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 17:44:04 +00:00
Malcolm Tredinnick
c849fcc66d Fixed #8558 -- Removed a stray line in tutorial 2 left over from when it was 
rewritten for the new admin.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 16:55:37 +00:00
Jacob Kaplan-Moss
a516ebdff1 Fixed #8126: improved admin.autodiscover() to be more forgiving of invalid INSTALLED_APPS entries and/or exotic import schemes that don't have __path__. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 16:18:20 +00:00
Jacob Kaplan-Moss
30de7331d4 Fixed #8326: added documentation about running Django on Jython. Docs originally written by Leo Soto, and then cleaned up a bit by me. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 15:52:21 +00:00
Jacob Kaplan-Moss
c5c61b261e Fixed #8555: corrected get_comment_form tag documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 15:23:02 +00:00
Malcolm Tredinnick
4f711eb5e3 Fixed #8347 -- Added a few missing field type conversion to SQLite's inspectdb 
handling. Patch from trbs.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 08:58:07 +00:00
Malcolm Tredinnick
3111d7f60b Fixed #7201 -- Fixed the timeuntil filter to work correctly with timezone-aware 
times. Patch from Jeremy Carbaugh.

This is backwards incompatible in the sense that previously, if you tried to
compare timezone-aware and timezone-naive values, you got an incorrect result.
Now you get an empty string. So your previously incorrect code returns a
different incorrect result.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 08:08:55 +00:00
Malcolm Tredinnick
61957df17f Added a few people to the AUTHORS file who have made recent contributions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 07:56:39 +00:00
Malcolm Tredinnick
8c4a525871 Fixed #7177 -- Added extra robustness to the escapejs filter so that all 
invalid characters are correctly escaped. This avoids any chance to inject raw
HTML inside <script> tags. Thanks to Mike Wiacek for the patch and Collin Grady
for the tests.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 07:56:32 +00:00
Malcolm Tredinnick
fcf059d539 Fixed #7084 -- Fixed the "makemessages" command to handle line endings 
correctly on Windows (previous behaviour was to explode when encountering a
multi-line messages). Patch and testing from Ramiro Morales.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 07:43:59 +00:00
Malcolm Tredinnick
73afcee6ed Fixed #6101 -- Tweaked a couple of places in the delete-related-objects 
collection for the admin so that auto-escaping can do the right thing: not too
many times, not too few. Thanks to Karen Tracey for debugging most of this.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 07:36:39 +00:00
Malcolm Tredinnick
af83b650be Fixed #8150 -- Updated a reference to creating an admin class in the overview 
document. Based on a patch from mk.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 07:11:14 +00:00
Malcolm Tredinnick
ccb37ce74c The comments app was unconditionally accessing various settings that didn't 
exist in Django's global settings. Changed those accesses to conditional
lookups with default fallbacks.

The comment_test tests now pass without needing to add any extra settings.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 06:58:43 +00:00
Gary Wilson Jr
47ed499a5d Corrected references that aren't Field attributes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 06:43:04 +00:00
Gary Wilson Jr
b016ea0ace Removed trailing whitespace in a few files. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 04:55:56 +00:00
Malcolm Tredinnick
15ed5e61c9 Hid a few QuerySet regression tests from Python 2.6 due to a bug in the the 
Python beta releases. Failures there mean that incorrect code won't raise an
error, but it's otherwise harmless (correct code still runs correctly).

Fixed #7786.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 03:22:44 +00:00
Malcolm Tredinnick
948a833eb7 Fixed #8490 -- Worked around a bug in flup 1.0.1 when working out the correct 
path_info setting in the WSGI handler. Thanks, Mike Richardson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 02:42:39 +00:00
Malcolm Tredinnick
f2b389b354 Added documentation to explain the gains and losses when using utf8_bin 
collation in MySQL. This should help people to make a reasonably informed
decision. Usually, leaving the MySQL collation alone will be the best solution,
but if you must change it, this gives a start to the information you need and
pointers to the appropriate place in the MySQL docs.

There's a small chance I also got all the necessary Sphinx markup correct, too
(it builds without errors, but I may have missed some chances for glory and
linkage).

Fixed #2335, #8506.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 01:59:25 +00:00
Gary Wilson Jr
b2c2c3a2ed A few fixes for the testing documentation: 
* Removed an extra semicolon that was preventing the rendering of a Sphinx class directive for the `Client()` class.
 * Indented `Client` class's methods.
 * Added linebreaks after attribute directives of `Response` class so Sphinx rendenders them correctly.
 * Removed trailing whitespace.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8567 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 00:52:55 +00:00
Justin Bronn
5485e0d97f Fixes for Geo sitemap errata. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 00:46:30 +00:00
Justin Bronn
8a88379b2a Fixed the GeometryField form to catch more than just GEOS exceptions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 00:34:34 +00:00
Malcolm Tredinnick
b47c25ef91 Removed a stray reference to mysql_old in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-26 00:09:29 +00:00
Malcolm Tredinnick
d5f1d6f937 Fixed #8542 -- Made the model_formstests tests from [8528] a little less 
dependent upon the precise values of auto-created primary key integers.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 23:56:39 +00:00
Jacob Kaplan-Moss
4df380ff01 Fixed #8543: added translation markings to can_delete and can_order form labels. Thanks, msaelices. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 22:55:24 +00:00
Jacob Kaplan-Moss
6a5cc9e7f6 Fixed #7831: be case-insensitive when in get_language_from_request. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8561 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 22:53:44 +00:00
Jacob Kaplan-Moss
ddb3cdd514 Fixed #6353: better handle unicode in exception reasons. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 22:47:07 +00:00
Malcolm Tredinnick
3deff41a32 Fixed #8106 -- Untangled some problems with complex select_related() queries 
and models that have multiple paths to them from other models.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 22:43:25 +00:00
Jacob Kaplan-Moss
6abe0460c8 Fixed a silly typo in comment settings doc. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 22:34:27 +00:00
Jacob Kaplan-Moss
cba91997a2 Refactored Django's comment system. 
Much of this work was done by Thejaswi Puthraya as part of Google's Summer of Code project; much thanks to him for the work, and to them for the program.

This is a backwards-incompatible change; see the upgrading guide in docs/ref/contrib/comments/upgrade.txt for instructions if you were using the old comments system.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 22:14:22 +00:00
Malcolm Tredinnick
b46e736c9a Because the filter tests take non-zero time to pass, it's possible for one of 
the timeuntil tests to fail because the pre-recorded "now" has moved on
sufficiently far from actual "now()". Fixed the one test that was failing for
me (the other timeuntil and timesince tests already have a small buffer built
in to guard against this problem).

The problem was revealed after [8535].


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 20:47:42 +00:00
Brian Rosner
853f4d29b8 Fixed #8547 -- Corrected the breadcrumb display in the object_history.html template. Thanks sorl for catching this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 19:56:14 +00:00
Brian Rosner
834ce902c2 Fixed #8499 -- Corrected a couple of instances of where the CSS class name error should be errors. Thanks rmyers for catching this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 19:29:13 +00:00
Jacob Kaplan-Moss
018057d8d1 Fixed a bad link in topics/db/models.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 19:29:10 +00:00
Jacob Kaplan-Moss
a169884505 Fixed #8539: fixed PEP references. Thanks, carljm. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 19:28:57 +00:00
Jacob Kaplan-Moss
f964a6e472 Fixed #5591: corrected info about variables in trans tag. Thanks, idangazit. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8551 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 19:28:41 +00:00
Jacob Kaplan-Moss
744d882110 Fixed #8425: removed the independant nations of Palau, Marshall Islands, and Micronesia from localflavor's list of US states. 
...

Man, commit messages like that are incredibly fun to write.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 19:11:41 +00:00
Jacob Kaplan-Moss
cbd574881c Updated TimeInput changes from [8491] to allow time widgets to be used with unicode values. Fixes #7499. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 19:09:44 +00:00
Jacob Kaplan-Moss
7e06b69a3d Removed outdated "adminindex" command -- the same behavior is now far easier and better done in a template, or perhaps a custom AdminSite.index function. Refs #5500. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 18:53:18 +00:00
Jacob Kaplan-Moss
ab7eabfcd1 Fixed #8519: report the correct class in databrowse's AlreadyRegistered error. Thanks, mattmcc. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 18:32:26 +00:00
Jacob Kaplan-Moss
0a6314f249 Fixed #8285: signal handlers that aren't functions work under DEBUG. This slightly loosens the sanity check, but things that are valid under production shouldn't fail under debug. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 18:24:05 +00:00
Matt Boersma
1aa4889808 Fixed get_or_create test case for Oracle by re-raising the more specific IntegrityError for "ORA-01400: Cannot insert NULL into [table.col]" 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8545 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 17:20:28 +00:00
Jacob Kaplan-Moss
78d13fb1c2 Fixed #8379: the admin user change form now properly validates the username. Thanks, kratorius. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8544 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 17:10:20 +00:00
Jacob Kaplan-Moss
9a1e4cedde Fixed #8344: make User.get_profile() work when settings.AUTH_PROFILE_MODULE is unset. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8543 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 16:56:59 +00:00
Jacob Kaplan-Moss
15ed0d65b0 Fixed #7833: the user creation form now works when password1 isn't set. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 16:55:57 +00:00
Jacob Kaplan-Moss
e3df35478d Converted some images in the docs that claimed to be PNGs, but weren't. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 16:24:41 +00:00
Jacob Kaplan-Moss
97bc872755 Fixed a handful of typo/markup problems in the docs. Patch from Daniel Roseman. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 15:51:13 +00:00
Malcolm Tredinnick
964769871d Fixed #8529 -- Added Petr Lewandowski to the AUTHORS file. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 15:29:39 +00:00