2e91309c55
Fixed #12675 - Add the admin app to the project template settings.py for consistency with the urls.py. Thanks, stephanhoyer.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:39:45 +00:00
d2d8b79319
Fixed #12655 - diffsettings command now returns the diff instead of printing. Thanks, jobscry.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:39:27 +00:00
6cafd4b21f
Fixed #7876 - Improved template error message to include expected end tag. Thanks to Matthias Kestenholz for the initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:38:33 +00:00
b40f21e51c
Fixed #12868 - Updated French format file. Thanks stephaner and claudep.
...
Refs #11637 .
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12455 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:37:01 +00:00
eaa17e13e8
Fixed #12705 -- Date/time and select filter widgets now work again with newly added inline forms in the admin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-17 18:54:02 +00:00
12d40a9fd6
Fixed #11384 - Make sure translations in the project directory really override translations in apps as specified in the docs.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:17:17 +00:00
16942e178f
Removed Python 2.3 compat code in translation framework.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:16:01 +00:00
89df0432f2
Fixed #6505 - Copy plural forms from Django translation files for newly created translation files. Thanks to Ramiro Morales for the initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:15:41 +00:00
eb26c9686b
Fixed #7050 - Allow the makemessages command to optionally ignore paths when examining source code and templates for translation strings.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:15:04 +00:00
fef575a7f9
Fixed #6380 - Follow symlinks when examining source code and templates for translation strings.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:14:27 +00:00
71da5f62da
Fixed #7720 - Fallback to the base language if the sub language given in the language cookie doesn't exist. Thanks, djoume and Ramiro Morales.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:13:48 +00:00
e50eefceb6
Fixed #4695 - Worked around a problem of xgettext ignoring some translation strings in JavaScript files. Thanks, Ramiro Morales.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:13:23 +00:00
f93f056c32
Fixed #10260 - Refactored internationalization documentation. Thanks, Ramiro Morales.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:12:53 +00:00
9b630a0857
Fixed #11284 - Stop forcing the use of the djangojs domain when the ".js" file extension is passed to makemessages management command. Thanks, Ramiro Morales.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:12:13 +00:00
76afc30229
Fixed a couple Python 2.4 incompatibilities.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-14 20:29:42 +00:00
1d078be448
Fixed #6799 - added an `end_text` argument to `truncate_words`/`truncate_html_words`.
...
This allows customizing the standard "..." end text. Yes, this is technically a
feature sneaking in after the deadline, but I just couldn't bring myself to punt
it again: we already used that excuse for not getting it into 1.1.
Thanks to Adam Fast and Travis Cline for work on this patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-14 18:36:48 +00:00
7578981626
Fixed #6054 : work around PIL's installation brokeness by detecting either of the two ways it can end up being installed.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-14 18:28:28 +00:00
e6740cb39c
Fixed #11944 -- Improved exception handling for the filesizeformat filter. Thanks to rfk for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:37:17 +00:00
0e5836dc07
Fixed #12613 -- Added Q and Z to the list of characters supported by the phone2numeric filter. Thanks to gabrielhurley for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:36:21 +00:00
03924929ba
Fixed #12524 -- Clarified handling of pre-1000AD dates in datetime_safe (and thus, the serializers). Patch includes moving the datetime_safe tests into the utils regressiontests module. Thanks to gsf for the report and initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:02:32 +00:00
b794441951
Fixed #10976 -- Isolated contrib.auth tests so they will always pass, regardless of any local templates. Thanks to aarond10 for the report, and SmileyChris for turning that into a patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 12:02:11 +00:00
79857802b8
Fixed #12011 -- Modified the test client to preserve the request scheme on a redirect. Thanks to tgardner for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 12:01:14 +00:00
cc40651f21
Fixed #12825 -- Corrected a missing space in a test case error message. Thanks to timo for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 11:59:09 +00:00
02d40b93f8
Fixed #11483 -- Modified db cache backend to use db backend functions for date conversion, avoiding problems under Jython. Thanks to Leo Soto for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-11 12:26:34 +00:00
ab828da2b9
Fixed #11623 -- Corrected table name quoting in db cache backend. Thanks to Fraser Nevett for the report and fix.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-11 12:21:46 +00:00
4d2f489bca
Fixed #12189 -- Corrected rollback behavior in database cache backend. Thanks to Lakin Wecker for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12409 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-11 12:10:11 +00:00
75ab212d12
Fixed #12399 -- Added handling for memcache timeouts longer than 30 days. Thanks to houdinihound for the report, and gciotta for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-11 12:06:26 +00:00
bb6b9aa472
Fixed #11535 : Corrected SQL generated for queries involving generic relations and ORed Q objects. Thanks to brianglass for report, tobias for fix and test, and Alex for review.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-10 19:21:52 +00:00
225c413b08
Fixed #12647 . Allow unique_together checks be specified as lists as well as tuples. Thanks, Honza Král.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-10 00:49:33 +00:00
8f4540b2e6
Fixed #12698 . Model.clean() used with a ModelForm no longer causes a KeyError when raising a ValidationError.
...
Note that previously it was possible to raise a ValidationError in the same place with a message_dict attribute. That behavior was a bug and will no longer have the same behavior.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-10 00:34:45 +00:00
4bff194633
Fixed #12804 - regression with decorating admin views.
...
This is a BACKWARDS INCOMPATIBLE change, because it removes the flawed
'auto_adapt_to_methods' decorator, and replaces it with 'method_decorator'
which must be applied manually when necessary, as described in the 1.2
release notes.
For users of 1.1 and 1.0, this affects the decorators:
* login_required
* permission_required
* user_passes_test
For those following trunk, this also affects:
* csrf_protect
* anything created with decorator_from_middleware
If a decorator does not depend on the signature of the function it is
supposed to decorate (for example if it only does post-processing of the
result), it will not be affected.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-09 15:02:39 +00:00
edb6d753a8
Fixed #12716 - Typo in the admin change list template. Thanks, kbrownlees.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12398 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-07 15:55:40 +00:00
fdb9f83253
Fixed #12748 - Use charAt instead of array-like access to format string to please IE. Thanks, yedpodtrzitko.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-07 14:42:16 +00:00
f5ee28931d
Fixed #12793 - Only use the admin actions JavaScript if not explicitly deactivated with 'actions = None' in the ModelAdmin. Thanks, Florian Apolloner.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12396 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-07 14:41:43 +00:00
ae9866663c
Bump version info to 1.2 beta.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 06:05:44 +00:00
8600ad4c50
Fixed #3594 - Added ability to discard the language catalog in the JavaScript i18n view in case the selected language is English but no English translation catalog actual exists, e.g. due to being the language translated from. Thanks to msaelices, aryx and Ramiro Morales.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-05 01:43:13 +00:00
cdeb90e345
Fixed #11869 - Prevent deadlocks when calling gettext utilities on Windows. Also fixes #12783 . Thanks Ramiro Morales and soulburner.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-05 00:44:56 +00:00
a28bd76bb6
Fixed #12777 - Localize decimal fields correctly. Thanks, Florian Apolloner
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-05 00:44:35 +00:00
def34da85c
Fixed #12358 - csrf_token template tag does not work with flatpages.
...
Thanks to phretor for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-04 21:47:19 +00:00
b740534dc4
Fixed a regression in the Postgres psycopg cursor handling introduced by r12352. Thanks to Kenneth Gonsalves for the report, and Karen for the fix.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-03 07:31:00 +00:00
8e5c116971
Revised [12376] with the benefit of coffee. Thanks to Alex Gaynor for paying attention to every commit I make :-)
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12377 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-03 00:34:49 +00:00
de35bb40af
Fixed #12754 -- Reintroduced style.ERROR_OUTPUT as an alias for style.ERROR. Django doesn't need this itself, but it would be a backwards incompatible change to remove it. Thanks to Jeff Balogh for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-03 00:24:05 +00:00
f9a33cbfde
Removed a stray debug statement. Thanks to Ramiro Morales for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12375 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-02 13:01:27 +00:00
fbb42c31df
Fixed #12667 . Added optgroup validation support to model fields with choices. Thanks ramiro.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-02 00:41:28 +00:00
5dad2350f7
Use a closure for embedding the admin actions JavaScript and updated the minified versions a little bit.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 14:16:44 +00:00
816fced5d7
Being a good citizen, adding the jQuery license and a command line script to easily minify the jQuery based scripts.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 14:16:01 +00:00
f839736c60
Fixed #12695 - Force Firefox to not autocomplete input fields that are critical to the dynamic admin inlines.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12370 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 14:15:27 +00:00
9555f2be9d
Fixed #12692 - Properly handle the extra clause of admin inline formsets. Also fixes #12703 , second error.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 14:14:56 +00:00
f70a0882a3
Fixed #12700 - Take read-only fields into account when rendering the empty form for dynamic inlines.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12368 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 14:13:47 +00:00
be90eadfb9
Fixed #12628 - Don't ignore read-only fields in GenericInlineModelAdmin during save. Thanks, Alex Gaynor.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 14:13:21 +00:00
Jannis Leidel
Justin Bronn
Jacob Kaplan-Moss
Russell Keith-Magee
Karen Tracey
Joseph Kocherhans
Luke Plant
James Bennett