1
0
mirror of https://github.com/django/django.git synced 2024-12-26 02:56:25 +00:00
Commit Graph

7987 Commits

Author SHA1 Message Date
Jacob Kaplan-Moss
3d84904794 Fixed #12840: mark natural key serialization in the docs as new in 1.2. Thanks, ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-14 18:39:42 +00:00
Jacob Kaplan-Moss
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
Jacob Kaplan-Moss
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Russell Keith-Magee
23d3450d5e Fixed #12378 -- Removed some tests made redundant by feature deprecation. Thanks to jcd for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 12:00:10 +00:00
Russell Keith-Magee
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Luke Plant
be57541af1 Fixed #12839 - noted change of import path for csrf_exempt decorator
Thanks rubic for the report.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-10 23:51:09 +00:00
Karen Tracey
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
Joseph Kocherhans
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
Joseph Kocherhans
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
Luke Plant
4682d693c4 Fixed #12829 - typos introduced in [12400]
Thanks Alex.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-09 20:05:52 +00:00
Luke Plant
eaee55e547 Removed docs that assume developer might be using Python < 2.4
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-09 19:37:08 +00:00
Luke Plant
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
Jannis Leidel
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
Jannis Leidel
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
Jannis Leidel
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
James Bennett
d334713ea2 Clarify number of deprecations in the beta release.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 20:48:55 +00:00
James Bennett
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
James Bennett
8c43d2e32a Couple final tweaks to the release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 05:48:03 +00:00
James Bennett
8c50f9de6a Fix reST error in release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 05:32:46 +00:00
James Bennett
d4c034d0e1 Add 1.2 beta release notes to release notes index.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 05:25:50 +00:00
James Bennett
f30f1514f3 Reorganize the beta release notes a bit and trim down the section on feeds.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 05:19:15 +00:00
James Bennett
2638c90ce2 Clarify object-level permissions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 03:57:02 +00:00
James Bennett
7f975df129 Initial draft of 1.2 beta release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 03:37:50 +00:00
James Bennett
091a631601 Fixed #12797: Corrected typo in the documentation for the changepassword management command.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12387 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 03:14:47 +00:00
Russell Keith-Magee
1743529912 Fixed #12174 -- Corrected Bash command line completion when calling "python manage.py". Thanks to sethp for the report, and SmileyChris for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-05 15:42:22 +00:00
Jannis Leidel
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
Jannis Leidel
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
Jannis Leidel
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
Luke Plant
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
Karen Tracey
96a10094e8 Corrected app_loading test so it does not generate a key error when TZ is not set in the environment (e.g., on Windows).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-03 18:09:11 +00:00
Russell Keith-Magee
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Joseph Kocherhans
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
Jannis Leidel
a0bae6ebb8 Updated formset docs to contain the new management form field for max_num values.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 14:19:30 +00:00
Jannis Leidel
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
Jannis Leidel
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
Jannis Leidel
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
Jannis Leidel
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
Jannis Leidel
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