Commit effc2cad authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Merge branch 'master' of github.com:django/django

parents 3727f6d0 5e94ef29
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@
    text-align: left;
}

.selector .selector-filter label {
.selector .selector-filter label,
.inline-group .aligned .selector .selector-filter label {
    width: 16px;
    padding: 2px;
}
+2 −0
Original line number Diff line number Diff line
from __future__ import unicode_literals

from django import forms
from django.forms.util import flatatt
from django.template import loader
+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ default options such as :djadminopt:`--verbosity` and :djadminopt:`--traceback`.

        class Command(BaseCommand):
            ...
            self.can_import_settings = True
            can_import_settings = True

            def handle(self, *args, **options):

+0 −11
Original line number Diff line number Diff line
@@ -838,17 +838,6 @@ your ``.profile`` to be able to run the package programs from the command-line::
__ http://www.kyngchaos.com/software/frameworks
__ http://www.kyngchaos.com/software/postgres

.. note::

    Use of these binaries requires Django 1.0.3 and above.  If you are
    using a previous version of Django (like 1.0.2), then you will have
    to add the following in your settings:

    .. code-block:: python

        GEOS_LIBRARY_PATH='/Library/Frameworks/GEOS.framework/GEOS'
        GDAL_LIBRARY_PATH='/Library/Frameworks/GDAL.framework/GDAL'

.. _psycopg2_kyngchaos:

psycopg2
+2 −1
Original line number Diff line number Diff line
@@ -888,7 +888,8 @@ through the template engine: the files whose extensions match the
with the ``--name`` option. The :class:`template context
<django.template.Context>` used is:

- Any option passed to the startapp command
- Any option passed to the startapp command (among the command's supported
  options)
- ``app_name`` -- the app name as passed to the command
- ``app_directory`` -- the full path of the newly created app

Loading