mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-18 23:44:22 +00:00
Code Issues 24 Releases Wiki Activity
11,393 Commits 28 Branches 423 Tags 639 MiB
58346e92fa
Commit Graph

11393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Phalip
1572a3d4b2 Fixed #10931 -- Made Truncator handle newlines properly. Thanks to gsong and Claude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-02 18:47:18 +00:00
Julien Phalip
6fa62b8166 Fixed #8997 -- Prevented the contenttypes shortcut view to hide errors occurring inside the get_absolute_url() method. Thanks to Rob for the report and to joshlory, Aymeric Augustin and Claude Paroz for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-02 18:02:47 +00:00
Julien Phalip
07132fb5d4 Improved the labels and help texts in the admin filter widget. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-02 15:35:16 +00:00
Julien Phalip
991d3d6c12 Slightly improved the help text for the "Password" field in the auth.User admin form, and PEP8-cleaned up the area while I was there. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-02 14:51:25 +00:00
Julien Phalip
cb99b598c1 Fixed #11410 -- Moved the "Groups" field to the "Permissions" module in the auth.User admin form and modified the help texts for the user_permissions and groups model fields to reflect that change. Also did a little PEP8 cleanup and improved some docstrings while I was in the area. Thanks to benspaulding and Aymeric Augustin for the suggestions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-02 14:21:50 +00:00
Aymeric Augustin
8af9084495 Fixed #17490 -- Added a trailing comma in INSTALLED_APPS, to avoid unexpected string concatenation when adding another app. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17324 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-02 11:19:06 +00:00
Aymeric Augustin
9cce7a5ea8 Fixed #17486 -- Updated the welcome page of new projects to reflect the new structure created by startproject. Thanks aashu_dwivedi. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-01 21:54:33 +00:00
Alex Gaynor
1aaa0dd098 Fix the dispatch test GC code under PyPy, and make the comment for Jython better. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-01 21:11:05 +00:00
Aymeric Augustin
b9910bddd2 Fixed #17488 -- This test passed in 2011 only because 2012-01-01 is a Sunday. Thanks Florian Apolloner for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-01 20:59:09 +00:00
Ramiro Morales
f250ef3573 Made sure startproject can handle template URLs with trailing slashes. 
Thanks Issac Kelly that reported this via IRC.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-01 17:45:40 +00:00
Timo Graham
068dcbddb9 Fixed #11986 - Added sudo to Mac OS permissions note in tutorial. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-31 15:34:49 +00:00
Timo Graham
72793766a7 Fixed #640 - Documented that changing order_with_respect_to requires a schema change; thanks fcurella and poirier for the draft patches. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-31 15:30:22 +00:00
Timo Graham
060783d52d Fixed #702 - Documented that ManyToMany fields can't be in unique_together; thanks poirier for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-31 00:43:11 +00:00
Adrian Holovaty
9fe578c212 Added a bit to the 1.4 release notes about the new SECURE_PROXY_SSL_HEADER setting 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 21:13:53 +00:00
Adrian Holovaty
d4f11eb776 Fixed incorrect 'setting::' prefix in settings.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 21:13:08 +00:00
Paul McMillan
143fa9193c Improved comment formatting to appease Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17311 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:43:01 +00:00
Adrian Holovaty
67f7756000 Edited release-process.txt changes from [17300] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:39:08 +00:00
Adrian Holovaty
937213c2c3 Edited csrf.txt changes from [17299] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:36:54 +00:00
Paul McMillan
1fed65224f Increased pbkdf2 scaling test vectors to lower chance of false test failures. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:35:44 +00:00
Adrian Holovaty
ffb0519d44 Edited testing.txt changes from [17289] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:34:07 +00:00
Adrian Holovaty
32ee74f89e Edited testing.txt changes from [17283] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:29:27 +00:00
Adrian Holovaty
103890561b Moved 'User-requested password resets' docs from [17266] from auth docs to admin docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:23:26 +00:00
Adrian Holovaty
f2dcca6631 Edited docs/releases/1.4.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 19:18:03 +00:00
Adrian Holovaty
de697769b7 Edited doc changes from [17246] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 18:14:31 +00:00
Adrian Holovaty
d3ef13044e Edited doc changes from [17244] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 18:01:34 +00:00
Timo Graham
afb21094a9 Fixed #17068 - Documented that documentation fixes will be more freely backported. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 15:30:51 +00:00
Aymeric Augustin
39201d8fe5 Fixed #16704 -- Documented how to insert the CSRF token outside of Django's own template engine. Thanks paulcwatts and bpeschier for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 14:55:44 +00:00
Aymeric Augustin
c458700382 Fixed #16590 -- Accepted a 'name' argument in the constructor of ContentFile, for consistency with File. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 14:51:05 +00:00
Aymeric Augustin
27444618f6 Fixed #15789 -- Set the decimal precisio to avoid an exception in the floatformat filter, and added a few more tests. Thanks akaihola for the report, igalarzab for the patch and ptone for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 14:35:29 +00:00
Aymeric Augustin
baf63f6e57 Fixed #10725 -- When the child process spawned by the autoreloader gets killed by a signal, passed the signal to the parent, in order to make debugging easier. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 14:12:31 +00:00
Aymeric Augustin
fa226cd740 Fixed #17303 -- Ensured the list of template loaders is fully loaded before it is cached. Thanks andrey DOT gtx AT gmail DOT com for the report and patch, and Anssi Kääriäinen for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 12:55:08 +00:00
Timo Graham
ca984aa50a Fixed #17334 - Documented the commit message style for backports; thanks krzysiumed for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 12:52:49 +00:00
Aymeric Augustin
5e75678c8b Fixed #17444 -- Made it possible to customize the 'To' header in emails. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 12:44:35 +00:00
Aymeric Augustin
e5999ce234 Fixed #17440 -- Used a more natural default date format in the Italian locale. Thanks rm_ and tekNico. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17292 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 12:41:24 +00:00
Timo Graham
067352ec02 Fixed #17470 - Broken links in 0.95/0.96 release notes; thanks fastinetserver for the report; aaugustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 12:21:40 +00:00
Julien Phalip
0bf2d33770 Added the ability to specify multiple ports available for the LiveServerTestCase WSGI server. This allows multiple processes to run the tests simultaneously and is particularly useful in a continuous integration context. Many thanks to Aymeric Augustin for the suggestions and feedback. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-29 20:22:13 +00:00
Ramiro Morales
a82204fa9a Moved validation of project names to an earlier spot so no directory with invalid name is created. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17288 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-29 19:06:57 +00:00
Ramiro Morales
f185024fc4 Made sure the new project template functionality works when the template 
path specified has a trailing path separator.

Thanks Alex for the report.

Fixes #17475.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-29 17:03:38 +00:00
Aymeric Augustin
3367913c3d Fixed #17476 -- Ensure timezone-dependant cache keys only use ASCII characters, especially on Windows. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17286 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-29 13:57:32 +00:00
Julien Phalip
ec07a30e82 Indicated the exact version that is required to use the "WebDriverWait" example in the testing doc. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17285 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-29 07:28:21 +00:00
Ramiro Morales
953a471a21 Made sure manage.py help test works. 
Thanks shige DOT abe AT nasa DOT gov for the report.

Fixes #17477. Refs r16352.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17284 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-29 01:18:30 +00:00
Julien Phalip
a343a84ce6 Added the wait_until() and wait_loaded_tag() methods to AdminSeleniumWebDriverTestCase to prevent some concurrency issues with in-memory SQLite database access in the admin Selenium tests. Thanks to Florian Apolloner, Anssi Kääriäinen and Aymeric Augustin for their help debugging this problem. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-28 22:20:30 +00:00
Jannis Leidel
46c12d1293 Fixed #17455 -- Extended CachedStaticFilesStorage slightly to handle some URLs better that are used to add support for webfonts to IE 6-8. Also ignore data: URLs and fragment-only URLs (e.g. #default#VML). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 22:49:24 +00:00
Aymeric Augustin
ae0ce4373f Moved calls to addCleanup before assertions in admin_scripts tests, so that cleanup occurs even when tests fails. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 15:35:41 +00:00
Aymeric Augustin
12206bdf0f Fixed a test that was failing under Windows. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17280 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 15:04:05 +00:00
Aymeric Augustin
cac7818e5e Removed Python 2.3 compatibility code from the admin_scripts tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 14:54:00 +00:00
Aymeric Augustin
a62ce30661 Fixed #17463 -- Conditionally skipped tests that Windows isn't able to run. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17278 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 09:28:50 +00:00
Aymeric Augustin
e8a6fee6e6 Fixed a CacheKeyWarning under Windows. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-27 08:22:55 +00:00
Karen Tracey
b045783729 Fixed #17462: Adjusted staticfiles CachedFilesMixin code so its tests pass on Windows. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-25 19:44:20 +00:00
Karen Tracey
5df784ab42 Fixed deletion of the runtests temp tree to work on Windows even when the tree contains non-ASCII filenames. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-25 18:53:29 +00:00