From 3d14cd1d4ae796eb4802c7f802a185609a48f814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Thu, 19 Jul 2012 23:38:08 +0200 Subject: [PATCH 01/15] Update INSTALL: write 'source' instead of '.' (#313) --- INSTALL | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/INSTALL b/INSTALL index 516f99eef..d27c338ed 100644 --- a/INSTALL +++ b/INSTALL @@ -16,9 +16,14 @@ I. Installation on Windows (32/64bit) 1. Install requirements: OpenSlides requires following programs, which should be - installed first: Python Programming Language 2.7, - Setuptools, ReportLab Toolkit, Python Imaging Library (PIL), - Django and django-mptt: + installed first: + + Python Programming Language 2 (>= 2.5), + + Setuptools + + ReportLab Toolkit + + Python Imaging Library (PIL) + + Django + + django-mptt + a) Download and run 32bit MSI installer from http://www.python.org/: @@ -80,9 +85,9 @@ II. Installation on GNU/Linux and MacOSX OpenSlides requires following programs, which should be installed first: - + Python Programming Language 2 (>= 2.5), - + virtualenv (>= 1.4.1), - + ReportLab Toolkit and + + Python Programming Language 2 (>= 2.5) + + virtualenv (>= 1.4.1) + + ReportLab Toolkit + Python Imaging Library (PIL) E.g. for ubuntu run: @@ -114,7 +119,7 @@ II. Installation on GNU/Linux and MacOSX 4. Activate the virtual environment: - $ . .venv/bin/activate + $ source .venv/bin/activate 5. Install the required python-packages: @@ -143,4 +148,3 @@ II. Installation on GNU/Linux and MacOSX To restart OpenSlides after closing the terminal activate the virtual environment (see 4.) before starting the server (see 6.). - From ba783489f299f931ef5daf5279bdfbc067ff3a85 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Fri, 20 Jul 2012 10:55:07 +0200 Subject: [PATCH 02/15] changle end of line to windows for some files --- AUTHORS | 14 +- CHANGELOG | 114 +++--- LICENSE | 678 +++++++++++++++++------------------ THANKS | 50 +-- extras/benchmark/README.txt | 50 +-- openslides/locale/README.txt | 50 +-- 6 files changed, 478 insertions(+), 478 deletions(-) diff --git a/AUTHORS b/AUTHORS index cad9a3ba3..72ee9b2ef 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,7 +1,7 @@ -Authors of OpenSlides in chronological order of first contribution: - - Emanuel Schütze - Oskar Hahn - Norman Jäckel - René Köcher - Andy Kittner +Authors of OpenSlides in chronological order of first contribution: + + Emanuel Schütze + Oskar Hahn + Norman Jäckel + René Köcher + Andy Kittner diff --git a/CHANGELOG b/CHANGELOG index dbc880bf5..d970a836e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,57 +1,57 @@ -CHANGELOG of OpenSlides -http://openslides.org - - -Version 1.2 (unreleased) -[http://dev.openslides.org/milestone/1.2] - - -Version 1.1 (2011-11-15) -[http://dev.openslides.org/milestone/1.1] - -Agenda: -- [Feature] Agenda overview: New item-done-column for all non-manager (#7) -- [Feature] Allow HTML-Tags in agenda item of text (#12) -- [Feature] Split up hidden agenda items in new agenda table section (#13) -Projector: -- [Feature] Assignment projector view layout improvements (#9) -- [Bugfix] Zoom problem for sidebar div in beamer view (#5) -- [Bugfix] Blue 'candidate elected line' not visible in projector ajax view (#6) -- [Bugfix] Assignment projector view: Show results for elected candidates only (#11) -- [Bugfix] Missing beamer scaling (#2) -- [Bugfix] Assigment projector view: Removed empty character for no results cell. (#10) -Applications: -- [Feature] Import applications (#55) -- [Feature] Support trivial changes to an application (#56) -- [Bugfix] Order submitter and supporter form fields by full name (#53) -- [Bugfix] Application: Show profile instead of submitter username (#15) -- [Bugfix] "Application: Only check enough supports in status ""pub""" (#16) -Elections: -- [Feature] New button to show agenda item of selected application/assignment (#54) -- [Feature] Open add-user-url in new tab. (#32) -Applications/Elections: -- [Feature] Show voting results in percent (#48) -Participants: -- [Feature] Filter displayed permissions in group editor (#59) -- [Feature] Generate password after user creation automatically (#58) -- [Bugfix] Encoding error (#1) -- [Bugfix] List of participants (pdf) link not visible for users with see-particiants-permissions (#3) -- [Bugfix] Use user.profile.get_type_display() instead of user.profile.type (#4) -PDF: -- [Feature] Mark elected candidates in PDF (#31) -- [Feature] New config option to set title and preamble text for application and assignment pdf (#33) -- [Feature] New config option to set number of ballots in PDF (#26) -- [Bugfix] Assignment ballot pdf: Wrong line break in group name with brackets (#8) -- [Bugfix] Print available candidates in assignment pdf (#14) -- [Bugfix] "Show ""undocumented"" for result ""-2"" in application and assignment pdf" (#17) -Other: -- [Feature] Rights for anonymous (#45) -- [Feature] Show counter for limited speaking time (#52) -- [Feature] Reorderd config tab subpages (#61) -- [Localize] i18n German: Use gender-specific strings (#51) -- [Bugfix]