p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,876 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

13876 Commits

Author SHA1 Message Date
jktravis b91e138405 Fixed #20670 -- Fixed project layout in reusable apps tutorial. 
Backport of 70d3adf9f2 from master.
Thanks to nicklasp for the report.
 2013-06-28 09:50:59 +02:00
Trey Hunner 058ad52b3d [1.5.x] Added missing preposition in documentation 
Backport of 2ec54e7fbc from master
 2013-06-27 18:03:39 -04:00
Ken Bolton ceff19805e [1.5.x] Fixed typo in docs/ref/signals.txt 
Backport of 6fcb7ba842 from master
 2013-06-27 17:53:54 -04:00
Baptiste Mispelon 20295f2788 [1.5.x] Fixed #20665 -- Missing backslash in sitemaps documentation 
Backport of 5005303ae7 from master.
 2013-06-27 09:44:17 +02:00
Daniel Izquierdo 030ef4d1af [1.5.x] Fixed #20654 -- Fixed type of `m2m_changed`'s `pk_set` arg in docs 
Backport of 9a2b07f1b4 from master
 2013-06-25 07:52:15 -04:00
Aymeric Augustin 02619227a9 [1.5.x] Fixed #20636 -- Stopped stuffing values in the settings. 
In Django < 1.6, override_settings restores the settings module that was
active when the override_settings call was executed, not when it was
run. This can make a difference when override_settings is applied to a
class, since it's executed when the module is imported, not when the
test case is run.

In addition, if the settings module for tests is stored alongside the
tests themselves, importing the settings module can trigger an import
of the tests. Since the settings module isn't fully imported yet,
class-level override_settings statements may store a reference to an
incorrect settings module. Eventually this will result in a crash during
test teardown because the settings module restored by override_settings
won't the one that was active during test setup.

While Django should prevent this situation in the future by failing
loudly in such dubious import sequences, that change won't be backported
to 1.5 and 1.4. However, these versions received the "allowed hosts"
patch and they're prone to "AttributeError: 'Settings' object has no
attribute '_original_allowed_hosts'". To mitigate this regression, this
commits stuffs _original_allowed_hosts on a random module instead of the
settings module.

This problem shouldn't occur in Django 1.6, see #20290, but this patch
will be forward-ported for extra safety.

Also tweaked backup variable names for consistency.
 2013-06-24 20:40:19 +02:00
Tim Graham 7e6c0387b3 [1.5.x] Clarified get_list_or_404 docs, refs #14150. 
Backport of e161e4ff11 from master
 2013-06-24 07:03:29 -04:00
Simon Meers 11a8a7f266 [1.5.x] Corrected minor typos in FileUploadHandler.receive_data_chunk docs. 
Backport of 6466a08 from master.
 2013-06-24 14:11:08 +10:00
Baptiste Mispelon 4821a99ca4 [1.5.x] Fixed errors and inconsistencies in CBV topic documentation. 
Backport of bd9fbd1497 from master.
 2013-06-23 00:29:59 +02:00
Tim Graham 519fdacf51 Fixed #20634 - Corrected doc mistake re: staticfiles finders strategy. 
Thanks claudep for the catch and bmispelon for the research.

Backport of 9be93aa809 from master.
 2013-06-21 15:00:06 -04:00
James Bennett 9b0604e514 [1.5.x] Fixed #19881 -- Documented that get_next/previous_by_FOO uses default manager. 
Backport of ba610cb319 from master
 2013-06-21 13:16:51 -04:00
Baptiste Mispelon ee8996d8a6 [1.5.x] Fixed #20612 -- Fixed incorrect wording in CBV documentation 
Thanks to ndokos for the report.

Backport of b53ed5ac55 from master.
 2013-06-21 17:53:10 +02:00
Tim Graham 843802ec26 [1.5.x] Fixed #19319 -- Updated example httpd.conf for Apache 2.4 
Thanks colinnkeenan@ for the report.

Backport of 7314007c5b from master
 2013-06-20 13:35:59 -04:00
Tim Graham b5f8339211 [1.5.x] Fixed error in last commit. Thanks Simon Charette. 
Backport of 6ef199a08e from master
 2013-06-20 10:43:41 -04:00
Harm Geerts 891d003353 [1.5.x] Modified tutorial 3 to use RequestContext in place of Context. 
Backport of df4a74d709 from master
 2013-06-20 10:01:13 -04:00
Baptiste Mispelon f171ed6b68 Fixed broken reference in documentation. 2013-06-19 10:39:01 +02:00
Aymeric Augustin 9d86550a70 [1.5.x] Fixed #20615 -- Added trove classifiers for major Python versions. 
Backport of efe6e160.
 2013-06-18 13:26:41 +02:00
Baptiste Darthenay a952044228 [1.5.x] Fixed #20614 -- Typo in documentation. 
Backport of 39b245fd76 from master
 2013-06-17 07:01:48 -04:00
Tim Graham e411e99312 [1.5.x] Fixed #20604 - Fixed file example in docs. 
Thanks Chris Lasher for the report.

Backport of a1122e14a6 from master
 2013-06-14 21:29:20 -04:00
Pablo Sanfilippo e65f0c2559 [1.5.x] Fixed an erroneous import in example code. 
Backport of bd68f701b from master. Fixes #20595.
 2013-06-14 09:33:20 +02:00
Jaap Roes 60353458ae [1.5.x] Warned that `request_finished` isn't sent by some buggy setups. 
Older versions of uWSGI and Sentry's middleware do not adhere to
the WSGI spec and cause the `request_finished` signal to never
fire. Added notes to the appropriate places in the docs.

Fixed #20537.

Backport of 3ce1d30.

Conflicts:
	docs/howto/deployment/wsgi/index.txt
 2013-06-12 20:57:21 +02:00
Tim Graham b75f1f3d27 [1.5.x] Fixed #20500 - Updated flatpages URLconf example to work with APPEND_SLASH. 
Thanks josh.23.french@.

Backport of 536703abf0 from master
 2013-06-11 12:27:09 -04:00
Tim Graham cd1aec65cc [1.5.x] Fixed #20578 - Typo in BaseFormSet module name 
Backport of 9ff5f100dd from master
 2013-06-10 14:37:38 -04:00
Tim Graham 46dacb5bb1 [1.5.x] Fixed #19875 - Added warnings regarding DEBUG=False and empty ALLOWED_HOSTS 
Backport of 4e94c84e50 from master
 2013-06-09 15:06:23 -04:00
Tim Graham 3bd9852401 [1.5.x] Fixed #20567 - Documented BoundField.id_for_label. 
Thanks littlepig for the suggestion.

Backport of 175a102ddc from master.
 2013-06-09 12:16:56 -04:00
Claude Paroz 44a0abd792 [1.5.x] Allow build of translated documentation 
Backport of 6a092f24e from master.
 2013-06-08 16:14:45 +02:00
Tim Graham 023710211f [1.5.x] Fixed #20545 - Made class-based view MRO lists consistent. 
Thanks wim@ for the suggestion.

Backport of c36b75c814 from master
 2013-06-03 10:14:29 -04:00
Tim Graham 56192d21d5 [1.5.x] Fixed #20543 - Typo in db model fields docs. 
Thanks i.amber.jain@ for the report.

Backport of f315693304 from master
 2013-06-01 05:50:09 -04:00
Tim Graham f7fefb361d [1.5.x] Fixed #20166 - Corrected TEST_DEPENDENCIES example in testing docs. 
Thanks czambran.

Backport of f10e9af227 from master
 2013-05-31 08:20:10 -04:00
Tim Graham 1c5cccedb4 [1.5.x] Fixed #20326 - Corrected form wizard get_form() example. 
Thanks tris@ for the report.

Backport of 646a2216e9 from master
 2013-05-31 08:08:42 -04:00
Gavin Wahl e873de0a5a [1.5.x] Fixed regroup example. 
Chicago was missing.

Backport of e6ff238 from master.
 2013-05-29 21:50:52 -04:00
Tim Graham 1ce5672753 [1.5.x] Fixed #20525 -- Added versionadded for clearsessions. 
Thanks wiml@.

Backport of 8a6e040bfa from master
 2013-05-28 20:15:09 -04:00
Tim Graham 17d60438e9 [1.5.X] Fixed #20523 - Incorrect form field for FilePathField. 
Thanks sane4ka.sh@ for the report.

Backport of 1fdc3d256d from master
 2013-05-28 11:59:41 -04:00
Tim Graham 2e026739dc [1.5.X] Fixed #20513 - Expanded docs on QuerySet caching. 
Thanks seddonym.

Backport of 8365d76da0 from master
 2013-05-28 08:43:05 -04:00
Aymeric Augustin 8f2eaab0e5 [1.5.x] Fixed URL for six inventory. 
Backport of 749c2e4 from master.
 2013-05-27 11:16:27 +02:00
Andrew Godwin fd48d2d438 [1.5.x] Rotate CSRF token on login 
Backport of 1514f17aa6 from master
 2013-05-24 22:20:44 +01:00
Tim Graham 82fc3ce41d [1.5.x] Fixed #20492 - Removed a broken link in GIS docs. 
Backport of fbab3209fc from master
 2013-05-24 12:36:12 -04:00
Alasdair Nicol d6025d790f [1.5.x] Updated link to jQuery Cookie plugin site 
Backport of 81f454a322 from master
 2013-05-24 12:25:48 -04:00
Tim Graham cd15a51c3e [1.5.x] Fixed #20316 - Clarified transaction behavior of TestCase. 
Thanks uberj@ for the report and lolek09 for the patch.

Backport of dffdca1109 from master
 2013-05-23 11:12:33 -04:00
Tim Graham 9ed2121eca [1.5.x] Fixed #20417 - Noted that a server restart is required to load new templatetag modules. 
Thanks Katya for the suggestion.

Backport of a46a399534 from master
 2013-05-23 08:54:24 -04:00
Tim Graham 7df9c2bc7d [1.5.x] Fixed #20482 - Added a file reference in tutorial 3. 
Thanks diek@ for the suggestion.

Backport of 9e65bd33db from master
 2013-05-23 08:37:56 -04:00
Ramiro Morales a6ff705aea [1.5.x] Tweaked a reST construct in template API docs. Refs #20104. 2013-05-22 18:09:22 -03:00
Tim Graham 239b89950c [1.5.x] Added some text I meant to add in the last commit. 
Backport of 2699219c23 from master
 2013-05-22 10:26:39 -04:00
Tim Graham 194eaceca7 [1.5.x] Added a note about pip upgrade flag. 
Thanks Jannis Leidel for the suggestion.

Backport of 0e45f75112 from master
 2013-05-22 09:43:01 -04:00
Tim Graham 1add64684c [1.5.x] Fixed #17048 - Added docs for upgrading Django. 
Thanks Donald Stufft for the suggestion and
Susan Tan and Brian Fabian Crain for the patch.

Backport of ef8a9bc7fa from master.
 2013-05-22 08:57:57 -04:00
Aymeric Augustin 3f7ecb512e [1.5.x] Fixed #20476 -- Typo. 
Backport of 5d16456.
 2013-05-21 21:29:28 +02:00
Claude Paroz fa90ef250f [1.5.x] Imported copyreg from six.moves 2013-05-21 10:21:52 -07:00
Daniel Lindsley cb9aaac91f [1.5.x] Fixed #20212 - __reduce__ should only be defined for Py3+. 2013-05-21 10:17:27 -07:00
Anssi Kääriäinen bac187c0d8 [1.5.x] Fixed prefetch_related + pickle regressions 
There were a couple of regressions related to field pickling. The
regressions were introduced by QuerySet._known_related_objects caching.

The regressions aren't present in master, the fix was likely in
f403653cf1.

Fixed #20157, fixed #20257. Also made QuerySets with model=None
picklable.
 2013-05-21 11:45:24 +03:00
Tim Graham 63cab03f6d [1.5.x] Tweaked unit test 'quick start' explanation. 
Thanks Jeremy Dunck.

Backport of 490672f057 from master
 2013-05-20 13:49:11 -04:00