Merge branch 'master' of github.com:OpenSlides/OpenSlides into new_motion

Conflicts:
	openslides/motion/templates/motion/view.html
	openslides/utils/views.py

.travis.yml

@@ -3,7 +3,7 @@ python:
   - "2.6"
   - "2.7"
 install:
-  - easy_install https://www.djangoproject.com/download/1.5b2/tarball/
+  - easy_install https://www.djangoproject.com/download/1.5c1/tarball/
   - pip install -r requirements.txt --use-mirrors
   - python extras/scripts/create_local_settings.py
 script:

CHANGELOG

@@ -2,6 +2,18 @@ CHANGELOG of OpenSlides
 http://openslides.org
 
 
+Version 1.4 (unreleased)
+========================
+
+
+Version 1.3.1 (2013-01-09)
+==========================
+[http://dev.openslides.org/milestone/1.3.1]
+
+- Fixed unwanted automatical language switching on projector view if more than 
+  one browser languages send projector request to OpenSlides (#434)
+
+
 Version 1.3 (2012-12-10)
 ========================
 [http://dev.openslides.org/milestone/1.3]

INSTALL.txt

@@ -18,7 +18,11 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
   1. Check requirements:
 
         Make sure that you have installed Python Programming Language 2
-        (>= 2.6) on your system.
+        (>= 2.6) on your system. You will also need the Python
+        development headers.
+
+        E. g. for Ubuntu run:
+        $ sudo apt-get install python-dev
 
   2. Setup a virtual environment with virtualenv (optional):
 

README.txt

@@ -2,7 +2,7 @@
 English README file for OpenSlides
 ==================================
 
-This is OpenSlides, version 1.3.1 (unreleased).
+This is OpenSlides, version 1.4.0 (unreleased).
 
 
 What is OpenSlides?

openslides/__init__.py

@@ -5,7 +5,7 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-VERSION = (1, 4, 0, 'alpha', 0)  # During development it is the next release
+VERSION = (1, 4, 0, 'alpha', 1)  # During development it is the next release
 RELEASE = False
 
 

openslides/main.py

@@ -90,6 +90,10 @@ def process_options(argv=None):
     parser.add_option(
         "--no-reload", action="store_true",
         help="Do not reload the development server.")
+    parser.add_option(
+        "--no-browser",
+        action="store_false", dest="start_browser", default=True,
+        help="Do not automatically start web browser.")
     parser.add_option(
         "--version", action="store_true",
         help="Show version and exit.")
@@ -172,7 +176,11 @@ def _main(opts, database_path=None):
         extra_args = ['--noreload']
     else:
         extra_args = []
-    start_openslides(addr, port, start_browser_url=url, extra_args=extra_args)
+
+    if opts.start_browser:
+        start_browser(url)
+
+    start_openslides(addr, port, extra_args=extra_args)
 
 
 def create_settings(settings_path, database_path=None):

requirements.txt

@@ -1,7 +1,7 @@
-Django==1.5b2
+Django==1.5c1
 django-mptt==0.5.5
 reportlab==2.6
 PIL==1.1.7
-coverage==3.6b1
+coverage==3.6
 django-discover-runner==0.2.2
-pep8==1.3.3
+pep8==1.4

setup.py

@@ -7,9 +7,6 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-# for python 2.5 support
-from __future__ import with_statement
-
 from setuptools import setup
 from setuptools import find_packages
 from openslides import get_version
@@ -43,7 +40,7 @@ setup(
         'versiontools >= 1.6',
     ],
     install_requires=[
-        'django >= 1.4',
+        'django >= 1.5',
         'django-mptt',
         'reportlab',
         'pil',