innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
7,825 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

7825 Commits

Author SHA1 Message Date
Russell Keith-Magee 6df4ffd4f4 [1.1.X] Fixed #12997 -- Added markup for methods in the queryset docs. Thanks to Ramiro Morales for the patch. 
Backport of r13162 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 05:52:38 +00:00
Russell Keith-Magee 3981355c5c [1.1.X] Fixed #13051 -- Corrected the documentation of URL namespacing to match the tested implementation behavior. Thanks to apollo13 for the report, and Gabriel Hurley for the patch. 
Backport of r13161 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 05:51:57 +00:00
Russell Keith-Magee d529963113 [1.1.X] Fixed #13282 -- Clarified documentation around week_day filtering in querysets. Thanks to wangchun, Ramiro Morales and timo. 
Backport of r13155 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 05:13:45 +00:00
Russell Keith-Magee 95693cc6dd [1.1.X] Fixed #13310 -- Documented the RESTRUCTUREDTEXT_FORMAT_SETTINGS setting. Thanks to Wraithan for the patch. 
Backport of r13154 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 05:13:13 +00:00
Russell Keith-Magee e3389f9a20 [1.1.X] Fixed #13417 -- Clarified the use of the djangojs domain for translation. Thanks to stephaner for the report and initial patch, and Ramiro Morales for his additional markup. 
Backport of r13147 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 04:34:13 +00:00
Russell Keith-Magee a1421336d7 [1.1.X] Fixed #13455 -- Clarified the interaction of values() and extra(). Thanks to Rupe for the report and draft text. 
Backport of r13145 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13151 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 04:33:29 +00:00
Russell Keith-Magee 0711e1051d [1.1.X] Fixed #13497 -- Corrected various typos and markup problems in docs. Thanks to Ramiro Morales for the report and patch. 
Backport of r13144 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 04:32:40 +00:00
Russell Keith-Magee 947c8ce3b4 [1.1.X] Fixed #13499 -- Corrected typo in l10n docs. Thanks to selwin for the report and patch. 
Backport of r13143 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 04:31:49 +00:00
Luke Plant d5ed030228 [1.1.X] Added hyperlinks for builtin template tags and filters to code samples in docs. 
Implemented in javascript because doing it 'properly' is pretty much impossible with Sphinx and Pygments.
  
Refs #12249

Backport of [13135] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-08 20:31:59 +00:00
Russell Keith-Magee e8e87e09b9 [1.1.X] Fixed #13484 -- Added some newly available targets to the documentation makefile. Thanks to Alex for the patch. 
Backport of r13126 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-08 15:22:52 +00:00
Russell Keith-Magee 176f1c1c45 [1.1.X] Fixed #13336 -- Corrected an incorrect example of cache header usage. Thanks to dnjuls for the report, and claudep for the patch. 
Backport of r13129 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13132 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-08 07:34:53 +00:00
Russell Keith-Magee e6167e54db [1.1.X] Fixed #13471 -- Added example of send_mass_mail usage. Thanks to gtaylor for the report and patch. 
Backport of r13127 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-08 07:34:30 +00:00
Luke Plant 027ba077ac [1.1.X] Fixed typo and small formatting mistake in docs 
Backport of [13118] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-07 01:01:16 +00:00
Russell Keith-Magee d034374ea8 [1.1.X] Fixed #8357 -- Clarified what constitutes activity when calculating session expiry. Thanks to timo for the patch. 
Backport of r13113 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-06 01:36:42 +00:00
Russell Keith-Magee 760ed9987a [1.1.X] Fixed #12609 -- Updated FAQ on which version users should install. Thanks to shanx for the report. 
Backport of r13109 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13112 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-06 01:26:39 +00:00
Russell Keith-Magee 1d7c4a96ab [1.1.X] Fixed #13420 -- Clarified grammar in the email docs. Thanks to Dominic Rodger for the report. 
Backport of r13104 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-06 01:26:13 +00:00
Russell Keith-Magee 125ea947df [1.1.X] Fixed #13469 -- Cleaned up the test case from r13085, and added some cache cleanup that matters for Python 2.3. Thanks to Karen and Alex for their help. 
Backport of r13095 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-04 14:55:04 +00:00
Karen Tracey e28c0edbee [1.1.X] Fixed some Python 2.3 incompatibilities in new tests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-04 13:31:25 +00:00
Russell Keith-Magee c7fc8891b1 [1.1.X] Fixed #13467 -- Corrected Japanese translation for password reset emails. Thanks to cdeyoung for the report. 
Backport of r13084 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-04 08:16:06 +00:00
Russell Keith-Magee bc9708735f [1.1.X] Fixed #13464 -- Reworked module_has_submodule to break the requirement for loader and finder to be the same class. Thanks to Alex Gaynor for the report and patch, and Brett Cannon for suggesting the approach. 
Backport of r13082 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-04 08:15:34 +00:00
Karen Tracey a263d3b445 [1.1.X] Updated svnmerge metadata. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-03 18:09:48 +00:00
Karen Tracey 5c5c25eba5 [1.1.X] Fixed #13099 - incorrect SQL for exclude() example 
Thanks to istruble for the report. 

r12936 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13080 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-03 17:45:14 +00:00
Karen Tracey 820bcd0aa3 [1.1.X] Fixed #12688 -- Removed typo in manager docs. Thanks, orokusaki for the report and timo for the patch. 
r12485 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-03 17:14:57 +00:00
Nicola Larosa 0265a81449 [1.1.X] Updated the Italian translation 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-03 06:42:52 +00:00
Nicola Larosa 9c14f23946 [1.1.X] Italian translation updated by makemessages, to be fixed 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-03 05:57:16 +00:00
Jannis Leidel 99a512300c [1.1.X] Fixed #13388 - Refined changes made in r12384 in the JavaScript i18n admin view. 
Backport of r13069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-02 19:48:17 +00:00
Karen Tracey ef0e10cccf [1.1.X] Fixed #13453: Corrected typo in template syntax error message. Thanks jheasly. 
r13061 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13062 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-01 02:32:45 +00:00
Russell Keith-Magee fe3b75e276 [1.1.X] Fixed #12851 -- Another attempt at fixing select_related() with inherited models, this time with only(). Thanks to phxx for the test case. 
Backport of r13059 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-30 16:37:54 +00:00
Russell Keith-Magee 868acb3a6c [1.1.X] Fixed #13431 -- Corrected a unicode literal in select widgets. Thanks to gutworth for the report. 
Backport of r13036 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-30 14:12:36 +00:00
Russell Keith-Magee 2eb832a7e6 [1.1.X] Fixed #12851 -- Corrected the loading of values when select_related() is used on inherited models. Thanks to phxx for the report and test case. 
Backport of r13054 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-30 14:12:12 +00:00
Ian Kelly 6f4563aced [1.1.X] Fixed a bug preventing cursor variables from being passed as bind parameters in the oracle backend. Backport of r13042 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13043 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-28 17:15:11 +00:00
Karen Tracey 5f1ecdc51a Python 2.3 compatibility: Fixed a test to only run under 2.4+, since it fails due to a Ptyhon problem under 2.3. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13032 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-27 15:01:54 +00:00
Karen Tracey 33f097e50b Python 2.3 compatibility: replaced rsplit with something that works on 2.3. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-27 13:40:52 +00:00
Russell Keith-Magee a43464d67e [1.1.X] Fixed #13404 -- Reworked module_has_submodule() to allow it to work under AppEngine. Thanks to Waldemar Kornewald for the report and testing help. 
Backport of r13023 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-25 13:23:14 +00:00
Russell Keith-Magee 5226525736 [1.1.X] Fixed #13362 -- Disabled the test for bug #8245 under Python 2.3 due to differences in exception handling. 
Backport of r13021 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-24 07:10:15 +00:00
Russell Keith-Magee 58c1a67ff1 [1.1.X] Fixed #11764 -- Added a missing set of parentheses in a call calculating the select_related tables. Thanks to aurelio for the report and original patch, and wogan for the updated patch. 
Backport of r13019 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-23 14:30:29 +00:00
Karen Tracey c8576fa674 [1.1.X] Python 2.3 compatibility: we still need the special sets import here. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-22 00:00:19 +00:00
Russell Keith-Magee af48cad39e [1.1.X] Fixed #13396 -- Modified the SQLite introspection code to avoid a problem with unconsumed cursors on PyPy. Thanks to Alex Gaynor for the report and fix. 
Backport of r13016 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-21 23:50:00 +00:00
Russell Keith-Magee 0e996983d5 [1.1.X] Fixed #13389 -- Ensured that the app_loading test clears out the app cache at the end of each test, so that it doesn't interact badly with flush and other introspected database commands. Thanks to Karen for the report, and Ramiro Morales for the debugging hints. 
Backport of r13011 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-21 12:07:36 +00:00
Karen Tracey 1982c8b73e [1.1.X] Adjust the fr.py localflavor tests to account for r13007. 
Merge of applicable part of r13008.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-20 20:43:17 +00:00
Russell Keith-Magee 2f6317f89c [1.1.X] Fixed #13387 -- Removed some duplicated departments in the French localflavor. Thanks to Pinaraf for the report. 
Backport of r13006 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-20 15:07:14 +00:00
Russell Keith-Magee 4807b02a83 [1.1.X] Fixed #13382 -- Modified a message used for testing purposes to allow test passes under PyPy. Thanks to Alex Gaynor for the report and patch. 
Backport of r13003 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-20 12:22:10 +00:00
Russell Keith-Magee f282099832 [1.1.X] Fixed #13374 -- Corrected some more minor issues causing problems for PyPy. Thanks to Alex Gaynor for the report and patch. 
Backport of r12998 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-19 11:57:04 +00:00
Justin Bronn be167b804d [1.1.X] Fixed #11810 -- Fixed typo and errors that prevented `modifiable` from working in the geographic admin. Thanks to Rob Coup for the bug report. Refs #12504. 
Backport of r12995 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-16 16:45:59 +00:00
Karen Tracey f6b6e0f1d9 [1.1.X] Fixed #13360: For Python2.3 compatbility, don't pass iterators to sorted. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-16 15:47:06 +00:00
Russell Keith-Magee e7ef1b220e [1.1.X] Fixed #13357 -- Minor changes to get Django running under PyPy. Thanks to Alex Gaynor for the patch. 
Backport of r12991 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-16 11:15:21 +00:00
Karen Tracey 534dc44dba [1.1.X] Fixed #9427: Allow for autodiscover to load admin modules from apps in eggs. Thanks clint and metzen. 
r12989 (and r12192 as a side-effect) from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 23:18:33 +00:00
Karen Tracey 231e452f96 [1.1.X] Fixed #13345: Don't attempt to load the locale regressiontests subdirectory as a Django app. Thanks ramiro. 
r12971 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 20:33:19 +00:00
Karen Tracey 8092d3b23f [1.1.X] Fixed #13353: Corrected a couple of tests that were dependent on dictionary ordering. Thanks Alex. 
r12984 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 19:14:52 +00:00
Karen Tracey ce8367f1c8 [1.1.X] Fixed #13348: Restored ability to load models from apps in eggs. Thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule. 
r12982 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 18:49:37 +00:00