mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 19:16:11 +00:00
Code Issues 27 Releases Wiki Activity
11,218 Commits 28 Branches 426 Tags 667 MiB
58276bd338
Commit Graph

11218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aymeric Augustin
58276bd338 Fixed #17377 -- Don't depend on a warm cache in admin_views.UserAdminTest.test_user_permission_performance. Thanks Gregor Müllegger. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17199 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-11 12:04:37 +00:00
Aymeric Augustin
694bc0f22b Fixed #16397 -- Respected the --traceback flag in BaseCommand. This should make import loops easier to debug. Refs #11667, #17369. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-11 10:03:09 +00:00
Aymeric Augustin
affca1369c Fixed #16632 -- Crash on responses without Content-Type with IE. Thanks juan for the report and kenth for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17196 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-11 08:58:14 +00:00
Aymeric Augustin
545c3159f5 Fixed #17251 -- In the select_for_update tests, close manually database connections made in threads, so they don't stay "idle in transaction" until the GC deletes them. Thanks Anssi Kääriäinen for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-11 08:43:01 +00:00
Aymeric Augustin
219b41cc15 Fixed #17266 -- Skipped the "SET TIME ZONE" query for PostgreSQL when it isn't necessary. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-11 08:19:04 +00:00
Ramiro Morales
d317f2ab98 Added another from__future__ import with_statement missed in r17190. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-11 01:00:41 +00:00
Ramiro Morales
f2e99ecfda Made makemessages leave '%%' sequences untouched when extracting translatable literals from blocktrans template tags. 
This makes it consistent with behavior introduced when fixing #11240 in
processing of literal passed to the trans tag to avoid double escaping
(i.e. `'%%%%'` sequences in resulting PO files.)

Also, cleaned up tests changes from r17190 (removed commented out code and
implemented compatibility with Python 2.5.)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-11 00:48:26 +00:00
Ramiro Morales
12a20b6c22 Added files missing from commit [17190] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-11 00:09:30 +00:00
Ramiro Morales
ff7556c4ec Fixed #11240 -- Made makemessages i18n command escape % symbols in literals passed to the trans tag. 
This avoids problems with unintended automatic detection, marking and
validation of Python string formatting specifiers performed by
xgettext(1)/msgfmt(1) that stem from the fact that under the hood makemessages
converts templates to Python code before passing them to xgettext.

This also makes it consistent with its behavior on literals passed to the
blocktrans tag.

Thanks Jannis and claude for reviewing and feedback.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-11 00:07:06 +00:00
Adrian Holovaty
073d987a84 Fixed #16818 -- Fixed ORM bug with many-to-many add() method where it wasn't committing the change. Thanks, pressureman and kmtracey 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 23:16:56 +00:00
Adrian Holovaty
594a45ed29 Fixed some comma splices in the 'Insert in bulk' section of db/optimization.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 23:14:04 +00:00
Aymeric Augustin
19cbdf8c8f Fixed #17348 -- Implemented {% elif %}. Refs #3100. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 22:13:27 +00:00
Aymeric Augustin
959f78b3c6 Fixed #3100 -- Added support for arguments on intermediate tag tokens. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 22:10:52 +00:00
Adrian Holovaty
718a5ba1a1 Fixed #16845 -- Admin 'Change user' page no longer shows the password hash. Thanks, dstufft 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 22:10:03 +00:00
Jannis Leidel
f450d7d716 Fixed copy & paste mistake made in r17183. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 21:53:21 +00:00
Jannis Leidel
154438e315 Fixed #16683 -- Skip the IPv6 runserver tests if the platform doesn't support it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 21:50:28 +00:00
Adrian Holovaty
1a8b40c9fa Checking in latest results of running Google Closure Compiler on the admin JS. Looks like they changed the compiler output for 'false' 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 21:43:24 +00:00
Adrian Holovaty
cfb7e477d3 Fixed #17218 -- Fixed bug with SelectFilter where the 'to' box had a height=0 when it was within a collapsed fieldset. Thanks jimallman 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 21:41:20 +00:00
Adrian Holovaty
5c1c1a1254 Changed admin/js/collapse.js to take advantage of jQuery chaining in three places. Should make for a slight performance boost. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 21:30:53 +00:00
Adrian Holovaty
ce247476af Removed way-outdated comment in SelectFilter2.js admin JS file. And we should rename this to SelectFilter.js at some point 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 21:09:59 +00:00
Adrian Holovaty
804a38c369 Made some small clarifications to contrib/admin/index.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 20:46:10 +00:00
Adrian Holovaty
346324f131 Tweaked templates/builtins.txt to make it clearer that cycle and firstof filters don't auto-escape. Refs #10912 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 19:53:06 +00:00
Adrian Holovaty
9b93f1c01c Added a test that 'firstof' template filter doesn't auto-escape. cycle tag already has such a test (cycle20). Refs #10912 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 19:52:20 +00:00
Adrian Holovaty
08bec4fbc1 Changed BoundField.subwidgets() to return SubWidget objects instead of rendered strings. This means we can access individual radio buttons' properties in the template (see new docs) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-07 23:08:27 +00:00
Adrian Holovaty
0920165bc2 Fixed typo in a test name in form tests 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-07 22:33:20 +00:00
Adrian Holovaty
fc90c09efd Made BoundFields iterable, so that you can iterate over individual radio buttons of a RadioSelect in a template 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-07 22:31:39 +00:00
Aymeric Augustin
0519adb2a8 Clarified which setting causes HttpRequest.get_host() to rely on the HTTP_X_FORWARDED_HOST header. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-07 19:42:50 +00:00
Aymeric Augustin
2693aa890e Simplified time zone support in the Oracle backend. Avoided outputtypehandler which doesn't exist in cx_Oracle < 4.4.1. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-07 08:43:30 +00:00
Adrian Holovaty
5f9dbef4bb Fixed #17335 -- Added supports_select_related hook for django-nonrel. Thanks, jonash 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-05 23:11:43 +00:00
Aymeric Augustin
33bb3cd47c Fixed #17343 -- Changed the {% now %} tag to use the current time zone when time zone support is enabled. Thanks oinopion for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-04 22:11:12 +00:00
Aymeric Augustin
e42360b56b Added a versionadded directive for the 'admin_urlname' filter introduced at r16857. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-03 19:15:12 +00:00
Ramiro Morales
5e2f5d1466 Fixed a couple of typos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-03 17:34:52 +00:00
Ramiro Morales
f51205d0ed Updated uses of i18n.blocktrans template tag to use the new more compact syntax introduced in 1.3. 
Ref r14922.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-01 22:57:01 +00:00
Aymeric Augustin
be8938f0d8 Fixed #17275 -- Moved some imports back from module level to class level to prevent the test suite from raising warnings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-01 20:21:00 +00:00
Luke Plant
0d0f874d21 Punctuation fix in the 1.4 release notes 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17163 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-29 14:20:23 +00:00
Luke Plant
f2ebb169f9 Small code clarification in prefetch_related code using better variable names 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-29 12:50:10 +00:00
Luke Plant
16ad0530c5 Clarified release note about the removal of 'mixin' parameter to Storage.open, and added a note in the deprecation timeline. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-29 12:01:38 +00:00
Aymeric Augustin
6bfae3de7c Fixed #17309 -- Typo in the IGNORABLE_404_URLS example. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-28 19:41:58 +00:00
Aymeric Augustin
9d6321c921 Removed tests of the globbing feature that was removed at r17158. Refs #16247. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-27 21:17:33 +00:00
Aymeric Augustin
7872fc0dab Fixed #16247 -- Removed wildcard expansion of application names in INSTALLED_APPS. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-27 20:13:37 +00:00
Aymeric Augustin
33a52cde08 Fixed #16040 -- Preserved scheme, host and port in the test client when following a redirect. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-27 20:04:13 +00:00
Aymeric Augustin
c11f9c3193 Optimized the cached_db session backend to check if a key exists in the cache first. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-27 18:36:03 +00:00
Aymeric Augustin
bda21e2b9d Fixed #11555 -- Made SessionBase.session_key read-only. Cleaned up code slightly. Refs #13478. 
This also removes the implicit initialization of the session key on the first access in favor of explicit initialization.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17155 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-27 17:52:24 +00:00
Aymeric Augustin
fb7ab7730d Changed the fixtures used to test the 'initial_data' feature so they don't contain datetimes. Refs #17275. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17154 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-27 13:00:56 +00:00
Aymeric Augustin
02bc523b89 Renamed the fixtures used by the aggregation tests so they're only loaded by the tests that use them. Refs #17275. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-27 10:31:26 +00:00
Alex Gaynor
e4919f64b0 Clean up the the locmem cache backend and utils.synch by using context managers. Puch prettier. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-27 04:28:31 +00:00
Carl Meyer
1086a9a845 Fixed #17287 -- Prevented LocMemCache.incr/decr from changing key expiry time. Thanks Ivan Virabyan for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17151 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-26 22:27:16 +00:00
Aymeric Augustin
9c41437798 Fixed a typo in the layermapping docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-26 08:43:43 +00:00
Aymeric Augustin
268d737558 Fixed #16277 -- Changed the link to the IRC logs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-25 19:40:46 +00:00
Aymeric Augustin
866c229f52 Fixed #17294 -- Supported nullable DateTimeFields when time zone support is enabled. Thanks pressureman for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-25 09:25:43 +00:00