1
0
mirror of https://github.com/django/django.git synced 2025-03-22 07:10:45 +00:00

14025 Commits

Author SHA1 Message Date
Erik Romijn
cebfbcdb86 [1.5.x] Added information on resolved security issues to release notes.
Backport of c07f3e60c2d455e36ba4ac339d4283d32bbc3814 from master
2014-04-21 18:31:08 -04:00
Erik Romijn
985434fb1d [1.5.x] Fixed queries that may return unexpected results on MySQL due to typecasting.
This is a security fix. Disclosure will follow shortly.

Backport of 75c0d4ea3ae48970f788c482ee0bd6b29a7f1307 from master
2014-04-21 18:31:08 -04:00
Aymeric Augustin
6872f42757 [1.5.x] Prevented leaking the CSRF token through caching.
This is a security fix. Disclosure will follow shortly.

Backport of c083e3815aec23b99833da710eea574e6f2e8566 from master
2014-04-21 18:31:05 -04:00
Tim Graham
2a5bcb69f4 [1.5.x] Fixed a remote code execution vulnerabilty in URL reversing.
Thanks Benjamin Bach for the report and initial patch.

This is a security fix; disclosure to follow shortly.

Backport of 8b93b31487d6d3b0fcbbd0498991ea0db9088054 from master
2014-04-21 18:30:57 -04:00
Matt Lauber
d6c685cc78 [1.5.x] Corrected the section identifier for MySQL unicode reference.
Backport of b2514c02e1 from master
2014-04-21 13:20:56 -04:00
Erik Romijn
1997421f8e [1.5.x] Fixed -- Corrected misprint in i18n docs
Backport of 54d5c37de6572eae57a66339bb38719e681cee82 from master.
2014-04-18 15:16:43 +02:00
Jordi Yeh
ec2d456df8 [1.5.x] Fixed -- Fixed contributing guide w/o github set-up
The published commnand was not working when the user did not have
the git client set-up with the public-key. Changed the contributing
guide to clone it from https instead.

Backport of 28102991172ab931d030412275f926c1b05c688d from master
2014-04-16 09:40:32 -04:00
Tim Graham
cbc80eef6d [1.5.x] Fixed -- Corrected deployment instructions for Apache 2.4.
Thanks zjcheah at yahoo.com for the report.

Backport of 0f37d2e4c0 from master
2014-04-15 17:46:01 -04:00
Tim Graham
5b2d17d910 [1.5.x] Fixed -- Typo in docs/topics/db/multi-db.txt.
Thanks Josh Kupershmidt.

Backport of c487b1e230 from master
2014-04-10 19:33:50 -04:00
Tim Graham
efb0c848ac [1.5.x] Updated six to 1.6.1.
Backport of 2ec82c7387db071278201796208808de84c90dbf from master
2014-03-24 07:34:37 -04:00
Claude Paroz
468d06077a [1.5.x] Clarified strip_tags documentation
The fact that strip_tags cannot guarantee to really strip all
non-safe HTML content was not clear enough. Also see:
https://www.djangoproject.com/weblog/2014/mar/22/strip-tags-advisory/

Partial backport (doc-only) of 6ca6c36f82 from master.
2014-03-22 11:14:15 +01:00
Dejan Noveski
b86ff4ee82 [1.5.x] Fixed -- Added the correct line in the last example of Translator lines
Backport of 958b511a80c01ac010561c8fefe4548203700fa3 from master.
2014-03-13 14:15:48 +01:00
Tim Graham
c888bee836 [1.5.x] Fixed -- Corrected static files config for Apache >= 2.4
Backport of ffa238c3f7 from master
2014-02-18 09:32:44 -05:00
Ian Foote
4e115af105 [1.5.x] Fix typo CRSF -> CSRF
Backport of af64f829d7 from master
2014-01-29 12:08:55 -05:00
Tim Graham
b55d0ebff2 [1.5.x] Added release note stubs for 1.5.6 and 1.4.11.
Backport of dfa28981ce from master
2014-01-26 17:49:04 -05:00
Tim Graham
682420d108 [1.5.x] Fixed -- Upgraded six to 1.5.2
Backport of 780ae7e9f8 from master.
2014-01-26 15:48:32 -05:00
Tim Graham
60054e6e31 [1.5.x] Fixed -- Fixed docs building with Sphinx 1.2.1.
Thanks tragiclifestories for the report.

Backport of e1d18b9d2e from master
2014-01-24 09:05:55 -05:00
James Turley
c539a4490f [1.5.x] Fixed -- Added reference to LTS in docs/internals/security.txt
Backport of 4d8209431d from master
2014-01-24 08:14:46 -05:00
Tim Graham
169bee85ea [1.5.x] Fixed some punctuation; thanks Chris Jerdonek.
Backport of 81830ce34f from master
2014-01-23 09:05:14 -05:00
Baptiste Mispelon
7517768134 [1.5.x] Always use parentheses when documenting a method with no arguments.
Backport of 05d36dc06e6d767bb28993c65a54b703f319a386 from master.
2014-01-22 23:28:07 +01:00
Baptiste Mispelon
126af8fa7b [1.5.x] Don't show self in the list of arguments of a method.
This is consistent with Python's official documentation
and it's a sphinx recommendation too[1].

[1] http://sphinx-doc.org/markup/desc.html#dir-method

Refs .

Backport of 79e1d6ebd70898d514a44b85648e3d24104c4243 from master.
2014-01-22 23:26:05 +01:00
Tim Graham
ebed014950 [1.5.x] Fixed -- Clarified that password should not be included in REQUIRED_FIELDS.
Thanks russellm for the report.

Backport of 6f06c749b7 from master
2014-01-22 10:19:07 -05:00
Tim Graham
45535c8a4c [1.5.x] Fixed -- Clarifed usage of template_name in tutorial part 4.
Backport of a292ad1105 from stable/1.6.x
2014-01-20 20:08:59 -05:00
Baptiste Mispelon
0946aac61d [1.5.x] Fixed -- Fixed PublisherDetail in CBV topic documentation.
Thanks to tudor.prodan, susan, and Tim Graham for the report and reviews.

Backport of 88de53d4a86548016f245a1413b856aa334bc737 from master.
2014-01-20 23:08:03 +01:00
Jacob Kaplan-Moss
267aeabfc7 [1.5.x] Added a note about LTS releases.
Backport of a44cbca2a5f1388c6511dad48443877fa660845a from master.
2014-01-19 18:46:18 +01:00
Tim Graham
f746d1fc74 [1.5.x] Fixed -- Discouraged use of Jython given the current state of django-jython.
Thanks Josh Juneau (maintainer of django-jython) for the review.

Backport of a67e327db5 from master
2014-01-17 09:29:19 -05:00
Tim Graham
b83dae688e [1.5.x] Fixed -- Corrected TemplateView context section.
Thanks nedbatchelder for the report and claudep for the patch.

Backport of c05b2f58e7 from master
2014-01-16 07:59:18 -05:00
Kevin Wood
a32680407b [1.5.x] Fixed typo in storage docs
Backport of 82f466b571 from master
2014-01-15 18:45:06 -05:00
Tim Graham
1ccfcbe13e [1.5.x] Fixed a sentence in the session security docs; thanks claudep.
Backport of 4d27d311f6 from master
2014-01-03 12:04:23 -05:00
Frank Tobia
ca4cd3fd10 [1.5.x] Fixed typos. Changed grammar.
Backport of 6dd8631617 from master
2014-01-02 16:28:10 -05:00
Nathan Smith
4d05e672bf [1.5.x] Fixed minor typos.
Backport of 44d40ba521 from master
2014-01-02 16:22:26 -05:00
Tim Graham
bbcdfb4d69 [1.5.x] Fixed version number in docs/conf.py
Since there are no more alpha/beta/rcs for 1.5
we can set release=version.
2014-01-01 11:54:04 -05:00
Tim Graham
f20da28297 [1.5.x] Fixed -- Added some headings to separate unrelated topics.
Thanks ashley at ashleymills.com for the suggestion.

Backport of 270f7e2167 from master
2013-12-30 17:57:47 -05:00
Tim Graham
3cf9ba5fa3 [1.5.x] Fixed -- Documented User.get_short_name()
Thanks Keryn Knight for the report.

Backport of 0150830687 from master
2013-12-30 17:46:56 -05:00
Tim Graham
66ada281d5 [1.5.x] Fixed -- Corrected URL namespace example.
Thanks oubiga for the report.

Backport of 025ec2e7fe from master
2013-12-26 20:06:33 -05:00
Tim Graham
fc2c8ee4c8 [1.5.x] Fixed -- Added missing WSGIPythonPath in mod_wsgi config.
Thanks carrie.hazelton at altamiracorp.com for the report.

Backport of e82e7ae1e8 from master
2013-12-25 06:11:25 -05:00
Tim Graham
6980059af2 [1.5.x] Fixed -- Removed a hardcoded input id from the tutorial.
Thanks Bruno Brouard for the report.

Backport of cc2d960274 from master
2013-12-18 18:37:14 -05:00
Kevin Christopher Henry
6833773775 [1.5.x] Fixed -- Docs: Removed example with callable as query parameter
Using callables as query parameters is undocumented and not working,
so this changes an example from the ForeignKey.limit_choices_to
documentation that uses it.

Backport of d34c8c338a from master
2013-12-18 12:38:00 -05:00
Alasdair Nicol
e4174da34a [1.5.x] Fixed -- Added example of modelformset_factory's form argument
Backport of 1fa681ee11 from master
2013-12-14 16:36:27 -05:00
Ben Spaulding
a53820b1b1 [1.5.x] Fixed -- Added note about model formsets deleting objects.
This behavior has been fixed in 65e03a424e. refs .

Backport of de1d5d5df5 from stable/1.6.x.
2013-12-11 14:43:44 -05:00
Aymeric Augustin
deeed42253 [1.5.x] Fixed -- Support building CHM files.
Thanks Michał Pasternak.

Backport of cd9e85ec from master.
2013-12-04 16:52:04 +01:00
Alasdair Nicol
86c5115cad [1.5.x] Fixed -- Added numpy to test/requirements/base.txt
Thanks Tim Graham for the report

Backport of c75dd664c from master
2013-12-02 13:41:18 -05:00
Baptiste Mispelon
0e98050847 [1.5.x] Fixed -- Corrected example of template.Context in documentation.
Thanks to trac user oubiga for the report.

Backport of 077af42139db84d88f293ab5eadc989a9169dce1 from master.
2013-11-28 01:00:32 +01:00
Ludwik Trammer
e19506d14e [1.5.x] Fixed -- Corrected default widget information for FileField
Backport of 70e61310d6 from master
2013-11-25 08:27:35 -05:00
Tim Graham
c0c7795562 [1.5.x] Fixed typo in previous commit; refs .
Backport of 03bc0a8ac5 from master
2013-11-24 16:29:14 -05:00
Tim Graham
0934894976 [1.5.x] Fixed -- Fixed custom admin URL reverse example.
Thanks glarrain for the report.

Backport of bfe7377adb from master
2013-11-24 15:19:39 -05:00
Aymeric Augustin
01fed9c258 Removed obsolete deprecation notes. 2013-11-23 14:47:41 +01:00
Baptiste Mispelon
0bb05f6b92 [1.5.x] Fix : Removed links to modwsgi.org.
Backport of 957fcd0c9fc605bbb69e03296aede3b0bac5a8d2 from master.
2013-11-22 09:15:37 +01:00
Baptiste Mispelon
ed8814b24a Fixed -- Removed a ModelForm bit that doesn't apply to 1.5.x.
The bit was incorrectly backported with 3860d5e8f814e26baf4deee9258392cd34a4b456.

Thanks to trac user direx for the report and to Loic Bistuer
for his help.
2013-11-20 10:52:49 +01:00
Dražen Lučanin
2fb6dbe81d [1.5.x] Recommended setuptools in the reuseable app tutorial.
setuptools has merged with distribute.

Backport of b5eef8535a from master.
2013-11-19 16:24:42 -05:00