Commit Graph

7017 Commits

Author SHA1 Message Date
Russell Keith-Magee 2ad77f73b7 [1.0.X] Reverted r12000. 1.0.X branch is in security fix only mode.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@12003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-27 04:10:19 +00:00
Nicola Larosa 18754633ef [1.0.X] Italian translation updated
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@12000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 16:36:22 +00:00
Jarek Zgoda 01e5b21e3a Reverted changes in PL translation - thanks Karen Tracey
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 08:27:45 +00:00
Jarek Zgoda 504cdb085c [1.0.X] Polish translations updated
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 19:22:52 +00:00
James Bennett 56b80c70b6 [1.0.X] Reset 1.0 branch packaging data post-release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-09 22:18:16 +00:00
James Bennett 36b3916e3f [1.0.X] Correct download URL.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-09 21:29:17 +00:00
James Bennett b8332547b9 [1.0.X] Update setup.py for security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-09 21:07:57 +00:00
James Bennett c03090716a [1.0.X] Bump version number for security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-09 21:06:47 +00:00
Jacob Kaplan-Moss 594a28a904 SECURITY ALERT: Corrected regular expressions for URL and email fields.
Certain email addresses/URLs could trigger a catastrophic backtracking
situation, causing 100% CPU and server overload. If deliberately triggered, this
could be the basis of a denial-of-service attack.

This security vulnerability was disclosed in public, so we're skipping our
normal security release process to get the fix out as soon as possible.

This is a security related update. A full announcement will follow.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-09 20:59:25 +00:00
Karen Tracey 2099aba1bd [1.0.X] Fixed #6674: Documented a couple of widget arguments. Thanks timo.
r11478 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-29 12:44:44 +00:00
Matt Boersma 372736b70f [1.0.X] Fixed #11049: introspection on Oracle now identifies IntegerFields correctly.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11476 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-21 21:43:09 +00:00
Ramiro Morales 0f70fd99fd [1.0.X] One additional es_AR translation detail.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-14 14:31:59 +00:00
Ramiro Morales a7be652b41 [1.0.X] Updated es_AR translation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-14 14:24:23 +00:00
Karen Tracey b72d6cf0f6 [1.0.x] Fixed #11508: Adding missing word to form wizard doc. Thanks thepointer and timo.
r11444 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-13 17:01:31 +00:00
Karen Tracey 6922ebadbc [1.0.X] Fixed #11573: Updated Nginx url. Thanks bryanveloso.
r11442 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-13 16:55:34 +00:00
Karen Tracey 17b7a743a1 [1.0.X] Updated svn:ignore properties for tests/regressiontests/servers.
r11352 from trunk.

Also updated blocked and integrated svnmerge metadata.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-13 16:48:31 +00:00
James Bennett 542904ee6d [1.0.X] Add trove classifiers to 1.0 series setup.py. Not sure why I didn't do this before.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-03 21:18:39 +00:00
Brian Rosner 7af2b34a5c [1.0.X] Updated my bio to reflect current status
Backported from trunk [11379]

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-03 08:40:53 +00:00
James Bennett dbce0a1507 [1.0.X] Remove download_url from setup.py, since that only applies to the specific revision we packaged as 1.0.3.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-31 01:38:46 +00:00
James Bennett e6aefffbdc [1.0.X] With 1.0.3 out the door, this branch is now 1.0.4 pre-alpha.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-29 09:33:07 +00:00
James Bennett f602e2bad4 [1.0.X] Update packaging information for impending 1.0.3 security/bugfix release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-29 04:15:59 +00:00
James Bennett b8997d66be [1.0.X] We don't need to put the 'final' bit in the version number, and it messes up some pypi stuff. Backport of [11358] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-29 04:11:33 +00:00
Russell Keith-Magee df7f917b7f [1.0.X] SECURITY ALERT: Corrected a problem with the Admin media handler that could lead to the exposure of system files. Thanks to Gary Wilson for the patch.
This is a security-related backport of r11351. A full announcement, as well as a backport 0.96.X will be forthcoming.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11353 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-29 02:55:26 +00:00
Russell Keith-Magee f9249e4bd0 [1.0.X] Updated svnmerge properties
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-29 00:27:00 +00:00
Russell Keith-Magee e94ef54279 [1.0.X] Updated svnmerge properties
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11348 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-28 15:11:55 +00:00
Russell Keith-Magee 892ef07ac7 [1.0.X] Fixed #11556 -- Clarified the argument required by get_object_or_404. Thanks to rbonvall for the report.
Merge of r11344 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-28 14:41:45 +00:00
Nicola Larosa ca530f27c9 [1.0.X] Italian translation: further corrections
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-27 09:12:14 +00:00
Russell Keith-Magee f053d450e0 [1.0.X] Fixed #11519 -- Corrected minor typo in release notes index.
Merge of r11338 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-27 02:06:06 +00:00
Nicola Larosa 67d47daf05 1.0.X: italian translation: updates, corrections, added ugly but more correct suffixes to some gender-varying words
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11336 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-26 17:25:23 +00:00
Nicola Larosa cc5590b236 1.0.X: italian translation: commit of regenerated django.po to have significant commit diffs afterwards
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-26 16:58:17 +00:00
Russell Keith-Magee 59f0efa54b [1.0.X] Updated svnmerge properties.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11332 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-25 05:54:12 +00:00
Russell Keith-Magee 128787d3b5 [1.0.X] Fixed #11546 -- Modified the mail regression test to avoid getting hung up on 32/64 bit differences. Thanks to Richard Davies for the report.
Merge of r11328 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-25 05:17:38 +00:00
Russell Keith-Magee 10e90f9350 [1.0.X] Updated svnmerge properties
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-24 14:11:09 +00:00
Jannis Leidel e6d5d886bf [1.0.X] Updated German translation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11317 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-23 17:46:28 +00:00
Ian Kelly 77b269e875 Fixed #11487: pass long strings to Oracle as CLOB rather than NCLOB to prevent an encoding bug that occurs in some installations. Backport of [11285] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11286 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-21 21:25:48 +00:00
Gary Wilson Jr 72e2713d1a [1.0.X] Updated my bio.
Backport of r11281 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-21 16:51:26 +00:00
Gary Wilson Jr 6c5ca9f480 [1.0.X] Added myself to AUTHORS and updated my bio.
Backport of r11265 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-21 16:50:14 +00:00
Russell Keith-Magee 1679202ebb [1.0.X] Fixed #11493 -- Added an internal document listing the APIs that have been formally deprecated. Thanks to Alex Gaynor for the draft text.
Merge of r11277 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11280 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-21 03:04:00 +00:00
Russell Keith-Magee 624194a33a [1.0.X] Cleanup of some minor markup problems in URL documentation. Thanks to Ramiro Morales for the patch (an apologies for ommitting the credit from r11275)
Merge of r11275 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-21 02:14:36 +00:00
Russell Keith-Magee dff276b9c1 [1.0.X] Fixed #11512 -- Corrected unclosed tag in HTML on debug page. Thanks to rlaager for the report.
Merge of r11276 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11278 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-21 02:09:06 +00:00
Russell Keith-Magee 29b53b2b1c [1.0.X] Fixed #11492 -- Corrected some typos, and added some extra markup for the URLs documentation. Thanks to Ramiro Morales for the patch.
Merge of r11258 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11259 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-17 01:01:50 +00:00
Russell Keith-Magee 393e06997d [1.0.X] Blocked recent revisions from merge
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-17 00:08:24 +00:00
Russell Keith-Magee 0056d79c4e [1.0.X] Fixed #11229 -- Updated the mod_wsgi deployment documentation to avoid references to mod_python and techniques that are not recommended or required for mod_wsgi. Thanks to Graham Dumpleton for the suggestion and guidance.
Merge of r11249 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-16 23:54:04 +00:00
Russell Keith-Magee ab3b5b2380 [1.0.X] Fixed #10908 -- Clarified the procedure for creating test users in the testing docs. Thanks to gruszczy and timo.
Merge of r11248 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11254 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-16 23:49:27 +00:00
Russell Keith-Magee 940b8a17d4 [1.0.X] Blocked some recent updates from merge
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 14:28:08 +00:00
Russell Keith-Magee 1c908784e6 [1.0.X] Fixed #11235 -- Added a missing clause from some sample SQL in the queryset docs.
Merge of r11239 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 14:24:49 +00:00
Russell Keith-Magee c7289a0402 [1.0.X] Fixed #11364 -- Modified the jsi18n example to use the {% url %} tag rather than a placeholder. Thanks to jcassee for the suggestion.
Merge of r11237 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 14:21:19 +00:00
Russell Keith-Magee 500202337e [1.0.X] Fixed #11374 -- Modified the documentation for forms.BooleanField to allow for the fact that it can be rendered using widgets other than a checkbox. Thanks to lygaret for the patch.
Merge of r11236 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 14:17:29 +00:00
Russell Keith-Magee ca3bd9ffb7 [1.0.X] Fixed #11469 -- Removed suspicion that Django developers have trouble counting to four. Thanks to msgre for the report.
Merge of r11235 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 14:14:04 +00:00
Russell Keith-Magee fcbd3bcec9 [1.0.X] Fixed #10287 -- Added better examples in the docs of formset validation. Thanks to Andrew Badr for the text.
Merge of r11234 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 14:11:06 +00:00