Merge pull request #1258 from normanjaeckel/Release_1.5b1
Release 1.6b1 (not 1.5b1)
This commit is contained in:
commit
7edeb5d3fc
@ -2,5 +2,5 @@ language: python
|
||||
python:
|
||||
- "2.6"
|
||||
- "2.7"
|
||||
install: "pip install -r requirements.txt"
|
||||
install: "pip install --allow-external argparse -r requirements.txt"
|
||||
script: "fab travis_ci"
|
||||
|
32
CHANGELOG
32
CHANGELOG
@ -8,39 +8,45 @@ Version 1.6 (unreleased)
|
||||
========================
|
||||
[https://github.com/OpenSlides/OpenSlides/issues?milestone=14]
|
||||
|
||||
Dashboard:
|
||||
- Added shortcuts for the countdown.
|
||||
Agenda:
|
||||
- New projector view with the current list of speakers.
|
||||
- Added CSV import.
|
||||
- Added automatic numbering of agenda items.
|
||||
- Fixed organizational item structuring.
|
||||
Motions:
|
||||
- New slide for vote results.
|
||||
Assignment:
|
||||
- Coupled assignment candidates with list of speakers.
|
||||
Dashboard:
|
||||
- Shortcuts for the countdown.
|
||||
- Created a poll description field for each assignment poll.
|
||||
- New slide for election results.
|
||||
Participants:
|
||||
- Disabled widgets by default.
|
||||
- Disabled dashboard widgets by default.
|
||||
- Added form field for multiple creation of new participants.
|
||||
Files:
|
||||
- Enabled update and delete view for uploader refering to his own files.
|
||||
Other:
|
||||
- Added global chatbox for managers.
|
||||
- New config option to set the 100 % base for polls (motions/elections).
|
||||
- Changed api for plugins. Used entry points to detect them automaticly. Load
|
||||
them automaticly from plugin directory of Windows portable version.
|
||||
- Added possibility to use custom templates and static files in user data path
|
||||
directory.
|
||||
- Changed widget api. Used new metaclass.
|
||||
- Changed api for plugins. Used entry points to detect them automaticly.
|
||||
- Changed api for main menu entries. Used new metaclass.
|
||||
- Inserted api for the personal info widget. Used new metaclass.
|
||||
- Renamed config api classes.
|
||||
- Regrouped config collections and pages.
|
||||
- Renamed some classes of the poll api.
|
||||
- Added api for absolute urls in models.
|
||||
- Inserted command line option to translate config strings during database setup.
|
||||
- Inserted api for the personal info widget.
|
||||
- Changed api for main menu entries.
|
||||
- Enhanced http error pages.
|
||||
- Fixed headings on custom slides without text.
|
||||
- Moved dashboard and select widgets view from projector to core app.
|
||||
- Created a poll description field for each assignment-poll.
|
||||
- Added possibility to use custom templates and static files in user data path
|
||||
directory.
|
||||
- Added global chatbox for managers.
|
||||
|
||||
Version 1.5.2 (unreleased)
|
||||
==========================
|
||||
- Renamed and cleaned up static direcories.
|
||||
- Used jsonfield as required package. Removed jsonfield code.
|
||||
- Added new package backports.ssl_match_hostname for portable build script.
|
||||
|
||||
|
||||
Version 1.5.1 (2014-03-31)
|
||||
|
10
README.rst
10
README.rst
@ -89,7 +89,7 @@ portable version you should observe the following install steps.*
|
||||
<http://www.python.org/ftp/python/2.7.6/python-2.7.6.msi>`_. Note
|
||||
that the 32-bit MSI installer is required even on a 64-bit Windows
|
||||
system. If you use the 64-bit MSI installer, step 3 of this
|
||||
instruction will fail unless you installed the packages reportlab
|
||||
instruction will fail unless you installed the package reportlab
|
||||
manually.
|
||||
|
||||
b. Add python directories to PATH (via Control Panel > System >
|
||||
@ -98,7 +98,7 @@ portable version you should observe the following install steps.*
|
||||
|
||||
c. Download and run (via double click) the last `install script
|
||||
ez_setup.py for Setuptools
|
||||
<https://pypi.python.org/pypi/setuptools/#windows>`_.
|
||||
<https://pypi.python.org/pypi/setuptools/#installation-instructions>`_.
|
||||
|
||||
2. Setup a virtual environment with Virtual Python Environment builder
|
||||
(optional)
|
||||
@ -246,6 +246,9 @@ VI. Used software
|
||||
|
||||
OpenSlides uses the following projects or parts of them:
|
||||
|
||||
* `backports.ssl_match_hostname <https://bitbucket.org/brandon/backports.ssl_match_hostname>`_,
|
||||
License: Python Software Foundation License
|
||||
|
||||
* `Beautiful Soup <http://www.crummy.com/software/BeautifulSoup/>`_,
|
||||
License: MIT
|
||||
|
||||
@ -274,6 +277,9 @@ OpenSlides uses the following projects or parts of them:
|
||||
|
||||
* `roman <https://pypi.python.org/pypi/roman>`_, License: Python 2.1.1
|
||||
|
||||
* `setuptools <https://pypi.python.org/pypi/setuptools>`_,
|
||||
License: Python Software Foundation License
|
||||
|
||||
* `sockjs-client <https://github.com/sockjs/sockjs-client>`_,
|
||||
License: MIT
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
VERSION = (1, 6, 0, 'alpha', 1) # During development it is the next release
|
||||
VERSION = (1, 6, 0, 'beta', 2) # During development it is the next release
|
||||
RELEASE = False
|
||||
|
||||
|
||||
|
@ -14,5 +14,4 @@ tornado>=3.1,<3.3
|
||||
whoosh>=2.5.6,<2.6
|
||||
|
||||
# For Python 2.6 support
|
||||
--allow-external argparse
|
||||
argparse==1.2.1
|
||||
|
4
setup.py
4
setup.py
@ -13,10 +13,8 @@ with open('README.rst') as readme:
|
||||
long_description = readme.read()
|
||||
|
||||
|
||||
dependency_line = re.compile('[^#-]')
|
||||
with open('requirements_production.txt') as requirements_production:
|
||||
install_requires = [line for line in requirements_production.readlines()
|
||||
if dependency_line.match(line)]
|
||||
install_requires = requirements_production.readlines()
|
||||
|
||||
|
||||
setup(
|
||||
|
Loading…
Reference in New Issue
Block a user