ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,160 Commits 6 Branches 42 Tags 64 MiB
2d34fda1e5
Commit Graph

179 Commits

Author SHA1 Message Date
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
Emanuel Schuetze
802fde42ce Improved html templates for mobile devices (responsive). 
Fixed #995 (Use responsive navbar for main menu in backend template)
 2014-05-18 22:19:02 +02:00
Norman Jäckel
b16641c0dc Renamed 'permission_required' to 'required_permission' etc. 
Renamed method and attribute of openslides.utils.views.PermissionMixin. Renamed attribute of widgets and main menu entries. Fixed #1160.
 2014-05-15 20:07:09 +02:00
Norman Jäckel
c747f09ad0 Changed permission system for config pages. 
Config pages are now only available for users with permission 'config.can_manage'. Fixed #1159.
 2014-05-12 22:56:19 +02:00
Norman Jäckel
ee9e2729d1 Updated CHANGELOG, README.rst, requirements files, .travis.yml and setup.py. 2014-05-05 21:25:17 +02:00
Norman Jäckel
5254cc83a6 Updated numbering feature. 
Fixed organizational item structuring. Prevented organizational items
from having agenda items as descendents. Some coding style changes.
Added CHANGELOG and README entries.
 2014-05-04 13:47:01 +02:00
Emanuel Schütze
fa6c7d9d86 Fixed #1102 (New config option to set percent base for polls) 
Use locale format for poll percentage decimal number.
 2014-04-28 21:57:31 +02:00
Norman Jäckel
42796f6118 Added global chatbox for managers. 2014-04-27 20:58:22 +02:00
Oskar Hahn
3d092f6dcc countdown shortcuts 2014-04-27 19:48:57 +02:00
Norman Jäckel
ac1ab81d7a New projector view with the current list of speakers. 2014-04-15 01:00:56 +02:00
Norman Jäckel
2a10feecad Added CSV import, fixed #1186. Also cleaned up motion and user CSV import. 2014-04-13 20:35:19 +02:00
Norman Jäckel
e6dad6d087 Merge part of stable/1.5.x into master. 
Conflicts:
	CHANGELOG
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/__init__.py
	openslides/core/templates/base.html
	requirements_production.txt
	tests/config/test_config.py
 2014-04-08 20:33:07 +02:00
Emanuel Schütze
3d7ecab8e4 Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2 
Conflicts:
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/assignment/views.py
	openslides/core/static/img/circle.png
	openslides/motion/pdf.py
	openslides/utils/pdf.py
 2014-04-07 22:35:52 +02:00
Norman Jäckel
c13c0997bf Merge part of stable/1.5.x into master. 
Conflicts:
	openslides/agenda/views.py
	openslides/mediafile/forms.py
	openslides/projector/api.py

The fix from commit 39de1924cb was removed
because of the new widget system in master branch. See GitHub Issue #1191
 2014-04-05 15:19:42 +02:00
Norman Jäckel
ba1dc9673f Update version to 1.5.2-dev 2014-03-31 23:55:32 +02:00
Norman Jäckel
18a434ed87 Release 1.5.1 2014-03-31 23:55:32 +02:00
Roland Geider
e96f984a03 Add tests for motion PDF and update changelog file 2014-03-31 22:17:10 +02:00
Norman Jäckel
9abb7a3caf Updated CHANGELOG, README.rst, requirements.txt, requirements_production.txt and setup.py. 2014-03-31 21:27:56 +02:00
Emanuel Schütze
b5fb83c026 Fixed #551: Used unicode font for circle in ballot pdf. Removed pillow. 
That fixed also #1140 (Server error when trying to view ballot paper pdf)
 2014-03-29 13:20:31 +01:00
Norman Jäckel
39de1924cb Added extra permission check to speaker widget, fixed #1191 only for 1.5.x branch 2014-03-13 00:50:49 +01:00
Norman Jäckel
e7f67457db Regrouped config collections and pages. Fixed #1201. 2014-03-13 00:41:57 +01:00
Norman Jäckel
ce8274fb53 Inserted command line option to translate config strings during database setup. Fixed #460. 2014-01-31 02:03:43 +01:00
Norman Jäckel
4b63f3a288 Coupled assignment candidates with list of speakers. Fixed #1092. 2014-01-13 15:22:46 +01:00
Norman Jäckel
04b0cfb0bc Used entry points to detect plugins automaticly. 2014-01-12 12:48:24 +01:00
Norman Jäckel
e0223c950b Added possibility to use custom templates and static files in user data path directory. 2014-01-12 11:05:54 +01:00
Oskar Hahn
6409f828d7 Added a poll description field for each assignment poll 
fixed signals in MainMenuTests
 2014-01-12 10:22:38 +01:00
Norman Jäckel
b95a856904 Added form field for multiple creation of new participants. Fixed #178. 2014-01-11 23:09:59 +01:00
Oskar Hahn
56c8dcdac1 Merge branch 'stable/1.5.x' 2014-01-11 22:58:39 +01:00
Oskar Hahn
cde6232477 Merge branch 'stable/1.5.x' 
Conflicts:
	openslides/projector/projector.py
	openslides/templates/base.html
 2014-01-11 22:30:14 +01:00
Norman Jäckel
19ccbd3b17 Fixed error in main script when using other database engine. Fixed #1166. 2014-01-11 08:51:17 +01:00
Norman Jäckel
21ff62dd32 Changes in projector and core app and in utils. 
Changed api for main menu entries.
Enhanced http error pages using a classed based views.
Moved dashboard and select widgets view from projector to core app.
Also some small clean ups.
 2014-01-10 16:17:54 +01:00
Norman Jäckel
22960748a3 Added permission to see participants also to the manager group. See #1150. 2013-12-23 19:14:11 +01:00
Norman Jäckel
1e52959f70 Fixed error when a file was removed from filesystem. Fixed #1120. 2013-12-23 18:46:04 +01:00
Norman Jäckel
03fd7fd142 Fixed http status code when requesting a non-existing static page using Tordado web server. Fixed #1161. 2013-12-23 17:42:11 +01:00
Norman Jäckel
9a3243706b Inserted api for the personal info widget. 2013-12-09 12:16:16 +01:00
Norman Jäckel
405fadb6f5 Rename some classes of the poll api. Clean up the poll api. 2013-12-07 00:24:11 +01:00
Norman Jäckel
bdf1679eb0 Rename classes in the config api. 
Also change attributes for config collection without view.
 2013-12-06 10:47:20 +01:00
Norman Jäckel
fee983045b Change API for plugins, esp. for names and versions of plugins. Also enhance possibility to patch existing OpenSlides urlpatterns. 
Fix some other tests by the way.
 2013-12-05 16:40:54 +01:00
Norman Jäckel
91ca066aa5 Enable update and delete view for uploader refering to his own files. 2013-12-03 01:53:37 +01:00
Norman Jäckel
43c6efa222 Disable participant widgets by default. Fixes #988. 2013-12-02 18:03:28 +01:00
Norman Jäckel
1fb1f17d15 New API for widgets using a metaclass. 
It is now possible to define a default state and to submit extra stylefiles and javascript files when defining a widget in an app. This is done by a new metaclass in openslides.utils.dispatch. Also fixed some other tests.
 2013-12-01 21:30:12 +01:00
Norman Jäckel
f510399230 Update version to 1.6a1-dev. 2013-11-25 23:42:52 +01:00