diff --git a/INSTALL.txt b/INSTALL.txt
index 4f3c5e6a0..683740922 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,4 +1,4 @@
-Installation Instructions for OpenSlides 1.3
+Installation Instructions for OpenSlides 1.4
============================================
Content
@@ -45,9 +45,14 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
OpenSlides will install the following required python packages:
+ Django
+ django-mptt
- + ReportLab Toolkit
- + Python Imaging Library (PIL)
-
+ + pillow
+ + qrcode
+ + reportlab
+ + tornado
+ + bleach
+ + beautifulsoup4
+ + html5lib
+
4. Start OpenSlides server and open URL in your default browser:
$ openslides
@@ -65,17 +70,14 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
II. Installation on GNU/Linux and MacOSX using the sources
----------------------------------------------------------
- 1. Install requirements:
+ 1. Check requirements:
- OpenSlides requires following programs, which should be
- installed first:
- + Python Programming Language 2 (>= 2.6)
- + virtualenv (>= 1.4.1)
- + ReportLab Toolkit
- + Python Imaging Library (PIL)
+ Make sure that you have installed Python Programming Language 2
+ (>= 2.6) and virtualenv (>= 1.4.1) on your system. You will also
+ need the Python development headers.
E. g. for Ubuntu run:
- $ sudo apt-get install python python-virtualenv python-reportlab python-imaging
+ $ sudo apt-get install python-dev python-virtualenv
2. Get OpenSlides:
@@ -83,13 +85,14 @@ II. Installation on GNU/Linux and MacOSX using the sources
OR
- b) Clone development version from OpenSlides' github repository
- https://github.com/OpenSlides/OpenSlides. This requires Git,
- see http://git-scm.com/.
-
- E. g. for Ubuntu run:
- $ sudo apt-get install git
+ b) Clone current master version from OpenSlides' GitHub repository
+ https://github.com/OpenSlides/OpenSlides.
+
$ git clone git://github.com/OpenSlides/OpenSlides.git OpenSlides
+
+ This requires Git (see http://git-scm.com/).
+ To install Git e.g. on Ubuntu run:
+ $ sudo apt-get install git
3. Setup a virtual environment with virtualenv (optional):
@@ -105,22 +108,16 @@ II. Installation on GNU/Linux and MacOSX using the sources
$ virtualenv .venv
$ source .venv/bin/activate
- 4. Install the required python-packages:
+ 4. Install all required python packages:
- $ pip install django django-mptt
-
- If you use python < 2.6 you also have to install simplejson:
- $ pip install simplejson
-
- If requirements reportlab or PIL still missing (see 1.):
- $ pip install reportlab pil
+ $ pip install -r requirements.txt
5. Start OpenSlides server and open URL in your default browser:
$ python start.py
If you run this script the first time a new database and the
- admin account are created. Please change the password after
+ admin account will be created. Please change the password after
first login!
Username: admin
@@ -131,7 +128,10 @@ II. Installation on GNU/Linux and MacOSX using the sources
6. Restart OpenSlides:
To restart OpenSlides after closing the terminal activate the
- virtual environment (see 4.) before starting the server (see 6.).
+ virtual environment before starting the server:
+
+ $ source .venv/bin/activate
+ $ python start.py
III. Installation on Windows (32bit) using the Python Package Index (PyPI)
diff --git a/README.txt b/README.txt
index cdbe0880b..70b3de691 100644
--- a/README.txt
+++ b/README.txt
@@ -2,7 +2,7 @@
English README file for OpenSlides
==================================
-This is OpenSlides, version 1.4.0 (unreleased).
+This is OpenSlides, version 1.4-alpha1 (2013-04-24).
What is OpenSlides?
@@ -70,6 +70,9 @@ The following command line options are available:
--no-reload
Does not reload the development server
+--no-browser
+ Do not automatically start web browser.
+
--version
Show version and exit.
diff --git a/THANKS b/THANKS
index 8472b5382..39e40f0d8 100644
--- a/THANKS
+++ b/THANKS
@@ -16,6 +16,9 @@ OpenSlides uses parts of the following projects:
with css theme 'smoothness'
and some addons: slider access, timepicker
+* nestedSortable jQuery Plugin
+
+
* Twitter Bootstrap
@@ -24,6 +27,3 @@ OpenSlides uses parts of the following projects:
* Ubuntu TrueType Font
-
-* nestedSortable jQuery Plugin
-