From c1903848f29d49d4ed4c757c0a04781f368b1004 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Fri, 4 Jan 2013 11:49:43 +0100 Subject: [PATCH 1/9] Update openslides/__init__.py --- openslides/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides/__init__.py b/openslides/__init__.py index 7cd9d7464..dcf78b46d 100644 --- a/openslides/__init__.py +++ b/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 From d842214e261f5b9d24c0cbc3bcb0f660140202cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Fri, 4 Jan 2013 19:14:56 +0100 Subject: [PATCH 2/9] Fix typo in template. --- openslides/motion/templates/motion/view.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openslides/motion/templates/motion/view.html b/openslides/motion/templates/motion/view.html index 3d2ad91b1..18d61fa3d 100644 --- a/openslides/motion/templates/motion/view.html +++ b/openslides/motion/templates/motion/view.html @@ -180,13 +180,13 @@ {% trans 'Adjourned' %}
{% endif %} {% if "noc" in actions %} - {% trans 'Not Concerned' %}
+ {% trans 'Not Concerned' %}
{% endif %} {% if "com" in actions %} - {% trans 'Commited a bill' %}
+ {% trans 'Commited a bill' %}
{% endif %} {% if "wit" in actions %} - {% trans 'Withdrawed by submitter' %} + {% trans 'Withdrawed by submitter' %} {% endif %} {% endif %}

From 2fcf0b3a07a14c5fbbcf416ad869ae2709cb2f5d Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Sat, 5 Jan 2013 14:46:05 +0100 Subject: [PATCH 3/9] fixed typo in utils/views.py --- openslides/utils/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides/utils/views.py b/openslides/utils/views.py index 33bdafc32..0b3679f3a 100644 --- a/openslides/utils/views.py +++ b/openslides/utils/views.py @@ -256,7 +256,7 @@ class CreateView(PermissionMixin, _CreateView): return context def get_apply_url(self): - if self apply_url: + if self.apply_url: return self.apply_url else: raise ImproperlyConfigured( From 6417f5f10718a8f4d68963c72bca7f1f0e7905e1 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Sat, 5 Jan 2013 14:56:22 +0100 Subject: [PATCH 4/9] fixed pep8 error --- openslides/utils/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openslides/utils/views.py b/openslides/utils/views.py index 0b3679f3a..603786370 100644 --- a/openslides/utils/views.py +++ b/openslides/utils/views.py @@ -262,7 +262,6 @@ class CreateView(PermissionMixin, _CreateView): raise ImproperlyConfigured( "No URL to redirect to. Provide a apply_url.") - def form_invalid(self, form): messages.error(self.request, _('Please check the form for errors.')) return super(CreateView, self).form_invalid(form) From deb0d5b2e51426df43a463f284590b8060ea1c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Sat, 5 Jan 2013 23:20:38 +0100 Subject: [PATCH 5/9] Some fixes. Update requirements.txt and setup.py. --- .travis.yml | 2 +- INSTALL.txt | 6 +++++- openslides/utils/views.py | 2 +- requirements.txt | 6 +++--- setup.py | 5 +---- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index ade84bd88..3f9a362aa 100644 --- a/.travis.yml +++ b/.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: diff --git a/INSTALL.txt b/INSTALL.txt index 739431350..4f3c5e6a0 100644 --- a/INSTALL.txt +++ b/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): diff --git a/openslides/utils/views.py b/openslides/utils/views.py index 603786370..88e199c07 100644 --- a/openslides/utils/views.py +++ b/openslides/utils/views.py @@ -260,7 +260,7 @@ class CreateView(PermissionMixin, _CreateView): return self.apply_url else: raise ImproperlyConfigured( - "No URL to redirect to. Provide a apply_url.") + 'No URL to redirect to. Please provide an apply_url.') def form_invalid(self, form): messages.error(self.request, _('Please check the form for errors.')) diff --git a/requirements.txt b/requirements.txt index 8602f17e8..bb138df37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -Django==1.5b2 +Django==1.5 django-mptt==0.5.5 reportlab==2.6 PIL==1.1.7 -coverage==3.6b1 +coverage==3.6b3 django-discover-runner==0.2.2 -pep8==1.3.3 +pep8==1.4 diff --git a/setup.py b/setup.py index c283ec9aa..c6b32c729 100644 --- a/setup.py +++ b/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', From d5cbf80bf54b990abc262b4ed65fd6a913f19d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Sun, 6 Jan 2013 00:33:03 +0100 Subject: [PATCH 6/9] Set to Django 1.5c1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bb138df37..8e6d80b8f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==1.5 +Django==1.5c1 django-mptt==0.5.5 reportlab==2.6 PIL==1.1.7 From a52368d296617d7893ec6d06c3165a5c59db18f4 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 9 Jan 2013 21:40:54 +0100 Subject: [PATCH 7/9] Set next release to 1.4. Added 1.3.1 CHANGELOG from stable/1.3.x branch --- CHANGELOG | 12 ++++++++++++ README.txt | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 2f86821bf..bf0daaa0e 100644 --- a/CHANGELOG +++ b/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] diff --git a/README.txt b/README.txt index 0485a2203..cdbe0880b 100644 --- a/README.txt +++ b/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? From 595eac2c11aea0e6562b1139660fc972d1be6933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Thu, 17 Jan 2013 22:33:52 +0100 Subject: [PATCH 8/9] Update requirements: set version of coverage to 3.6 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8e6d80b8f..d020ab86f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,6 +2,6 @@ Django==1.5c1 django-mptt==0.5.5 reportlab==2.6 PIL==1.1.7 -coverage==3.6b3 +coverage==3.6 django-discover-runner==0.2.2 pep8==1.4 From 22e8457894afc791673aaa80fd3cca31988c19fd Mon Sep 17 00:00:00 2001 From: Andy Kittner Date: Tue, 22 Jan 2013 20:36:04 +0100 Subject: [PATCH 9/9] Add an option to suppress starting of web browser (closes #436) --- openslides/main.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/openslides/main.py b/openslides/main.py index d25305a4d..b94eebfda 100755 --- a/openslides/main.py +++ b/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):