mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 18:16:19 +00:00
Code Issues 25 Releases Wiki Activity
5,533 Commits 28 Branches 426 Tags 666 MiB
7fecbe42a8
Commit Graph

5533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell Keith-Magee
4ecc5f490a Fixed #8041 -- Modified media rendering to return safe strings. Thanks to Daniel Pope <dan@mauveinternet.co.uk> for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8285 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-10 12:29:47 +00:00
James Bennett
2e08591403 Fix typo in docs/files.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8284 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-10 10:19:21 +00:00
Brian Rosner
a7d3c92767 Fixed #8202 -- Moved user_change_password to UserAdmin. This enables seamless integration of a custom UserAdmin. Thanks ElliottM for catching this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-10 09:43:48 +00:00
Russell Keith-Magee
ec7d8b7c61 Fixed #5943 -- Modified django-admin to behave like manage.py if settings are provided, either as --settings or DJANGO_SETTINGS_MODULE. Thanks to Joseph Kocherhans and Todd O'Bryan for their work on this ticket. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-10 08:42:49 +00:00
Russell Keith-Magee
7610983bb2 Fixed #8201 -- Corrected typo in files docs. Thanks Julien. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-10 08:19:21 +00:00
Brian Rosner
baac791c4b Fixed #7932 -- Made it easier to use a custom User model with the admin. Added add_form attribute to UserAdmin and removed hard-coded dependancies to User. Thanks ElliottM for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8280 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-10 04:22:21 +00:00
Brian Rosner
02cc59187b Fixed #4667 -- Added support for inline generic relations in the admin. Thanks to Honza Král and Alex Gaynor for their work on this ticket. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-10 04:03:01 +00:00
Malcolm Tredinnick
f6670e1341 Added a return value to the add() method for caches. It's now possible to tell 
if a call to add() ended up storing something in the cache.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8278 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-10 03:52:21 +00:00
Brian Rosner
38dc472796 Fixed #7250 -- Don't show internal data of a FileField in the admin when the form does not validate. This also alternatively fixes a recent problem since [8244] when the form is not valid. Thanks Marc Garcia for the initial ticket. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-10 01:07:40 +00:00
Jacob Kaplan-Moss
049d490875 Fixed #7921: for sqlite3 2.4.1 or later, adapt str objects to unicode, thus preveting weird failures with 8-bit bytestrings. Martin von Löwis and Karen Tracey tracked this one down -- thanks! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 23:59:01 +00:00
Brian Rosner
b5b129567e Added a missing import in AdminSite.check_dependancies. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 23:56:34 +00:00
Brian Rosner
89a8990a76 Moved ModelAdmin.check_dependancies to AdminSite. Make debugging problems why the admin is not working more apparent. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 23:40:57 +00:00
Brian Rosner
65be56816f Fixed #5780 -- Adjusted the ModelAdmin API to allow the created/updated objects 
to be passed to the formsets prior to validation.

This is a backward incompatible change for anyone overridding save_add or
save_change. They have been removed in favor of more granular methods
introduced in [8266] and the new response_add and response_change nethods.
save_model has been renamed to save_form due to its slightly changed behavior.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 20:52:40 +00:00
Luke Plant
50e6928c5b Made NoReverseMatch exceptions more helpful. Thanks, mrts 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 18:06:51 +00:00
Jacob Kaplan-Moss
4747347385 Fixed #5801: admin requests with GET args now get properly bounced through login with those args intact. Thanks for the patch, Rozza. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 17:35:19 +00:00
Malcolm Tredinnick
400a6b23cf Fixed #8176 -- Updated Japanese translation from Takashi Matsuo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 17:20:21 +00:00
Malcolm Tredinnick
342f9f0efb Removed a translator name from a PO file (they all go in AUTHORS). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 17:20:01 +00:00
Malcolm Tredinnick
c763f26173 Updated the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 17:19:44 +00:00
Malcolm Tredinnick
dc14b29fb3 Added the ability to force an SQL insert (or force an update) via a model's 
save() method.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8267 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 17:19:23 +00:00
Jacob Kaplan-Moss
f53e4d80b4 Added ModelAdmin.save_model() and ModelAdmin.save_formset() methods to allow for easier modification of objects/inlines at admin-save time. Refs #6002. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 17:12:48 +00:00
Jacob Kaplan-Moss
6ba6489662 Broke the admin's use of LogEntry and user messages out into callbacks on ModelAdmin. Refs #6002. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8265 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 16:45:15 +00:00
Jacob Kaplan-Moss
88baf06c3d Fixed #7811: moved admindocs templates into admindocs/templates. This is slightly backwards-incompatible in that if you're using the admindocs you'll need to add 'django.contrib.admindocs' to INSTALLED_APPS. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 15:53:50 +00:00
Jacob Kaplan-Moss
69d8ff31ac No, really: PermWrapper is not iterable. Fixes #8182. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 15:38:44 +00:00
Jacob Kaplan-Moss
be5350f2d5 Fixed a couple imports in django.core.files.storage. Fixes #8188. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 15:16:47 +00:00
Jacob Kaplan-Moss
88639e9b2a Fixed silly whitespace error in cache docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8261 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 15:11:11 +00:00
Jacob Kaplan-Moss
7526590376 Split CacheMiddleware up into two parts -- an update-cache and a fetch-from-cache middleware. This lets you run each half of the cache middleware at the correct time to avoid bad interactions between the cache middleware and other middleware that must modify the cache key (like the locale middleware). 
CacheMiddleware itself is still around for backwards-compatibility and as a hook point for the cache decorator, but the documentation has been updated to point people towards the two-part caching middleware.

Refs #730.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8260 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 15:07:45 +00:00
Malcolm Tredinnick
e8f18643cf Fixed #8121 -- Don't override the Content-Language HTTP header in the locale 
middleware if it's already been set. Thanks, jcassee.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8259 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 15:04:45 +00:00
Malcolm Tredinnick
99594011a2 Updated LICENSE file to acknowledge individual copyrights as well (after 
discussion with Jacob). This is a formality, since it was always true, just not
noted.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8258 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 14:40:51 +00:00
Jacob Kaplan-Moss
750f5c8d46 Fixed #8187: made PIL imports consistant. Thanks, bastih. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 14:18:09 +00:00
Jacob Kaplan-Moss
6a06db0491 Fixed a typo in files documentation. Fixes #8180. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 14:17:54 +00:00
Jacob Kaplan-Moss
6185093351 Use a FileField instead of an ImageField in the admin_widgets test so that folks without PIL can still run the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 23:06:28 +00:00
Jacob Kaplan-Moss
b30ee21dc1 Fixed #7820: MiddlewareNotUsed is finally documented somewhere else besides my brain. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8254 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 22:36:17 +00:00
Malcolm Tredinnick
097a19c3bf Changed the version number to not include a space. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 22:05:36 +00:00
Malcolm Tredinnick
438b816e41 Bumped version number prior to release. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8251 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 22:04:34 +00:00
James Bennett
2e01d59887 1.0 alpha 2 release notes 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 22:00:25 +00:00
Jacob Kaplan-Moss
6f6024751c Don't import PIL until needed so that systems without PIL don't barf. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 21:57:25 +00:00
Brian Rosner
84afcf5a02 Removed an extraneous } that regressed from an older patch for [8247]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8248 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 21:33:55 +00:00
Brian Rosner
1c9ca83db2 Fixed #8169 -- Honor attrs from subclasses of the new admin widgets introduced in [8240]. Thanks Alex Gaynor for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 21:27:03 +00:00
Jacob Kaplan-Moss
19bbc74e46 Fixed #7115: tweaked ordering on Permission to more closely match the pre-QSRF behavior, which was nice. Thanks, Matthew Flanagan. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 21:24:02 +00:00
Malcolm Tredinnick
660b909557 Fixed #8107 -- Fixed a missing forced_unicode() call in admin. Patch from 
bjronkri.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 21:19:59 +00:00
Jacob Kaplan-Moss
7899568e01 File storage refactoring, adding far more flexibility to Django's file handling. The new files.txt document has details of the new features. 
This is a backwards-incompatible change; consult BackwardsIncompatibleChanges for details.

Fixes #3567, #3621, #4345, #5361, #5655, #7415.

Many thanks to Marty Alchin who did the vast majority of this work.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 20:59:02 +00:00
Brian Rosner
c49eac7d4f Fixed #8069 -- Corrected the inconsistent case with BaseInlineFormset. It has been renamed to BaseInlineFormSet. Backward incompatible for anyone who used BaseInlineFormset directly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 20:27:48 +00:00
Malcolm Tredinnick
32d5c39016 Fixed #6523 -- Use the correct cast on field types for PostgreSQL when 
searching within a field column (e.g. "like", "contains", etc). Required for
PostgreSQL 8.3. Thanks to Dan Watson for the patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 20:09:53 +00:00
Brian Rosner
6d4b143786 Fixed #8166 -- Corrected a typo in the admin documentation. Thanks d00gs for the hawk eyes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 20:02:10 +00:00
Brian Rosner
5d199ba901 Fixed #8163 -- Restore oldforms admin styling on input fields. Also cleaned up some styles for both tabular and stacked inlines. Thanks Nathan Borror for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 19:54:34 +00:00
Jacob Kaplan-Moss
5fb9599086 Fixed #8100: Jython, apparently, is now a TTY. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 18:51:34 +00:00
Jacob Kaplan-Moss
176fabcc6f Fixed #8047: property detect an external database backend and set sys.path accordingly. Patch from Leo Soto. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 18:48:18 +00:00
Malcolm Tredinnick
34028f3ef3 Fixed #8142 -- Removed an unnecessary parameter in a superclass init call. 
Patch from Karen Tracey.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 18:33:02 +00:00
Malcolm Tredinnick
ab8965c428 Added a few force_unicode() calls around objects in the admin. Required for 
Python 2.3 compatibility. Patch from nfg.

Refs #8151, #8153.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8236 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 18:07:33 +00:00
Malcolm Tredinnick
be4390f834 Made auto-reloading for the dev server a little more friendly in the Jython 
case. Patch from Leo Soto. Fixed #8147.

In passing, also corrected a typo when reloading .pyo files. Fixed #8157.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8235 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 17:54:35 +00:00