diff --git a/INSTALL.txt b/INSTALL.txt
index 076e088c0..f57e7f00e 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -87,21 +87,21 @@ II. Installation on GNU/Linux and MacOSX using the sources
$ sudo apt-get install git
$ git clone git://github.com/OpenSlides/OpenSlides.git OpenSlides
- 3. Setup a virtual environment with virtualenv:
+ 3. Setup a virtual environment with virtualenv (optional):
- Go to the (extracted/cloned) root directory of OpenSlides
- and create virtualenv environment:
+ You can setup a virtual environment to install OpenSlides as
+ non-root user.
+
+ E. g. for Ubuntu run:
+ $ sudo apt-get install python-virtualenv
+
+ To setup and activate the virtual environment go to the
+ (extracted/cloned) root directory of OpenSlides and run:
$ virtualenv .venv
-
- For virtualenv >= 1.7 use instead:
- $ virtualenv --system-site-packages .venv
-
- 4. Activate the virtual environment:
-
$ source .venv/bin/activate
- 5. Install the required python-packages:
+ 4. Install the required python-packages:
$ pip install django django-mptt
@@ -111,7 +111,7 @@ II. Installation on GNU/Linux and MacOSX using the sources
If requirements reportlab or PIL still missing (see 1.):
$ pip install reportlab pil
- 6. Start OpenSlides server and open URL in your default browser:
+ 5. Start OpenSlides server and open URL in your default browser:
$ python start.py
@@ -124,7 +124,7 @@ II. Installation on GNU/Linux and MacOSX using the sources
Use 'python start.py --help' to show all start options.
- 7. Restart OpenSlides:
+ 6. Restart OpenSlides:
To restart OpenSlides after closing the terminal activate the
virtual environment (see 4.) before starting the server (see 6.).
diff --git a/README.txt b/README.txt
index 6a3f12f91..28f0a358d 100644
--- a/README.txt
+++ b/README.txt
@@ -2,13 +2,13 @@
English README file for OpenSlides
==================================
-This is OpenSlides, version 1.3-rc1 (2012-11-27).
+This is OpenSlides, version 1.3 (2012-12-10).
What is OpenSlides?
===================
-OpenSlides is a free, web-based presentation system for displaying and
-controlling of agenda, applications and elections of an assembly.
+OpenSlides is a free web-based presentation and assembly system for
+displaying and controlling of agenda, motions and elections of an assembly.
See http://openslides.org for more information.
@@ -24,8 +24,9 @@ list or read the OpenSlides manual. See http://openslides.org.
The start script of OpenSlides
==============================
Simply running
- openslides.exe (on Windows) or
- python start.py (on Linux/MacOS)
+ openslides.exe (on Windows)
+or
+ openslides (on Linux/MacOS)
will start OpenSlides using djangos development server. It will also
try to open OpenSlides in your default webbrowser.
@@ -69,16 +70,14 @@ The following command line options are available:
--no-reload
Does not reload the development server
+--version
+ Show version and exit.
Example 1: Openslides should only be accessible on this computer:
- openslides.exe -a 127.0.0.1
- or
- python start.py -a 127.0.0.1
+ openslides -a 127.0.0.1
Example 2: Like above, but also specify the port as 8080
- openslides.exe -a 127.0.0.01 -p 8080
- or
- python start.py -a 127.0.0.1 -p 8080
+ openslides -a 127.0.0.01 -p 8080
Supported operating systems and browsers
diff --git a/openslides/__init__.py b/openslides/__init__.py
index f32ad47e6..139bf67d1 100644
--- a/openslides/__init__.py
+++ b/openslides/__init__.py
@@ -6,7 +6,7 @@
"""
VERSION = (1, 3, 0, 'final', 0) # During development it is the next release
-RELEASE = False
+RELEASE = True
def get_version(version=None, release=None):
diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo
index 0fc4548cd..642564816 100644
Binary files a/openslides/locale/de/LC_MESSAGES/django.mo and b/openslides/locale/de/LC_MESSAGES/django.mo differ
diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index 231129b7c..09644ee43 100644
--- a/openslides/locale/de/LC_MESSAGES/django.po
+++ b/openslides/locale/de/LC_MESSAGES/django.po
@@ -738,7 +738,7 @@ msgstr[0] "Wahl"
msgstr[1] "Wahlen"
#: assignment/templates/assignment/overview.html:35
-#, fuzzy, python-format
+#, python-format
msgctxt "Number of searched candidates for an election"
msgid "posts: %(posts)s"
msgstr "Posten: %(posts)s"
@@ -1524,7 +1524,7 @@ msgid ""
"optional and may be empty"
msgstr ""
"Nummer, Begründung und Gruppenantrag "
-"sind optional und können auch leer sein."
+"sind optional und können auch leer sein"
#: motion/templates/motion/import.html:16
#: participant/templates/participant/import.html:14
diff --git a/openslides/static/images/icons/remove.png b/openslides/static/images/icons/remove.png
new file mode 100644
index 000000000..5a4d15b7b
Binary files /dev/null and b/openslides/static/images/icons/remove.png differ
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 1c55ebc61..6cbc8b5bf 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -394,6 +394,9 @@ input[type="submit"], input[type="button"] {
.button .adduser{
background:url(../images/icons/add-user.png) no-repeat 0px 0px;
}
+.button .remove{
+ background:url(../images/icons/remove.png) no-repeat 0px 0px;
+}
.button .removeuser{
background:url(../images/icons/remove-user.png) no-repeat 0px 0px;
}