mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-18 16:49:13 +00:00
Code Issues 32 Releases Wiki Activity
6,696 Commits 29 Branches 451 Tags
Commit Graph

6696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Karen Tracey
3c5f7bc262 [1.0.X] Update svnmerge metadata. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10387 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-04 17:19:50 +00:00
Russell Keith-Magee
f3a81cb5af [1.0.X] Blocked r10385 from merge. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-04 06:59:59 +00:00
Jacob Kaplan-Moss
fd8965198f [1.0.X] Fixed #9991: correctly introspect PostgreSQL 'real' types. Backport of r10379 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-03 20:53:50 +00:00
Jacob Kaplan-Moss
b45cf13bed [1.0.X] Fixed #10372: made get_svn_revision() more robust. Thanks, mboersma. Backport of r10377 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-03 20:29:59 +00:00
Jacob Kaplan-Moss
fbffc2e943 [1.0.X] Fixed #10522: accept tuples in generic_inlineformset_factor(exclude). Thanks, mk. Backport of r10375 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-03 20:04:39 +00:00
Jacob Kaplan-Moss
9907495b3c [1.0.X] Fixed #9546: GenericRelations inherited from base models no longer query using the wrong content type. Backport of r10373 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-03 19:56:30 +00:00
Jacob Kaplan-Moss
597102199e [1.0.X] Fixed a whole bunch of small docs typos, errors, and ommissions. Backport of the parts of r10371 that apply to the 1.0 docs. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-03 18:37:43 +00:00
Jarek Zgoda
8c253bcea1 Polish translation updated 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10368 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-02 08:35:40 +00:00
Jacob Kaplan-Moss
faf049c498 Updated svnmerge metadata. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-02 05:28:44 +00:00
Jacob Kaplan-Moss
4257feffe8 [1.0.X] Fixed #9520: make the date filter fail silently for non-date values. Thanks, Andrew Badr and Eric Holscher. Backport of r10365 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10366 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-02 05:22:17 +00:00
Jacob Kaplan-Moss
38aeee4839 [1.0.X] Added tests for database introspection. Refs #9779. Backport r10362 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10363 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-02 04:34:42 +00:00
Jacob Kaplan-Moss
fd7280e4f4 [1.0.X] Fixed #10063: stop passing the -W flag to psql since it isn't needed and interferes with .pgpass. Thanks, Walter. Backport of r10360 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10361 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-02 02:04:59 +00:00
Jacob Kaplan-Moss
33c27f2f28 [1.0.X] The most exciting *backport* you'll ever see. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-02 01:57:12 +00:00
Jacob Kaplan-Moss
c51722373b [1.0.X] Fixed the test in [10351] to work reguardless of the test settings. Backport of r10355 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10356 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-02 01:41:56 +00:00
Jacob Kaplan-Moss
ef0a5fb9eb Updated svnmerge metadata. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-02 01:15:43 +00:00
Jacob Kaplan-Moss
a080fcd1a6 [1.0.X] Fixed #9005: don't wig out when reversing a URL if SETTINGS_MODULE isn't set. While I was there, I fixed #10599 by re-raising the original error message, which is almost always a better idea. Thanks, Eric. Backport of r10350 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10351 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 23:09:45 +00:00
Joseph Kocherhans
f58df036bd [1.0.x] Backport of r10348 from trunk, plus missing tests that should have been in r10286. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 22:35:41 +00:00
Jacob Kaplan-Moss
c7a16bc6e0 [1.0.X] Fixed #10538: use a prefix for HTML ids on the admin doc page to avoid conflicts with existing elements. Thanks, Justin Lilly. Backport of r10343 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10344 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 21:35:00 +00:00
Jacob Kaplan-Moss
647ff3f1ac [1.0.X] Fixed #10265: fixed a bug when generating a password reset token for a user created on the same request. Thanks, crucialfelix. Backport of r10341 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 21:26:55 +00:00
Jacob Kaplan-Moss
eb24c7fd0c [1.0.X] Fixed #9969: choices with options groups (added in [7977]) now work correctly in the admin with list_display and list_filter. Thanks, ramiro. Backport of r10318 from trunk; thanks, cramm. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 21:17:54 +00:00
Jacob Kaplan-Moss
d0dce0257b [1.0.X] Fixed #8889: make admindocs function view work with class-based views. Backport of r10337-r10338 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 18:46:17 +00:00
Jacob Kaplan-Moss
e047110657 [1.0.X] Fixed #10016: the cache middleware no longer vomits when handed long URLs. Thanks, Matt Croydon. Backport of r10335 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10336 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 18:20:53 +00:00
Jacob Kaplan-Moss
34e823a699 [1.0.X] Fixed #9644: fix a thread sync issue in the locmem cache. Thanks, mrts. Backport of r10333 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 17:06:20 +00:00
Jacob Kaplan-Moss
6efe30672d [1.0.X] Fixed #9474: user_passes_test may now be applied multiple times. Backport of r10328 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 16:18:25 +00:00
Jacob Kaplan-Moss
05e3242dc5 Updated svnmerge metadata. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 15:35:48 +00:00
Jacob Kaplan-Moss
92edfca2fb Update svnmerge metadata. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 15:10:48 +00:00
Jacob Kaplan-Moss
7cbbd782e1 [1.0.X] Fixed #9473: FormWizard now works with NullBooleanFields. As a bonus, we now have the beginnings of a test suite for FormWizard. Thanks, Keith Bussell. Backport of r10316 and r10319 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 15:07:31 +00:00
Jacob Kaplan-Moss
906f55bf09 [1.0.X] Fixed #7510: the ModelAdmin now uses self.queryset instead of the default manager. Thanks, Alex Gaynor. Backport of r10314 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 15:07:13 +00:00
Jacob Kaplan-Moss
53d5f27e75 [1.0.X] Fixed a couple of mistaken bits of the docs in [10312] 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 03:02:47 +00:00
Jacob Kaplan-Moss
f770cf5c5a [1.0.X] Fixed #10031: updated SQLite database docs to more strongly indicate the problems with versions before 3.3.6. Thanks, ramiro. Backport of r10311 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 02:37:04 +00:00
Joseph Kocherhans
6b2e28d963 [1.0.x] Fixed #9452. InlineModelAdmin docs now mention the right default for 'form'. Backport of r10309 from trunk. Forgot to thank patrickk. Sorry about that. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 01:34:49 +00:00
Jacob Kaplan-Moss
8f6e1cdf9f Marked r10303-10304 as applied to 1.0.X. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 00:10:40 +00:00
Jacob Kaplan-Moss
dc7c952e8d [1.0.X] Fixed a silly typo in databases ref. Thanks, Alex. Backport of r10304 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 00:08:48 +00:00
Jacob Kaplan-Moss
a9017a1e5a [1.0.X] A whole lotta documentation fixes, backported from r10303 on trunk. 
I got my commit message cut off the first try, but luckily I get to still thank Kevin Kubasik for rolling all these fixes up into a single easy patch.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 00:08:34 +00:00
Jacob Kaplan-Moss
97b22bde3c Made a bunch of edits to docs/topics/cache.txt, mostly based on stuff from the Django Book. Backport of [10055] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 23:54:13 +00:00
Karen Tracey
e87c07ec63 [1.0.X] Remove the block on r10055. Per note from Adrian this one should be merged to the branch but he hasn't done it yet and I haven't gotten around to asking him why or if he just wants me to do it. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 22:41:43 +00:00
Jacob Kaplan-Moss
4bf87443d4 Blocked [10281] from 1.0.X. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10301 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 22:07:15 +00:00
Jacob Kaplan-Moss
6b937c67ea [1.0.X] Fixed #9970: added mod_wsgi docs. Thanks, Alex Gaynor. Backport of r10280 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 22:06:06 +00:00
Jacob Kaplan-Moss
377cc9c850 [1.0.X] Fixed #10513: floatformat now works with floatish things, not just real floats. Thanks, Alex. Backport of [10278] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 22:04:15 +00:00
Jacob Kaplan-Moss
4a3139d63e [1.0.X] Fixed #8847, #10370: added some missing methods to MultiValueDict after [8399]. Thanks, James Turk and rfk. Backport of r10241 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 22:02:37 +00:00
Jacob Kaplan-Moss
4502a2d3ca [1.0.X] Fixed #8749: add better breadcrumbs in the change password template. Thanks, SmileyChris. Backport of r10234 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 22:00:46 +00:00
Jacob Kaplan-Moss
d032e15079 Block the rest of the 1.1 features to date from 1.0.X. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 21:59:09 +00:00
Jacob Kaplan-Moss
bd4f2a1d46 Marked the rest of the revs already integreated into [1.0.X] 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 21:58:14 +00:00
Jacob Kaplan-Moss
795697dc22 [1.0.X] Fixed #8746: Check data in raw_id_fields more closely. Thanks, dgouldin 
Backport of r10233 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 21:48:29 +00:00
Jacob Kaplan-Moss
67a5880162 [1.0.X] Fixed #10413: RelatedManager.add no longer fails silenty when trying to add an object of the wrong type. Thanks, dgouldin. 
Backport of r10226 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 21:42:47 +00:00
Jacob Kaplan-Moss
0995396817 [1.0.X] Fixed #9883: no longer do strange things with whitespace in the linebreaks filter. Thanks, keithb. 
Backport of r10225 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10292 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 21:40:40 +00:00
Jacob Kaplan-Moss
7475092c9f [1.0.X] Fixed #10157: correctly set the related objects pk when assigning a reverse OneToOne. Thanks, dgouldin. 
Backport of r10224 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 21:15:55 +00:00
Jacob Kaplan-Moss
fd0c4bb76e [1.0.X] Fixed #10387: removed some code duplication in django.utils.cache. Thanks, Travis Swicegood. 
Backport of r10223 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 21:14:39 +00:00
Jacob Kaplan-Moss
766ff97208 Blocked some more revs from 1.0.X. Isn't this fun? 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 20:49:37 +00:00
Jacob Kaplan-Moss
d41cfde686 Marked some more revs as integrated into 1.0.X. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10288 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 20:48:06 +00:00