Anssi Kääriäinen 049eebc070 Merge branch 'master' into lookups_3 ...

Conflicts:
	django/db/models/fields/__init__.py
	django/db/models/sql/compiler.py
	django/db/models/sql/query.py
	tests/null_queries/tests.py

2013-12-21 22:53:10 +02:00

..

class-based-views

Fixed the base class note in the Date Views docs.

2013-11-19 10:23:59 -05:00

contrib

Fixed #21386 -- Removed admindocs dependence on sites framework

2013-12-18 19:44:04 +01:00

files

Fixed #21380 -- Added a way to set different permission for static directories.

2013-11-29 08:01:30 -05:00

forms

Fixed #17413 -- Serialization of form errors along with all metadata.

2013-12-16 16:33:28 -05:00

models

Merge branch 'master' into lookups_3

2013-12-21 22:53:10 +02:00

templates

Added some internal links to render_to_string documentation.

2013-12-15 23:02:20 +01:00

clickjacking.txt

Removed gender-based pronouns per [c0a2daad78].

2013-11-30 08:37:15 -05:00

databases.txt

Fixed #21585 -- Updated some links to 3rd party database projects.

2013-12-18 18:48:21 -05:00

django-admin.txt

Fixed #13476 -- Added support for color in console output under Windows.

2013-12-02 23:18:04 -03:00

exceptions.txt

Fixed #21044 -- Documented django.core.urlresolvers.Resolver404

2013-09-05 08:45:33 -04:00

index.txt

Fixed #19897 - Updated static files howto.

2013-03-29 19:15:19 -04:00

middleware.txt

Fixed #19277 -- Added LocaleMiddleware.response_redirect_class

2013-10-03 16:15:29 -04:00

request-response.txt

Changed documentation of HttpResponse.content to indicate it's a bytestring

2013-12-13 11:42:14 +01:00

settings.txt

Fixed #21386 -- Removed admindocs dependence on sites framework

2013-12-18 19:44:04 +01:00

signals.txt

Fixed #21391 -- Allow model signals to lazily reference their senders.

2013-11-24 17:51:22 -05:00

template-response.txt

Fixed #21154 -- Updated TemplateResponse docs to better explain context.

2013-09-30 10:19:56 -04:00

unicode.txt

Removed versionadded/changed annotations for 1.5

2013-08-19 09:09:41 -04:00

urlresolvers.txt

Fixed #21044 -- Documented django.core.urlresolvers.Resolver404

2013-09-05 08:45:33 -04:00

urls.txt

A few doc additions for changes from d228c1192e.

2013-09-22 13:46:16 -03:00

utils.txt

Added missing parameter in npgettext_lazy docs

2013-11-08 23:20:50 +01:00

validators.txt

Fixed #4833 -- Validate email addresses with localhost as domain

2013-01-11 20:45:46 +01:00

views.txt

Fixed #20330 -- Normalized spelling of "web server".

2013-04-29 19:40:43 +02:00