Commit Graph

220 Commits

Author SHA1 Message Date
Norman Jäckel 7cd70a568c Added docstrings. Small changes. 2016-10-01 01:48:18 +02:00
Norman Jäckel 8427ffd816 Small changes for multiple projector feature. 2016-09-30 19:11:33 +02:00
Finn Stutzenstein e6b9b21d41 Added support for multiple projectors. 2016-09-30 18:58:59 +02:00
Maximilian Krambach e8fa0eca5a New calculate percentage options (fixes issue #2182) 2016-09-23 14:45:49 +02:00
Norman Jäckel cab53f0434 Moved custom slides to own app topics for better app structure.
Renamed model to Topic. Added migrations file. Fixed #2402.
2016-09-21 15:00:23 +02:00
Oskar Hahn 6abb0976c2 Change system for autoupdate on the projector (#2394)
* Second websocket channel for the projector

* Removed use of projector requirements for REST API requests.

Refactored data serializing for projector websocket connection.

* Refactor the way that the projector autoupdate get its data.

* Fixed missing assignment slide title for hidden items.

* Release all items for item list slide and list of speakers slide. Fixed error with motion workflow.

* Created CollectionElement class which helps to handle autoupdate.
2016-09-17 22:26:23 +02:00
Norman Jäckel d7936c53e3 Updated settings files. Fixed timezone support. 2016-09-16 21:17:00 +02:00
Norman Jäckel 4bed8f6c11 Added recommendations for motions.
Also changed label of former state 'commited a bill' to 'refered to committee'. Fixed #2342.
2016-09-07 23:46:38 +02:00
Norman Jäckel ab845b4137 Added generic fields for comments for motions. 2016-09-07 20:43:00 +02:00
Maximilian Krambach 126cfb9000 Parent items for Agenda items (fixes #2213) 2016-08-25 13:51:54 +02:00
Emanuel Schütze 73095948ca Merge pull request #2260 from FinnStutzenstein/Feature435
New matrix interface for group editing (closes #435)
2016-08-22 15:26:10 +02:00
Finn Stutzenstein bf3a1ce714 New matrix interface for group editing (closes #435) 2016-08-22 15:05:06 +02:00
Norman Jäckel 70a732bce8 Merge pull request #2280 from normanjaeckel/TemplateHook
Added template hooks for plugins.
2016-08-19 21:13:55 +02:00
Norman Jäckel c38cf562d5 Added template hooks for plugins. 2016-08-19 21:08:54 +02:00
Thomas Junk 92a541215f pdfmake incl. fixes 2016-08-19 16:21:46 +02:00
Norman Jäckel b0070d13b9 Added possibility to sort motions in category numbering view. 2016-08-16 23:51:12 +02:00
Emanuel Schütze 54ee068057 Merge pull request #2243 from FinnStutzenstein/master
Fixing issue #2127
2016-08-05 16:13:19 +02:00
Finn Stutzenstein b115691675 Messages now allow HTML tags (Fixes #2127) 2016-08-05 12:38:19 +02:00
Maximilian Krambach 371945e36e adding user field "number" (fixes #2214) 2016-08-03 16:55:03 +02:00
Norman Jäckel e688a345c0 Merge pull request #2230 from emanuelschuetze/remove-assignment-config
Remove unused assignment config to publish winner results only.
2016-08-03 15:58:35 +02:00
Emanuel Schuetze 8d52d4a1c6 Remove unused assignment config to publish winner results only. (Fixes #2145) 2016-07-29 12:29:53 +02:00
Norman Jäckel 7e6dc50b39 Added viewpoint to number all motions in a category. 2016-07-29 11:56:12 +02:00
Norman Jäckel 6e241d618e Fixed CHANGELOG. 2016-07-29 11:39:37 +02:00
Norman Jäckel 4b9767b09e Added new user field is_committee and new default group Committees. 2016-07-29 11:37:51 +02:00
Emanuel Schütze aca01c466c Merge pull request #2222 from matakuka/issue2210
add "delete all speakers" button (feature, issue #2210)
2016-07-28 11:11:31 +02:00
Maximilian Krambach 589137ece7 add "delete all speakers" button (fixes #2210) 2016-07-28 10:51:33 +02:00
Norman Jäckel 0b9a64f968 Added motion origin field. 2016-07-13 14:45:40 +02:00
Oskar Hahn fe64941aab Big Mode for OpenSlides
Uses django channels instead of tornado for the autoupdate. Therefore
tornado is nolonger a dependency of OpenSlides (but channels).

This uses websockets instead of SockJS.

Use the flag insecure in the start command to provide static files serving.

Use a new session backend that has a ForeignKey to User.
2016-06-09 11:14:39 +02:00
Oskar Hahn 2221b23447 Redesign of the config variables.
Removed the config cache and created files for each app in which the
config variables are defined.
2016-06-03 13:47:54 +02:00
Norman Jäckel e968c88cc1 Update version to 2.0.1-dev 2016-04-17 22:49:17 +02:00
Norman Jäckel 347cf478f8 Release 2.0 2016-04-17 22:49:17 +02:00
Norman Jäckel 70bcf731b7 Updated README.rst. Added file for DEVELOPMENT instructions. 2016-04-15 19:53:07 +02:00
Norman Jäckel cb66facde5 Updated CHANGELOG. 2016-03-21 19:37:42 +01:00
Norman Jäckel ca3cfae8b3 Changed name of '--development' option and name of the respective directory. Fixed #2001 2016-03-01 17:38:14 +01:00
Emanuel Schuetze 70dc8443fd Revert one change from #1984 in CHANGLOG. (Fixes #1989) 2016-02-23 22:24:41 +01:00
Emanuel Schuetze dcb12e60c7 Updated CHANGELOG 2016-02-17 20:38:29 +01:00
Norman Jäckel d141fd3692 Updated metadata files. 2016-01-27 22:53:12 +01:00
Norman Jäckel fea0287a20 Updated translations. 2016-01-27 22:16:54 +01:00
Norman Jäckel 8a6ca904dc Added attachments to custom slides. 2016-01-10 11:51:00 +01:00
Norman Jäckel 2e104d07b7 Removed possibility to block candidates. Fixes #1708. 2016-01-09 18:05:41 +01:00
Emanuel Schuetze b035ee7d7c Improved legal notice page (Fixes #267) 2016-01-09 14:44:49 +01:00
Oskar Hahn 622dadd4ef Merge pull request #1795 from normanjaeckel/StaticImpressumPage
Added config field for legal notes.
2016-01-09 13:22:54 +01:00
Norman Jäckel d7e39be708 Added config field for legal notes. 2016-01-09 13:01:18 +01:00
Oskar Hahn 552998b067 Update requirements, fixt a lot of warnings
Set python 3.4 as minimal supported python version
2016-01-09 12:19:46 +01:00
Emanuel Schuetze d583561342 Updated README and CHANGELOG for 2.0b1. 2015-12-07 21:42:20 +01:00
Emanuel Schuetze dda16af532 Added controls for projector elements
countdowns, messages, scale/scroll/edit current slide
Use global serverOffset.
Fixed #1645 (wrong time of projector clock).
Show countdown description on projector slide.
2015-10-08 19:21:25 +02:00
Norman Jäckel 1cf8a1f222 Updated plugin utils. Enabled plugins to override urlpatterns. 2015-07-25 21:37:03 +02:00
Oskar Hahn e042c668d5 Moved config app into the core app 2015-06-29 15:15:33 +02:00
Norman Jäckel d08d58518f Updated CHANGELOG. 2015-06-16 17:41:19 +02:00
Oskar Hahn fbf7d0e43d Remove old thinks not needed for the 2.0 release:
* django templates
* widgets
* views
* mppt
* main_menu
* projector 1.x api

Sorted all imports
Add a ending slash to each url with a redirect view
2015-06-16 17:07:39 +02:00
Norman Jäckel 3e2aa6c081 Update 2015-06-16 14:04:38 +02:00
Norman Jäckel dc7d27a985 Added REST API for projector. Introduced new projector API.
Added custom slide projector element class.
Added welcome slide as custom slide.
Added user slide projector element class.
Added clock, countdown ans message projector elements.
Renamed SignalConnectMetaClass classmethod get_all_objects to get_all (private API).
Added migrations to core app.
Fixed and wrote tests.
Updated CHANGELOG.
2015-05-29 12:44:25 +02:00
Emanuel Schuetze e6c3e18144 New OpenSlides logo. (Thanks to Rene!) 2015-04-17 20:34:54 +02:00
Oskar Hahn 0b5f75339e Rename apps and permissions
* Fixed agenda permissions
* Renamed assignment to assignments, fixed assignments permission names
* Renamed mediafile to mediafiles
* Renamed motion to motions. Fixed motions permission names
2015-03-29 20:35:53 +02:00
Norman Jäckel 0bf486bca4 Updated Changelog. 2015-02-25 19:40:18 +01:00
Norman Jäckel 274648b180 Merge commit 'stable/1.7.x' into master.
Conflicts:
	CHANGELOG
	openslides/__init__.py
	openslides/assignment/views.py
2015-02-25 13:26:49 +01:00
Norman Jäckel 0f55583b4c Updated version to 1.7.1-dev 2015-02-15 20:48:02 +01:00
Norman Jäckel 7806e79574 Release 1.7 2015-02-15 20:45:21 +01:00
Norman Jäckel 3015e3d389 Updated CHANGELOG. Updated language files (only metadata changes). 2015-02-15 20:43:15 +01:00
Norman Jäckel f9ca8d1df1 Updated CHANGELOG. 2015-02-14 02:43:19 +01:00
Oskar Hahn c7b52245b7 Fix AssignmentPollUpdateView 2015-01-25 15:15:28 +01:00
Norman Jäckel 4f5a31d50f Updated CHANGELOG. 2015-01-25 01:09:57 +01:00
Oskar Hahn 8b88d38ac5 Merge branch 'stable/1.7.x'
Conflicts:
	openslides/__init__.py
	openslides/assignment/views.py
	openslides/motion/pdf.py
	openslides/users/pdf.py
2015-01-23 02:33:17 +01:00
Norman Jäckel 8080096050 Updated CHANGELOG. 2015-01-21 20:58:03 +01:00
Norman Jäckel 0351d8982f Update metadata files and copyright notes. 2015-01-20 14:42:41 +01:00
Norman Jäckel 0d56424c90 Refactored REST api in agenda, core and users app. 2015-01-17 15:58:51 +01:00
Norman Jäckel 86261bda28 Merge branch 'stable/1.6.x' into 'master'.
Conflicts:
	CHANGELOG
2015-01-17 10:27:27 +01:00
Norman Jäckel 46f6a3f14e Updated Changelog. 2015-01-17 10:21:22 +01:00
Oskar Hahn 0a24b7267b Merge branch 'stable/1.6.x'
Conflicts:
	CHANGELOG
	README.rst
	openslides/assignment/models.py
	openslides/users/forms.py
	requirements_production.txt
	tests/settings.py
2015-01-17 10:18:29 +01:00
Norman Jäckel f7cb518430 Used Bower and gulp to manage third party JavaScript and Cascading Style Sheets libraries.
Cleaned up settings. Updated development section in README.rst.

Removed jQuery, jquery.cookie and bootstrap from repository.
2015-01-17 00:12:04 +01:00
Emanuel Schuetze 3127048be5 Fixed haystack indexing problem for m2m objects.
Updated django-haystack to <2.4.
2015-01-16 23:07:56 +01:00
Oskar Hahn 34b6ca80f3 Merge branch 'stable/1.6.x'
Conflicts:
	CHANGELOG
	openslides/users/signals.py
2015-01-06 13:04:07 +01:00
Oskar Hahn bcb1ee1213 Tags for motions, agenda items and assignments 2015-01-03 17:00:48 +01:00
Oskar Hahn 2951b4b38c Feature: amendments 2015-01-03 15:17:49 +01:00
Norman Jäckel dcd8b7a639 Merge branch 'stable/1.6.x' into 'master'.
Conflicts:
	CHANGELOG
	openslides/agenda/views.py
	openslides/assignment/views.py
	openslides/mediafile/views.py
	openslides/users/views.py
	openslides/utils/views.py
	tests/motion/test_pdf.py
	tests/settings.py
2015-01-02 22:11:56 +01:00
Norman Jäckel 8dafa2bfcd Added possibility to hide motions from non staff users in some states. 2015-01-02 19:32:56 +01:00
Norman Jäckel f6b1a84545 Cleaned up utils.views to increase performance when fetching single objects from the database for a view. Fixed #1378. 2014-12-25 00:02:50 +01:00
Norman Jäckel 4f04223e08 Added Django's application configuration.
Used customized AppConfig classes in openslides.core, openslides.account,
openslides.projector, openslides.agenda, openslides.motion, openslides.assignment,
openslides.users, openslides.mediafile, openslides.config.

Refactored loading of signals, template signals and slides.
2014-12-10 17:16:58 +01:00
Norman Jäckel 808aae597f Merge branch 'stable/1.6.x' into 'master'.
Conflicts:
	CHANGELOG
	openslides/__init__.py
	openslides/assignment/views.py
2014-12-08 22:17:22 +01:00
Norman Jäckel 750918fe74 Update version to 1.6.2-dev 2014-12-04 15:47:21 +01:00
Norman Jäckel 9a50dab5fc Release 1.6.1 2014-12-04 15:45:19 +01:00
Norman Jäckel 35e31874a1 Updated CHANGELOG. 2014-12-04 15:42:35 +01:00
Emanuel Schuetze 6df6b92dd7 Fixed #1326 (Rearanged assignment pdf table cells to prevent a LayoutError) 2014-11-28 20:58:19 +01:00
Norman Jäckel c89f9bcccd Updated German and Czech language files. 2014-10-26 16:12:20 +01:00
Oskar Hahn 5c6f7a41a8 Merge branch 'stable/1.6.x'
Conflicts:
	tests/assignment/test_views.py
2014-10-18 08:53:51 +02:00
Oskar Hahn c454faef94 Updated Django to 1.7.x 2014-10-14 17:14:52 +02:00
Norman Jäckel c73c986ef1 Updated CHANGELOG. 2014-10-12 10:46:17 +02:00
Norman Jäckel af8dead5a3 Fixed motion detail view template. Added block to enable extra content via plugins. Updated CHANGELOG. 2014-10-12 10:23:38 +02:00
Oskar Hahn 32137b6523 Use python3
python3.3 and python3.4 are supported
2014-08-24 21:21:11 +02:00
Emanuel Schuetze f6d0a96126 Show supporters on motion slide if available. 2014-07-14 22:54:53 +02:00
Emanuel Schuetze 587a3766d2 Fixed participant csv import for group id
- Allowed to add multiple groups in csv group id field (e.g. "3,4")
- Fixed bug that group ids > 9 can not be imported.
- Updated error message if group id does not exists.
2014-07-14 22:54:53 +02:00
Emanuel Schuetze 648d5a6ad7 Fixed CKEditor stuff:
- Added missing insertpre plugin and allow <pre> tag with class
  attribute. Added font style to base.css.
- Removed unused link to old ckeditor.css (now managed by
  django-ckeditor).
2014-07-14 22:54:53 +02:00
Norman Jäckel 5db47bef76 Update version to 1.6.1-dev 2014-06-02 20:37:51 +02:00
Norman Jäckel 9d40e22783 Release 1.6 2014-06-02 20:37:50 +02:00
Norman Jäckel 7666be8a29 Update CHANGELOG and README.rst. 2014-05-29 18:19:56 +02:00
Norman Jäckel 2bfa5f3a72 Prepared for release.
Small style changes, CHANGELOG and README.rst update.
2014-05-19 22:55:54 +02:00
Oskar Hahn 22bacd1054 bind the reload of the webserver on the debug settings
fix #1163
2014-05-19 22:18:45 +02:00
Emanuel Schütze bf8bb31cdb Merge pull request #1298 from emanuelschuetze/fix-995
Improved html templates for mobile devices (responsive).
2014-05-19 22:17:26 +02:00
Emanuel Schuetze 6bdfc33182 Motion CSV Import: Create new category if category is unkown. 2014-05-19 20:31:38 +02:00
Roland Geider e9d52245cb Replace own CKeditor with dedicated app 2014-05-19 00:00:18 +02:00