1
0
mirror of https://github.com/django/django.git synced 2024-12-29 12:36:08 +00:00
Commit Graph

10654 Commits

Author SHA1 Message Date
Russell Keith-Magee
afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means:
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 15:04:39 +00:00
Russell Keith-Magee
b7c41c1fbb Fixed #12252 -- Ensure that queryset unions are commutative. Thanks to benreynwar for the report, and draft patch, and to Karen and Ramiro for the review eyeballs and patch updates.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:51:54 +00:00
Russell Keith-Magee
d1290b5b43 Fixed #3094 -- Accelerated deprecation of XMLField, since it hasn't served any useful purpose since oldforms. Thanks to PaulM for driving the issue and providing the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:28:20 +00:00
Jannis Leidel
b921f1bac0 Fixed #12475 -- Fixed an edge case with hidden fields in ModelAdmin changelists when used in conjunction with list_display_links or list_editable. Thanks, Simon Meers, Julien Phalip, Karen and master.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:20:45 +00:00
Jannis Leidel
c0fb9bd00b Fixed #13411 -- Made sure URL fragments are correctly handled by the next_redirect utility of the comments apps. Thanks, timesong, dpn and Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:03:53 +00:00
Russell Keith-Magee
49cfe25399 Fixed #15512 -- Cleanup of imports in contrib.admin. Thanks to Julien Phalip for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15719 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 01:54:33 +00:00
Russell Keith-Magee
edfed18581 Fixed #15502 -- Ensure that nested TemplateDoesNotExist errors are propegated with a meaningful error message when loaded using select_template. Thanks to jaylett for the report, and GDorn for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 00:41:40 +00:00
Russell Keith-Magee
17bd34930a Fixed #15530 -- Corrected typo in template loader deprecation message. Thanks to msaelices for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 00:25:17 +00:00
Russell Keith-Magee
22347c89d8 Fixed #15532 -- Clarified the error message for unknown auth backends. Thanks to kmike for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 00:25:02 +00:00
Russell Keith-Magee
03717325dd Corrected some typos from r14673.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 00:24:41 +00:00
Jannis Leidel
93cd8442fc Fixed #15535 -- Stopped the blocktrans template tag from raising a KeyError if an included variable can't be found in the context. Thanks, melinath.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02 21:36:41 +00:00
Jannis Leidel
cff4ee5cba Updated admin source translation to include string added in r15698.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02 13:15:54 +00:00
Jannis Leidel
751888ece3 Fixed #11223 -- Fixed logout view to use the 'next' GET parameter correctly as described in the docs, while only allowing redirection to the same host.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02 12:47:44 +00:00
Jannis Leidel
f6c991667f Fixed #4992 -- Respect the GET request query string when creating cache keys. Thanks PeterKz and guettli for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15705 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02 12:47:36 +00:00
Jannis Leidel
a9ace1466d Slightly modified change [15698] to use ugettext_lazy since it's a module level variable. Refs #15524.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02 10:44:48 +00:00
Jannis Leidel
6b95aa6fb5 Fixed #15531 -- Partially reverted [15701] due to compatibility issues with middlewares that modify content of responses. Thanks for the report, schinckel. Refs #15281.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02 10:40:48 +00:00
Jannis Leidel
ec193224d3 Fixed #12534 -- Loosened the the security check for "next" redirects after logins slightly to allow paths that contain spaces. Thanks for the patch, jnns and aaugustin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 22:49:18 +00:00
Jannis Leidel
be4a2e3f3e Fixed #15281 -- Made the static view use an iterator when serving a file, effectively making this less of a memory hog. Also use the appropriate attributes of the stat object instead of indexes. Thanks for the initial patch, FunkyBob and aaugustin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 22:49:10 +00:00
Luke Plant
8f19878263 Added file missing from [15696], sorry for breakage.
Thanks to Ramiro for letting me know. Refs #717.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 18:25:35 +00:00
Ramiro Morales
477c482c24 Fixed #15524 -- Marked up for translation literal shown by the admin app e.g. in nullable changelist cells and filters. Thanks charettes for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 16:52:48 +00:00
Luke Plant
dbe6ced0d6 Fixed #717 - If-Modified-Since handling should compare dates according to RFC 2616
Thanks to Maniac for the report, julienb for the initial patch, and
especially to aaugustin for the final patch and tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15696 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 14:28:06 +00:00
Jannis Leidel
3f38a99174 Updated sites translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 09:14:22 +00:00
Jannis Leidel
9838ba0db7 Updated sessions translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 09:12:43 +00:00
Jannis Leidel
faf292a93e Updated redirects translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15693 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 09:11:04 +00:00
Jannis Leidel
3547d2bb93 Updated messages translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 09:09:25 +00:00
Jannis Leidel
d38bce59ae Updated localflavor translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 09:07:46 +00:00
Jannis Leidel
c06ed72759 Updated humanize translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 09:06:04 +00:00
Jannis Leidel
f7c9d77134 Updated gis translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 09:04:19 +00:00
Jannis Leidel
533517ec65 Updated formtools translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15688 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 09:02:40 +00:00
Jannis Leidel
c6c54bbf66 Updated flatpages translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 09:01:01 +00:00
Jannis Leidel
379ce73ee3 Updated contenttypes translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 08:59:22 +00:00
Jannis Leidel
4d30e8bccc Updated comments translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 08:57:42 +00:00
Jannis Leidel
f3ed462822 Updated auth translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15684 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 08:56:02 +00:00
Jannis Leidel
077d5dcf75 Updated admindocs translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 08:54:19 +00:00
Jannis Leidel
3a5e424408 Updated admin translations from transifex.net. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 08:52:36 +00:00
Jannis Leidel
4eb060516c Added Azerbaijani and Urdu to list of supported languages and added initial core translations. Refs #15300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 08:50:18 +00:00
Jannis Leidel
8a94108110 Fixed #15300 -- Updated core translations from transifex.net.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 08:50:02 +00:00
Ramiro Morales
5aca35329c Reverted 'now' template tag documentation changes so it describes the real code implementation regarding (lack of) interaction with L10N machinery. Refs #15263. Thanks danielr for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 03:05:57 +00:00
Ramiro Morales
bd3b5e8c2b Fixed #15517 -- Fixed regression in admin search_fields option introduced in r15526. Thanks Fabian Buechler for the report and fix and Julien Phalip for adding tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 02:04:35 +00:00
Ramiro Morales
b1a0ad0079 Fixed #15520 -- Fixed incompatibility with email module shipped with Python 2.4 introduced in r15669. Thanks dobcey for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 14:07:59 +00:00
Gabriel Hurley
13838fb233 Fixed #15365 -- Added a warning to the contrib.markup docs reminding users that the marked up output will not be escaped.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 05:39:44 +00:00
Gabriel Hurley
c9db8cc83f Fixed #15395 -- Documented the modules/import paths for the various decorators in django.views.decorators. Thanks to slinkp for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 05:25:46 +00:00
Ramiro Morales
70d3c84d18 Fixed #13433 -- Changed default behavior of Django email message wrappers to not mangle lines starting with 'From '. Thanks Leo for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15669 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 02:42:28 +00:00
Russell Keith-Magee
c5a6badbfc Converted the new contributions docs to unix line endings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 23:31:46 +00:00
Gabriel Hurley
2b7b468325 Fixed #14702 -- Added a "needsinfo" resolution to Trac, and added supporting documentation on the new resolution and closing tickets in general.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 22:13:07 +00:00
Gabriel Hurley
28123d7153 Fixed #15492 -- Documented the invalid_date and invalid_time error keys for !SplitDateTimeField. Thanks to lode for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 21:16:58 +00:00
Simon Meers
2dfbe92d7c Fix typo in staticfiles docs (not ticketed).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 11:54:03 +00:00
Luke Plant
2366415f48 Fixed #15368 - test failures due to regression with RequestContext
Thanks to cyberdelia for the reports on this.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 00:24:35 +00:00
Russell Keith-Magee
b5b5ba6cd9 Fixed #10918 -- Ensure that the search widget on a raw_id_admin uses the right field name when the ForeignKey has a to_field definition. Thanks to David Cramer for the report, Collin Anderson for the fix, and Julien Phalip for the test.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-26 12:44:25 +00:00
Russell Keith-Magee
0b53d318ef Fixed #11447 -- Ensured that ForeignKey widgets in a list-editable admin changelist won't wrap split the widget. Thanks to patrick@vonautomatisch.at for the report, and Julien Phalip for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-26 12:43:57 +00:00