ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,336 Commits 6 Branches 42 Tags 64 MiB
a193cc1e3f
Commit Graph

4310 Commits

Author SHA1 Message Date
Sean
76210e807f
Merge pull request #4275 from MaximilianKrambach/sortLists 
sort categories (+ motions) in dropdowns etc.
 2019-02-08 15:24:02 +01:00
Maximilian Krambach
c487d688f6 sort categories in dropdowns 2019-02-08 14:37:58 +01:00
Maximilian Krambach
ee88dff41f Fixing csv export/import, add new config option for csv export encoding (utf-8 || iso-8895-15) 2019-02-08 12:37:02 +01:00
FinnStutzenstein
3ba8636acf Allow motions to go a state back 2019-02-08 11:58:11 +01:00
FinnStutzenstein
d0991936d6 ViewModelStore, register repositories, improve view model relations 2019-02-08 11:02:56 +01:00
Emanuel Schütze
7956d9f7a2
Merge pull request #4271 from MaximilianKrambach/4065 
fix #4065
 2019-02-07 13:08:33 +01:00
FinnStutzenstein
35056f5ccc seperate motion version migration operations 2019-02-07 09:28:12 +01:00
Maximilian Krambach
2fbd11dc00 fix #4065 2019-02-06 16:53:26 +01:00
Emanuel Schütze
722a40779d Fixed login problem for non admin users. 2019-02-05 21:03:13 +01:00
Jochen Saalfeld
114c8bfa3c
Merge pull request #4184 from ostcar/fix_gunicorn 
Opens the websocket connection before closing it
 2019-02-05 08:34:52 +01:00
Oskar Hahn
fae270a1d6 Make sure the cache is ensured before manipulating it 2019-02-04 17:41:18 +01:00
Emanuel Schütze
ac96ba8d3a Updated translations 2019-02-03 22:12:26 +01:00
Norman Jäckel
286c81e007 Allow set state for submitters in some states. 2019-02-01 16:10:51 +01:00
Norman Jäckel
c355326466 Added new flag to motion state to control access for different users. 2019-02-01 15:42:02 +01:00
Emanuel Schütze
dbe452f976
Merge pull request #4232 from emanuelschuetze/reason 
New config to set reason field required.
 2019-02-01 10:15:02 +01:00
Emanuel Schütze
fa8e0687bf
Merge pull request #4237 from ostcar/fix_restricted_data_cache 
fix restricted_data_cache for elements that exists, but a user is not allowed to see them
 2019-02-01 10:13:53 +01:00
Emanuel Schütze
617eccb85f New config to set reason field required. 2019-02-01 09:53:38 +01:00
FinnStutzenstein
582d4d7c4a Projector reference for CLOS 2019-02-01 09:47:59 +01:00
Oskar Hahn
1111a8074e fix restricted_data_cache for elements that exists, but a user is not allowed to see them 2019-02-01 08:26:34 +01:00
Norman Jäckel
7b4ea753c1
Merge pull request #4234 from emanuelschuetze/https 
Set use_https to true
 2019-01-31 23:43:20 +01:00
Emanuel Schütze
b480266dad Set use_https to true 
used for password reset urls in emails by django
 2019-01-31 22:41:08 +01:00
FinnStutzenstein
b921b771d6 projector cleanup 2019-01-31 12:41:04 +01:00
GabrielMeyer
30535dd21f OpenSlides theming (Fixes #4205) 
using 3 built-in themes (default, dark, green)
 2019-01-31 12:04:35 +01:00
Maximilian Krambach
10d1209da8 Fix 'errors' 
- two python comparisons error not passing flake8 anymore
- typescript not being able to recognize an object, sending it prechewed
 2019-01-30 12:18:59 +01:00
Emanuel Schütze
42f8b74d8e Projector templates 
- Projector base template
- Projection button
- projection dialog
- motion slide (template and motions/projector.py)
- user slide (template and users/projector.py)
- motion and user list view with projector column permission check.
 2019-01-29 16:12:19 +01:00
FinnStutzenstein
965d23be50 more work on projector, countdowns, clos 
- splitted clos-slide and clos-overlay.
- Synchronize to server, more little changes
 2019-01-29 16:10:21 +01:00
Oskar Hahn
1a709a59a9 Projector V 
* Changed wording: element is one element on the projector. A slide is a functoin to render one element
* Use AllData as first argument all the time
* Render username on server
* Add exceptions for erros on projector
* Fix motion recommendation
* Only show state extension, if it is allowed by the state
* Add motion_change_recommendations to motion full_data
 2019-01-28 23:18:27 +01:00
Norman Jäckel
39244a0ec9 Reenable black. 2019-01-28 20:54:42 +01:00
Norman Jäckel
746dbf744b Fixed reset password views. 2019-01-28 20:51:06 +01:00
Maximilian Krambach
4a2cad5801 add a validation error for false template invitation email properties 2019-01-25 17:01:33 +01:00
Oskar Hahn
014b145b0f Opens the websocket connection before closing it 
Fixes #4009
 2019-01-25 16:33:45 +01:00
Finn Stutzenstein
1b3c0b4cee
Merge pull request #4152 from ostcar/new_projector_iv_motion_slide 
New projector IV
 2019-01-24 11:28:53 +01:00
Emanuel Schütze
cf29f39b9f Added missing projector migration. 2019-01-22 12:59:33 +01:00
Emanuel Schütze
bde292b13e
Merge pull request #4162 from tsiegleauq/pdfmake-vfs 
Add PDF custom fonts
 2019-01-22 12:13:17 +01:00
Sean Engelhardt
e680ca38da Add PDF custom fonts 2019-01-22 11:59:16 +01:00
Emanuel Schütze
6b66a208c5 Updated translation strings and German translation. 2019-01-21 22:50:10 +01:00
Oskar Hahn
cca28a990a New projector IV 
* Motion Slide
 2019-01-20 13:35:50 +01:00
Oskar Hahn
209105efc3
Merge pull request #4103 from FinnStutzenstein/client-projector-ui 
Client projector ui (WIP)
 2019-01-20 11:39:49 +01:00
Emanuel Schütze
402fc37b99
Merge pull request #4155 from ostcar/activate_start_command 
activate start command
 2019-01-20 11:36:06 +01:00
Oskar Hahn
6b73c5bf1a activate start command 2019-01-20 11:24:42 +01:00
Emanuel Schütze
c704b90ecb Fix history migration. 2019-01-20 11:05:49 +01:00
Emanuel Schütze
251cc4acc1
Merge pull request #4147 from emanuelschuetze/history-table 
Improved history table.
 2019-01-20 10:35:23 +01:00
Emanuel Schütze
33d9468e6b
Merge pull request #4153 from normanjaeckel/RecExtension 
Fixed following recommendations with extensions.
 2019-01-20 10:21:56 +01:00
Emanuel Schütze
2c5d8ea29e Improved history table. 2019-01-20 09:46:41 +01:00
Emanuel Schütze
23f7dce6a2 Fixes for using pypi package 
- Fix static path for manifest and login logo.
- Use insecure=True (required to serve static files via development
  server with DEBUG=False).
 2019-01-20 09:37:42 +01:00
Emanuel Schütze
034a4d2a67
Merge pull request #4144 from MaximilianKrambach/dateSort 
sort by date in motion
 2019-01-19 22:43:29 +01:00
Norman Jäckel
7c6e98fae6 Fixed following recommendations with extensions. 2019-01-19 22:36:41 +01:00
Norman Jäckel
030f610f2f Fixed last_modified saving. 2019-01-19 22:11:40 +01:00
Maximilian Krambach
10550fe228 fix server set marked for users that already have spoken 2019-01-19 21:28:18 +01:00
FinnStutzenstein
74e0bea108 Wirst work for the projector system on the client 2019-01-19 21:26:05 +01:00
Oskar Hahn
df85e01b16
Merge pull request #4145 from ostcar/logged_in_users 
logged in users
 2019-01-19 18:00:47 +01:00
Oskar Hahn
5ca2012c44 logged in users 2019-01-19 17:50:18 +01:00
Norman Jäckel
9db12293a3 Added history information for some motion views. 2019-01-19 16:41:58 +01:00
Oskar Hahn
7df842f2e2 delete wrong file 2019-01-19 14:48:01 +01:00
Oskar Hahn
11ba7b9841 Autoupdate on element deletion 
Make sure, that a related element gets an autoupdate, when the main object is deleted
 2019-01-19 14:46:59 +01:00
Oskar Hahn
a895481cef
Merge pull request #4131 from normanjaeckel/PasswordPerm 
Added new permission to set password.
 2019-01-19 14:33:10 +01:00
Oskar Hahn
27cb63174e
Merge pull request #4134 from normanjaeckel/MotionCreatedTimestamp 
Added timestamp fields for motions.
 2019-01-19 14:23:21 +01:00
Oskar Hahn
7a64fb83eb
Merge pull request #4135 from ostcar/projector_http_view 
New projector III
 2019-01-19 14:04:28 +01:00
Norman Jäckel
5aedf62018
Merge pull request #4104 from normanjaeckel/HistoryTimestamp 
Used the same timestamp for multiple history objects.
 2019-01-19 14:03:47 +01:00
Norman Jäckel
b15a57bbdd Added timestamp fields for motions. 2019-01-19 11:09:55 +01:00
Oskar Hahn
b4c3ffe01f New projector III 
* Add a new view `project` to set the projector elements-fields
 2019-01-19 10:47:11 +01:00
Norman Jäckel
4da87d520d Added new permission to set password. 2019-01-19 10:35:13 +01:00
Norman Jäckel
de7b531933 Used the same timestamp for multiple history objects. 2019-01-19 09:58:58 +01:00
Norman Jäckel
4261c3deed Set state for multiple motions. 2019-01-19 09:22:02 +01:00
Emanuel Schütze
1cdeb3bcb8
Merge pull request #4124 from normanjaeckel/Gender 
Added gender field for users.
 2019-01-19 09:17:08 +01:00
Oskar Hahn
c37bf0fb4f New Projector 
* Change Projector model
* Remove old http requests
* Remove old config values
* Remove uuid from config field
* Remove projector broadcast
* Remove projector blank
* Fix serializer
 2019-01-19 08:19:40 +01:00
Norman Jäckel
85d9629776 Added new permissions to create new amendments. 2019-01-18 22:06:15 +01:00
Norman Jäckel
168561bc55 Added gender field for users. 2019-01-18 19:47:00 +01:00
Finn Stutzenstein
8bd24d690d
Merge pull request #4118 from FinnStutzenstein/notify 
Make OS3 notify ready
 2019-01-18 17:55:24 +01:00
Oskar Hahn
b329115007 use f-string syntax for strings 2019-01-18 17:37:36 +01:00
FinnStutzenstein
47a09e4bce Make OS3 notify ready 2019-01-18 17:03:09 +01:00
Oskar Hahn
5127d659db Add the projector config into the data send via websocket 2019-01-18 15:38:20 +01:00
Oskar Hahn
a0f554674b New projector system. Add first slides 2019-01-12 21:21:43 +01:00
Jochen Saalfeld
c9df66ffb9
fixing Module not found error 
should fix #4069
 2019-01-10 12:30:13 +01:00
Jochen Saalfeld
73a3001a35
fixing the wsgi server by removing trailing slashes on static files 
fixes #4091
 2019-01-09 21:31:48 +01:00
Oskar Hahn
eddbd86d3a Run black 2019-01-08 21:51:52 +01:00
Oskar Hahn
8fd82434af Fix example data generator 
fix #4066
 2019-01-04 16:15:45 +01:00
Tobias Hößl
ef210dcc52 Bugfix for initial values of merge_amendment_into_final - #3975 2018-12-19 10:39:36 +01:00
Oskar Hahn
e09c5f415a fix keyerror introduced by #3985 2018-12-17 13:34:17 +01:00
Oskar Hahn
9bb77817dd Refactor assess_permission 
* Remove access_permission.get_full_data()
* Remove access_permission.gcet_serializer_class()
* get serializer class from model
 2018-12-16 09:10:52 +01:00
Emanuel Schütze
b900dfcba3
Merge pull request #4050 from FinnStutzenstein/remove_action_word 
removed action word from states
 2018-12-13 10:05:11 +01:00
FinnStutzenstein
2e7bbcc981 Manage submitters 2018-12-06 15:54:02 +01:00
FinnStutzenstein
362e2f154f removed action word from states 2018-12-06 11:47:33 +01:00
Emanuel Schütze
d11154cfc1
Merge pull request #4028 from jsaalfeld/fix_redis 
the redis host needs to be configured for channel layers
 2018-12-03 14:15:59 +01:00
Emanuel Schütze
b578c58ac9 Updated translations. 2018-11-30 13:55:43 +01:00
Sean Engelhardt
0c62c1c864 History mode on client side 
Add view for full history and History Repom TimeTravelService
Add function time travel routine
Updated the HTTP Service, fixed usage of storage, OSStatus Service, fixed loading of the history data
 2018-11-30 12:42:13 +01:00
Norman Jäckel
060856628b OpenSlides history mode. 
Also containing auth check and viewpoint to clear history.
 2018-11-30 09:51:10 +01:00
Finn Stutzenstein
8f3f7719b1
Merge pull request #4042 from FinnStutzenstein/fixedMigrations 
Fixed user migrations
 2018-11-30 08:10:05 +01:00
Norman Jäckel
9e007437ec
Merge pull request #4037 from normanjaeckel/MultiSubmitters 
Added multi select for motion submitters, tags and recommendations.
 2018-11-29 20:16:49 +01:00
FinnStutzenstein
598a726394 Fixed user migrations 2018-11-29 16:13:31 +01:00
Tobias Hößl
afad235bad Show amendments in detail view 2018-11-29 14:11:27 +01:00
FinnStutzenstein
80fce9a173 prevalidate agenda items on assign 2018-11-29 08:42:16 +01:00
Norman Jäckel
cfd5cf3c7e Added viewpoint to assign multiple items to a new parent item. 2018-11-27 23:46:41 +01:00
Norman Jäckel
261083ac69 Added multi select for motion submitters, tags and recommendations. 2018-11-27 23:46:39 +01:00
Sean
10714bbbe4
Merge pull request #4032 from FinnStutzenstein/new_configs 
new configs for statute amendments; improved the majorityMethod confi…
 2018-11-23 11:15:07 +01:00
Jochen Saalfeld
14b2d33d00
Merge pull request #4016 from FinnStutzenstein/postgres_no_error 
Do not try to access the database during migrations
 2018-11-23 08:19:06 +01:00
FinnStutzenstein
3d4bd67980 new configs for statute amendments; improved the majorityMethod config variable 
Removed none from os-search-value-selector; improved list of speakers
 2018-11-22 17:34:00 +01:00
FinnStutzenstein
8e59170b76 Do not try to access the database during migrations 2018-11-22 17:20:17 +01:00
FinnStutzenstein
101d6c96cd using angular2 tree for the nested motion call list 2018-11-22 17:16:20 +01:00
Jochen Saalfeld
09e2629b64
the redis host needs to be configured for channel layers 
otherwise the post migration signal in django will try to establish an connection to localhost, no matter what redis server ip or adress was entered
 2018-11-22 09:08:22 +01:00
Oskar Hahn
619a589731
Merge pull request #4021 from ostcar/fix_double_elements_in_autoupdate 
fix douple elements
 2018-11-20 22:34:02 +01:00
Sean
01c593e9be
Merge pull request #3957 from CatoTH/StatuteParagraphAmendments 
Creating / Editing / Showing statute paragraph amendments
 2018-11-20 16:54:16 +01:00
Tobias Hößl
d3fc006ddc Creating / Editing statute paragraph amendments 2018-11-20 14:40:01 +01:00
Oskar Hahn
67d933a206 fix douple elements 2018-11-18 07:57:44 +01:00
Tobias Hößl
ffc0cd9423
Change default of change recommendation internal value to public 2018-11-15 13:16:43 +01:00
Jochen Saalfeld
41caddd976
Merge pull request #4002 from FinnStutzenstein/aufrufliste 
first work on the call list
 2018-11-09 10:28:03 +01:00
FinnStutzenstein
c78de2138f planar call list and HTML cleanup 2018-11-09 10:11:57 +01:00
Jochen Saalfeld
8b9cbda178
Merge pull request #3978 from ostcar/websocket_url 
Set websocket url to /ws/
 2018-11-09 10:02:32 +01:00
Oskar Hahn
8ee9fb1742 Set websocket url to /ws 
The routing is desided by protocol
 2018-11-09 09:15:59 +01:00
Emanuel Schütze
128f17e7a4 Updated German translations and translatable strings 2018-11-08 18:50:06 +01:00
FinnStutzenstein
b25b5dc928 can_manage_metadata and categories on motion create 2018-11-08 15:51:26 +01:00
Finn Stutzenstein
9692c2b92e
Merge pull request #3913 from normanjaeckel/NewMotionMetadataPerm 
Added new permission to manage metadata
 2018-11-08 10:21:52 +01:00
Finn Stutzenstein
cf533d1174
Merge pull request #3914 from normanjaeckel/PasswordResetEMail 
Added PasswordResetView.
 2018-11-08 08:53:59 +01:00
Jochen Saalfeld
87dbf90922
fixing #3987 - postgreSQL migration possible again 2018-11-06 12:47:47 +01:00
Oskar Hahn
eead4efe6a Remove CollectionElement 
* Use user_id: int instead of Optional[CollectionElment] in utils
* Rewrote autoupdate system without CollectionElement
 2018-11-04 01:06:01 +01:00
Oskar Hahn
93dfd9ef67
Merge pull request #3973 from ostcar/test_with_redis 
add possebility to run tests with redis
 2018-11-03 20:54:55 +01:00
Oskar Hahn
f4f3ab9c49
Merge pull request #3972 from ostcar/websocket_use_restricted_data 
Fix error, that user get full_data when restricted_data_cache was enabled
 2018-11-03 20:53:52 +01:00
Oskar Hahn
cd34d30866 Remove utils.collections.Collection class and other cleanups 
* Activate restricted_data_cache on inmemory cache
* Use ElementCache in rest-api get requests
* Get requests on the restapi return 404 when the user has no permission
* Added async function for has_perm and in_some_groups
* changed Cachable.get_restricted_data to be an ansync function
* rewrote required_user_system
* changed default implementation of access_permission.check_permission to
  check a given permission or check if anonymous is enabled
 2018-11-03 20:48:19 +01:00
FinnStutzenstein
621b0471f2 Client: password reset view and reset password confirm view 2018-11-03 20:43:49 +01:00
Norman Jäckel
e03d715602 Added PasswordResetView. 2018-11-03 20:43:49 +01:00
Emanuel Schütze
2abf8e27ca Added missing migration file. Added permission to admin and staff group. 2018-11-03 20:17:41 +01:00
Norman Jäckel
af26dedfaf Added new permission to manage metadata. 2018-11-03 20:17:41 +01:00
Oskar Hahn
d11c7bbad7 add possebility to run tests with redis 2018-11-03 16:59:21 +01:00
Oskar Hahn
6480f1cee9 Fix error, that user got full_data when restricted_data_cache was enabled 2018-11-03 14:37:47 +01:00
Sean
a098e5c5c9
Merge pull request #3929 from FinnStutzenstein/motionComment 
motion comments in the motion detail view
 2018-11-02 18:46:16 +01:00
Oskar Hahn
b97e643b33 Fix error on to big change id on websocket connection 2018-11-02 05:12:20 +01:00
FinnStutzenstein
430dbc1dff motion comments and personal note in the motion detail view 2018-11-01 13:09:09 +01:00
Finn Stutzenstein
72e3df8b65
Merge pull request #3928 from normanjaeckel/StripResponse 
Strip out response.data.
 2018-11-01 07:59:59 +01:00
Norman Jäckel
30c0773838 Split up autoupdate functions (sync and async). 2018-10-30 13:07:24 +01:00
FinnStutzenstein
e59497bc54
Setting change recommendations internal 2018-10-29 20:33:40 +01:00
Oskar Hahn
b034839ac8 Remove old projector code 2018-10-29 13:10:15 +01:00
Oskar Hahn
0229bb923d Move websocket protocoll in apps 2018-10-29 12:33:15 +01:00
Norman Jäckel
6441347d10 Strip out response.data. 2018-10-29 08:52:52 +01:00
Oskar Hahn
c405b4b323 Use Protocol instead of ABC in cache_provicer 2018-10-28 10:37:16 +01:00
Oskar Hahn
b9e24016c1 Add test for second getElement request 2018-10-27 14:56:22 +02:00
Oskar Hahn
e7d14a8081 Change_id API 
* Improve AutoUpdateFormat
* Receive autoupdate requested via websocket
* Support change_id in query string
* Disable autoupdate at default
* Add websocket protocoll to turn on or off autoupdate
 2018-10-26 06:30:01 +02:00
Oskar Hahn
9eef4da21c remove old client 2018-10-25 16:04:28 +02:00
Maximilian Krambach
126a16b553 Implement tags 2018-10-24 11:23:34 +02:00
Oskar Hahn
5b5d0e395a new autoupdate format 2018-10-19 07:35:59 +02:00
Oskar Hahn
bc442210fb Improve redis cache 
* delete only keys with prefix
* Make redis_provider atomic with transactions and lua scripts
* improve lock
* generate change_id in redis to make sure it is uniq
* use miliseconds as starttime
* add argument use max_change_id to get_{full|resticted}_data
 2018-10-15 23:37:26 +02:00
Oskar Hahn
b1fa3ca263 Merge remote-tracking branch 'upstream/OpenSlides-3' into new-master 2018-10-13 07:38:09 +02:00
FinnStutzenstein
1e4eacecfd New superadmin group 2018-10-12 07:58:18 +02:00
FinnStutzenstein
f7d392f1fc New motion features 
- Added weight and sort_parent fields to the motion model
- Added motion sort view (adapted from agenda)
- Added statute-paragraph model and tests for it
- Added statute_paragraph foreign key to the motion model
- Created migrations for sorting and statute-paragraph
 2018-10-12 07:15:58 +02:00
FinnStutzenstein
b1ea59ea28 Motion comment section list 2018-10-09 13:57:55 +02:00
Emanuel Schütze
d4f9da9cdb
Merge pull request #3889 from FinnStutzenstein/fixImagePlugin 
Fix image plugin
 2018-09-24 13:06:50 +02:00
Oskar Hahn
9af6bf1606 ensures test on startup 2018-09-23 16:57:49 +02:00
FinnStutzenstein
eebd7a1fce Fix image plugin 2018-09-20 13:06:02 +02:00
Emanuel Schütze
dca94333e8 Update version to 2.3.1-dev 2018-09-20 09:27:03 +02:00
Emanuel Schütze
772c032357 Release 2.3 2018-09-20 09:24:34 +02:00
Emanuel Schütze
7b9d84dabd
Merge pull request #3886 from FinnStutzenstein/export-filename 
Fixed filenames in motion export dialog
 2018-09-18 19:37:02 +02:00
FinnStutzenstein
2815d5f62c Fixed filenames in motion export dialog 2018-09-18 15:03:55 +02:00
Emanuel Schütze
7a9921a85f Updated German translations. 2018-09-18 10:42:57 +02:00
FinnStutzenstein
f17951f363 Little fixes for current master (fixes #3883, fixes #3882, fixes #3880) 2018-09-18 09:49:40 +02:00
FinnStutzenstein
180dedfc38 Moved the collection of config variables before the generation of angular constants 2018-09-18 07:50:33 +02:00
FinnStutzenstein
1ee76de417 Handling of titles, projection and content objects in items 
Restructure the titles for motion, motion-block, assignment and topic.
Less possibilities for more clear code. Added mote base models enabling
functionalities of projection and being a content object for items
 2018-09-14 08:36:35 +02:00
FinnStutzenstein
3e0618063b Routing for the privacy policy and legal notice. 
Save those values in a new service, that will also watch for changes in
config variables. UI is not good; this can be done later

Share legal notice and privacy policy

Created some containers for them
 2018-09-10 11:39:46 +02:00
FinnStutzenstein
f1ddd16dc6 Motion rework 
- remove motion version
- migrations for versions and change recommendations
- Redone motion comments. Wording changed from comment fields to comment
  sections
- fixed test order, tests are not atomic
- introduce get_group_model. Just use OpenSlides Groups and not the
django's ones.
 2018-09-10 09:00:55 +02:00
Finn Stutzenstein
befbaba525
Merge pull request #3853 from FinnStutzenstein/workflowId 
Expose the workflow id during motion serialization
 2018-09-07 11:12:07 +02:00
Jochen Saalfeld
b5366ea90f
fixing pytest version and continue if db not available 2018-09-07 10:39:16 +02:00
FinnStutzenstein
9226874010 Expose the workflow id during motion serialization 2018-09-06 13:39:16 +02:00
FinnStutzenstein
ea71d0a942 moved privacy policy to users, adapt client 2018-09-04 08:57:54 +02:00
Oskar Hahn
732de97ec2 Make Consumer real async again 2018-09-04 08:57:50 +02:00
FinnStutzenstein
8adaa6118a Angular constants via WebSocket 
- new format for constants on the server
- adaptions for the old client
 2018-09-04 08:57:11 +02:00
Emanuel Schütze
865940bd12 Update version to 2.3b2-dev 2018-08-30 15:24:42 +02:00
Emanuel Schütze
90370ea628 Release 2.3b1 2018-08-30 15:24:42 +02:00
Emanuel Schütze
48537dbfbf Updated all translations. 2018-08-30 15:08:51 +02:00
Emanuel Schütze
6bae5cf87a Fixed translation strings and permission check. Updated Changelog. 2018-08-30 15:05:08 +02:00
Emanuel Schütze
1dd1a4bac8
Merge pull request #3832 from FinnStutzenstein/hideSortInAgenda 
Hide Sort button in agenda (closes #3812)
 2018-08-27 12:14:26 +02:00
FinnStutzenstein
d1b52a9302 Hide Sort button in agenda (closes #3812) 2018-08-27 11:24:52 +02:00
Emanuel Schütze
702bc67334 Change default for motion export dialog. 2018-08-24 16:14:01 +02:00
Emanuel Schütze
6c2fbf7389 Enable/disable category in motion PDF. 2018-08-24 14:00:53 +02:00
Oskar Hahn
dc7ca5e2c4 fix empty values in rest 2018-08-24 12:14:02 +02:00
Oskar Hahn
401e7821ae Merge remote-tracking branch 'upstream/master' into OpenSlides-3 2018-08-23 21:31:24 +02:00
Norman Jäckel
7dd7bb1b8d
Merge pull request #3807 from ostcar/websocket_protocol 
Add a protocol for websocket
 2018-08-23 21:15:48 +02:00
Norman Jäckel
39e27c740e
Merge pull request #3817 from ostcar/extra_requirements 
Add an easier way to install big_mode
 2018-08-23 21:05:31 +02:00
FinnStutzenstein
22f7d84cae New websocket message format for both clients 2018-08-23 21:02:59 +02:00
Oskar Hahn
fed6d6f435 Add a protocol for websocket 
{'type': STRING, 'content': ANY}
 2018-08-23 21:02:52 +02:00
Oskar Hahn
d21d7dc49e Add an easier way to install big_mode 2018-08-23 20:58:56 +02:00
Oskar Hahn
aac9dcabf5 drop python 3.5 2018-08-23 17:51:30 +02:00
Emanuel Schütze
96637e18c4
Merge pull request #3804 from normanjaeckel/ChangeCollectStatic 
Fixed collectstattic command so that it does not write into openslide…
 2018-08-23 17:38:26 +02:00
Emanuel Schütze
7d24066be7 Updated German translations. 2018-08-23 17:20:40 +02:00
Emanuel Schütze
c49eb8bf64
Merge pull request #3808 from FinnStutzenstein/diverses 
Layout changes for motion detail view and PDF
 2018-08-23 16:49:30 +02:00
FinnStutzenstein
cece35b3a5 Layout changes for motion detail view and PDF 2018-08-23 16:38:12 +02:00
Norman Jäckel
e012589ab0
Merge pull request #3814 from emanuelschuetze/fix3813 
Fixed TypeError in Motion and Assignment Slides (Fixed#3813)
 2018-08-23 15:48:15 +02:00
Emanuel Schütze
8ed043bbe8
Merge pull request #3806 from normanjaeckel/FixAgenda 
Fixed agenda get_restricted_data() if no agenda items exist.
 2018-08-23 15:47:34 +02:00
Norman Jäckel
3578d0e850 Fixed collectstattic command so that it does not write into openslides app dir. 2018-08-23 15:47:19 +02:00
Emanuel Schütze
c852f72c20
Merge pull request #3811 from normanjaeckel/ElectionBar 
Fixed assignment election bar for votes mode. Fixed #3598.
 2018-08-23 15:42:50 +02:00
Emanuel Schütze
0036567f7d Fixed TypeError in Motion and Assignment Slides (Fixed#3813) 
in MotionPollDecimalPlaces and AssignmentPollDecimalPlaces
 2018-08-23 15:39:15 +02:00
Finn Stutzenstein
172f1ed890
Merge pull request #3810 from emanuelschuetze/workflow-sorting 
Fix sorting of states in workflow detail view.
 2018-08-23 14:35:04 +02:00
Norman Jäckel
cbd970ba9d Fixed assignment election bar for votes mode. Fixed #3598. 2018-08-23 11:30:46 +02:00
Norman Jäckel
123b7c702b
Merge pull request #3803 from FinnStutzenstein/voting_decimal_places 
Support for decimal places in motion and assignment polls
 2018-08-23 11:28:26 +02:00
Emanuel Schütze
2cd8262025 Fix sorting of states in workflow detail view. 2018-08-23 11:12:53 +02:00
Norman Jäckel
dc4fd6a93e Fixed agenda get_restricted_data() if no agenda items exist. 2018-08-23 09:48:47 +02:00
Emanuel Schütze
768c97e89c
Merge pull request #3785 from FinnStutzenstein/no-changeable-first-state 
Do not allow changing a workflow's first state (closes #3778)
 2018-08-23 09:24:29 +02:00
FinnStutzenstein
9c1290ee0b Do not allow changing a workflow's first state (closes #3778) 2018-08-23 09:09:18 +02:00
FinnStutzenstein
9bac396b67 Support for decimal places in motion and assignment polls 2018-08-23 08:53:59 +02:00
Oskar Hahn
d09086f08c
Merge pull request #3798 from ostcar/url-schema 
New url schema
 2018-08-22 22:14:05 +02:00
Oskar Hahn
e5dd857e87 New url schema 2018-08-22 22:05:06 +02:00
Norman Jäckel
27e0564a23 Changed default agenda type for new topics. 2018-08-22 17:27:21 +02:00
Norman Jäckel
48a2a3fe53 Fixed settings creation for windows. 2018-08-22 16:51:46 +02:00
Norman Jäckel
07ffb3b6c5 Fixed settings creation for windows. 2018-08-22 12:39:59 +02:00
Oskar Hahn
10b3bb6497 Update to channels 2 
* geis does not work with channels2 and never will be (it has to be python now)
* pytest
* rewrote cache system
* use username instead of pk for admin user in tests
 2018-08-22 06:30:11 +02:00
Emanuel Schütze
6bbaf39bce Updated German translations. 2018-08-17 09:13:09 +02:00
FinnStutzenstein
65ec9cbf73 Layout changes, config for enabling amendments in motions table 
- fixed update form bug, explicit link to parent motion
- br space in pdf and motion-text (restrict to linenumbermode none)
 2018-08-17 08:38:41 +02:00
Emanuel Schütze
4605d4429c
Merge pull request #3790 from FinnStutzenstein/hidden-items 
New item type internal.
 2018-08-17 08:24:07 +02:00
FinnStutzenstein
1a17862d6b New item type internal. 
The old hidden type was used as internal, so everything is changed to
not be shown if the item is internal. hidden is "new", and actually
behaves as hidden now.
 2018-08-16 15:28:30 +02:00
Emanuel Schütze
32e20aa670
Merge pull request #3789 from FinnStutzenstein/redis-session 
Use newer version of django-redis-sessions, new settings format
 2018-08-15 11:45:52 +02:00
FinnStutzenstein
78dab97673 Use newer version of django-redis-sessions, new settings format 2018-08-15 11:37:20 +02:00
Emanuel Schütze
ab587b48cd Updated German translations. 2018-08-14 15:33:33 +02:00
Emanuel Schütze
4b6936572f
Merge pull request #3781 from FinnStutzenstein/modified-final-version 
New temporal field for editing the final version of a motion.
 2018-08-14 14:24:08 +02:00
FinnStutzenstein
e073084f74 New temporal field for editing the final version of a motion. 2018-08-14 14:15:11 +02:00
FinnStutzenstein
9f24ec559b Added missing templatehook for the voting plugin 2018-08-14 13:26:54 +02:00
Emanuel Schütze
e9ad439cdd
Merge pull request #3774 from FinnStutzenstein/abstain-no-for-assignment-votes 
Added general abstain/no fields for assignments. Used in votes mode.
 2018-08-14 09:34:37 +02:00
Oskar Hahn
92a39a3fc6 support python 3.7 
fix new pep8 stype
 2018-08-08 21:46:56 +02:00
Oskar Hahn
acceeff8f8 * Update python requirements 
* drop python 3.4
 2018-08-07 15:23:11 +02:00
FinnStutzenstein
bb654f7517 Added general abstain/no fields for assignments. Used in votes mode. 2018-07-28 12:29:26 +02:00
Sean Engelhardt
6e4665041e Added page numbers and categories in TOC of motion PDF. 2018-07-13 14:26:29 +02:00
Emanuel Schütze
732f5e7327 Updated German translations. 2018-07-13 13:47:13 +02:00
FinnStutzenstein
56cdfebe85 Added migrations for the available logos and move old values to new ones, remove old entries in the database 2018-07-13 13:20:22 +02:00
Sean Engelhardt
a6ed54eb92 Added new config options to show logos on the right side in motion PDF. 2018-07-13 13:19:55 +02:00
FinnStutzenstein
9e4cafd0f0 Custom workflows and states: 
- Added new workflow list view
 - Added state table for each workflow
 - Added new StateViewSet to handle states of workflows
 2018-07-13 10:29:06 +02:00
FinnStutzenstein
26d168110f make the privacy policy available for non logged in users (closes #3757) 2018-06-25 17:28:24 +02:00
Emanuel Schütze
8dca3b5321 Updated German translations. 
Changed some strings in source.
Fixed some regressions introduces by new sort-submitters and amendment features.
 2018-06-14 13:08:52 +02:00
Emanuel Schütze
5a5475299c
Merge pull request #3637 from CatoTH/Paragraph-Based-Amendments 
Paragraph based amendments / Diff
 2018-06-14 11:11:39 +02:00
Tobias Hößl
d9c08b65b7 New Feature: Paragraph based amendments 
With new amendment list table:
- Removed title from table, leadmotion can be selected now
- rename the new list, added the export dialog, multiselect actions and supporter badge in the amendment list view
- Moved collission detection to own factory, compute collissions in the amendment list view
- Delegates can now enter paragraph based amendments
- new amendment list as pdf/csv export
- improved caching of amendments
- Parse styles in headings and removed all double-quotes
- Performance improvements:
  * Removed ng-mouseover/mouseleave actions in amendment-list
  * disable collission detection in amendment list view.
  * Improved state/recommendation dropdown in amendment list.
 2018-06-14 11:01:03 +02:00
FinnStutzenstein
66c72f4345 Fixed remarks (closes #3760) 2018-06-14 07:24:55 +02:00
FinnStutzenstein
b0a42e19e1 Sort submitters 2018-06-13 14:16:25 +02:00
Emanuel Schütze
a5a8a1371e
Merge pull request #3748 from FinnStutzenstein/scrollProjectorToLine 
Scroll projector to a given line
 2018-06-12 13:31:19 +02:00
Emanuel Schütze
97bf5adc6a
Merge pull request #3749 from FinnStutzenstein/motionNumberingException 
Removed the ValidationError in motion numbering (fixed #3680)
 2018-06-12 13:06:29 +02:00
FinnStutzenstein
252ba02e86 Scroll projector to a given line 2018-06-12 13:02:22 +02:00
Emanuel Schütze
2c1ce6ff37 Update version to 2.3-dev. 2018-06-06 14:23:35 +02:00
Emanuel Schütze
8d64c586bc Release 2.2 2018-06-06 14:16:46 +02:00
Emanuel Schütze
407b640f80
Merge pull request #3740 from FinnStutzenstein/voting-plugin 
Changes for the voting plugin and usability improvements
 2018-05-29 15:02:37 +02:00
Emanuel Schütze
e4e6becf02 Updated all translations for 2.2 release. 2018-05-23 16:43:17 +02:00
Emanuel Schütze
1b321fb680
Merge pull request #3750 from FinnStutzenstein/assignmentPollInputs 
no negative votes and better scrolling in forms with number inputs (c…
 2018-05-23 15:58:01 +02:00
Jochen Saalfeld
9e66f05603
adding working privacy policy 
In order to archive GDPR compliance we need a privacy policy.
 2018-05-23 15:13:05 +02:00
FinnStutzenstein
e4735b9437 no negative votes and better scrolling in forms with number inputs (closes #3739) 2018-05-22 14:30:25 +02:00
FinnStutzenstein
5833393268 Messaging docstring and user callback 
only hide votes for unpublished polls
 2018-05-22 09:20:19 +02:00
FinnStutzenstein
562d620851 Removed the ValidationError in motion numbering (fixed #3680) 2018-05-22 07:44:21 +02:00
Emanuel Schütze
682a5eea5a Minor template improvements and fixes 
- Fix back-to-motion-block-link in item detail view.
- Show projector name in window title.
- Fix sorting for motion blocks and categories in motion list view.
- Fix missing permission check for editing motion block.
- Improved style of rejected CR in motionn detail view.
 2018-05-16 17:50:24 +02:00
Emanuel Schütze
8d7bcedd32
Merge pull request #3746 from FinnStutzenstein/pdfImageErrors 
Throw errors, if the pds generation fails, if an image could not be l…
 2018-05-16 17:24:52 +02:00
FinnStutzenstein
ecb76fd888 Throw errors if pdf generation fails, if an image could not be loaded (fixes #3730) 2018-05-16 17:06:42 +02:00
FinnStutzenstein
185055d604 Autoupdate with affected users on group delete (fixes #3455) 2018-05-16 13:03:37 +02:00
Emanuel Schütze
f8df7ddda6
Merge pull request #3742 from FinnStutzenstein/deleteUserChache 
Delete restricted data cache on permission changes (closes #3396)
 2018-05-16 12:39:40 +02:00
FinnStutzenstein
0fd1cd688b Fixed logic for saving motion comments 2018-05-16 11:54:46 +02:00
FinnStutzenstein
2989024cca Delete restricted data cache on permission changes (closes #3396) 2018-05-16 10:59:00 +02:00
Emanuel Schütze
a7af01b507
Merge pull request #3738 from FinnStutzenstein/moveCode 
fixed #3708
 2018-05-15 09:35:14 +02:00
FinnStutzenstein
c7a2f5c47c Fixed percentage for special values (fixes #3736), added config to couple the candidates with the list of speakers (closes #3737) 2018-05-11 15:15:53 +02:00
FinnStutzenstein
f1ab2b3afc fixed #3708 2018-05-09 08:48:37 +02:00
FinnStutzenstein
0a141adbd1 Fixes for the item projection (fixes #3733) 2018-05-04 10:27:39 +02:00
Emanuel Schütze
7b9d8d11a6
Merge pull request #3732 from FinnStutzenstein/MotionProjectorFix 
Fixed deleted comment fields
 2018-05-04 09:34:08 +02:00
FinnStutzenstein
d189e5bca8 Fixed deleted comment fields 2018-05-03 17:26:47 +02:00
Emanuel Schütze
cb42af7c8b
Merge pull request #3731 from FinnStutzenstein/MotionCommentsInlineEditingFix 
Fixed wrong index for inline editors
 2018-05-02 20:18:54 +02:00
FinnStutzenstein
902ca96a16 Fixed wrong index for inline editors 2018-05-02 15:35:49 +02:00
Emanuel Schütze
b37bad72ef
Merge pull request #3729 from FinnStutzenstein/pdfImageSize 
Fixed parsing of image sizes
 2018-05-02 13:53:34 +02:00
FinnStutzenstein
06ddd8ee46 Fixed parsing of image sizes 2018-05-02 13:44:35 +02:00
Emanuel Schütze
cc5a1ea0fe
Merge pull request #3702 from FinnStutzenstein/motionAgendaTitle 
new style for motion agenda title
 2018-05-02 13:37:44 +02:00
FinnStutzenstein
754040570d New style for motion agenda title and list of speakers 
Improved list of speakers slide title:
- h2 subtitle: use always motion identifier only (like in motion slides)
- h1 title: use always "list of speakers" (long motion title not useful
  if an other projector shows the motion slide with full title
  (identifier is enough)
 2018-05-02 13:29:59 +02:00
FinnStutzenstein
0224c4287a Fixed stylistic remarks from #3682 (fixes #3709) 2018-05-02 10:13:45 +02:00
Emanuel Schütze
d522e8e308 Updated German translations. 2018-04-25 16:01:59 +02:00
Emanuel Schütze
bf27b6f016
Merge pull request #3723 from emanuelschuetze/fixes 
Template improvements
 2018-04-25 16:01:21 +02:00
Emanuel Schütze
ef2a22fefe Template improvements 
- Show item duration and done for normal users correctly.
- Fixed CSS class for countdown warning time.
- Improved projector manage button layout.
- Updated fontawsome icons to 4.7.
- Fixed iframe width/height to show border correctly.
- Improved 'close list of speakers' button.
- Improved 'clear all filter' icons.
- Fixed election pdf if candidate was deleted.
- Moved ban icon for internal icons.
- Improved edit projector form. Show simple scaling steps instead of
  width/height resolution.
- Consolidated both agenda item filters.
- Used better sort icon.
- Installed colordialog plugin for ckeditor to select more colors.
- Several css improvements.
 2018-04-25 15:47:39 +02:00
Emanuel Schütze
8680d4af85
Merge pull request #3722 from FinnStutzenstein/betterProjectorButton 
precalculate projectorchanges in the client
 2018-04-25 14:13:52 +02:00
FinnStutzenstein
08045638ab precalculate projectorchanges in the client 2018-04-25 11:08:23 +02:00
Sean Engelhardt
85e329b9b3 add template hook in user div 2018-04-24 11:53:31 +02:00
Emanuel Schütze
231d8de036
Merge pull request #3719 from FinnStutzenstein/changeMediafileProtectionLogicAgain 
Changed mediafile protection logic (closes #3707)
 2018-04-24 11:48:21 +02:00
Emanuel Schütze
334a6880b5
Merge pull request #3718 from FinnStutzenstein/autoupdateAmendments 
Watch for changes of amendments in the motion detail view.
 2018-04-24 11:38:56 +02:00
Emanuel Schütze
15d8a5fbc0
Merge pull request #3717 from FinnStutzenstein/motionProjectorRequirements 
Added motions from state and recommendation to the projector requirem…
 2018-04-24 11:33:48 +02:00
FinnStutzenstein
2220856e5d Changed mediafile protection logic (closes #3707) 2018-04-24 11:32:17 +02:00
FinnStutzenstein
07f3880ad3 Watch for changes of amendments in the motion detail view. 2018-04-24 11:27:33 +02:00
FinnStutzenstein
d4a9751474 Added motions from state and recommendation to the projector requirements 2018-04-24 11:22:24 +02:00
FinnStutzenstein
83edfc2af0 Remove projector from projector-all 2018-04-24 11:20:15 +02:00
FinnStutzenstein
10038b782f One request for each projection. Added some validation for clear_elements and prune_elements 2018-04-24 10:23:28 +02:00
Emanuel Schütze
03b17837ed Update version to 2.2b4-dev 2018-04-13 16:08:01 +02:00
Emanuel Schütze
a0ac02d391 Release 2.2b3 2018-04-13 16:07:33 +02:00
Emanuel Schütze
13921da15b Updated German translations. 2018-04-13 15:21:26 +02:00
Emanuel Schütze
b6ebc78e85
Merge pull request #3682 from FinnStutzenstein/voting-plugin 
Changes for the voting plugin
 2018-04-13 15:11:48 +02:00
Emanuel Schütze
a6537fb919
Merge pull request #3695 from FinnStutzenstein/fixRemarks 
fixed remarks from #3525 (closes #3681)
 2018-04-13 15:07:05 +02:00
Emanuel Schütze
11ba5a7c37
Merge pull request #3704 from emanuelschuetze/fixRecommendationExtensionField 
Add missing permission check for recommendation extension field.
 2018-04-13 14:21:47 +02:00
Emanuel Schütze
b95a76493d
Merge pull request #3697 from FinnStutzenstein/protectNumbering 
Protect numbering of the agenda
 2018-04-13 14:21:06 +02:00
Emanuel Schütze
4a2410a596
Merge pull request #3700 from FinnStutzenstein/titleInMotionBlockSlide 
Added a short title in the motion block slide
 2018-04-13 14:20:31 +02:00
FinnStutzenstein
595bcab845 Added shortened motion title to motion block slide. 2018-04-13 10:13:17 +02:00
FinnStutzenstein
fa5b81dad8 Protect numbering of the agenda 2018-04-13 10:09:22 +02:00
Emanuel Schütze
71b3cc181f
Merge pull request #3698 from FinnStutzenstein/topPagination 
Proposal for top pagenavigation
 2018-04-13 10:06:01 +02:00
Emanuel Schütze
22975b75e5
Merge pull request #3701 from FinnStutzenstein/agendaConfigHiddenItems 
Config variable to hide internal items on projector
 2018-04-13 10:04:54 +02:00
Emanuel Schütze
384a7869ec
Merge pull request #3699 from FinnStutzenstein/attachmentsOrder 
Order attachments by title
 2018-04-13 10:00:48 +02:00
FinnStutzenstein
094fa4da84 Added pagination on top of lists (Fixed #3667). 2018-04-13 09:51:14 +02:00
Emanuel Schütze
cdea91c780 Add missing permission check for recommendation extension field. 2018-04-13 09:42:07 +02:00
FinnStutzenstein
fe5308505d Config variable for hiding internal items on projector 2018-04-11 13:46:40 +02:00
FinnStutzenstein
30b307d309 Order attachments by title 2018-04-11 12:56:34 +02:00
FinnStutzenstein
6463af4b10 fixed remarks from #3525 (closes #3681) 2018-04-11 10:56:49 +02:00
FinnStutzenstein
a17c853d67 Removed todo (closes #3580). 
For explaination see the issue.
 2018-04-11 10:39:44 +02:00
FinnStutzenstein
2256031184 Changes for the voting plugin 
- new-style template hooks. See changes in the template hook documentation
- reordered user list view to get more space for extra things
- added template hooks.
 2018-04-11 10:31:48 +02:00
Emanuel Schütze
f57038253f Updated German translaitons. 2018-04-11 08:06:14 +02:00
Emanuel Schütze
5a8bfbd403
Merge pull request #3692 from emanuelschuetze/issue3588 
New config to hide motion meta information box on projector (Fixed #3588)
 2018-04-11 08:02:42 +02:00
Emanuel Schütze
8c1c6241d1 New config to hide motion meta information box on projector (Fixed #3588). 2018-04-11 07:52:40 +02:00
Emanuel Schütze
ad959f7856
Merge pull request #3691 from emanuelschuetze/exportButton 
Use simple pdf export button for delegates.
 2018-04-11 07:39:38 +02:00
Emanuel Schütze
04843294ac Use simple pdf export button for delegates. 
Don't use drop down list with one entry only.
Show agenda docx entry for managers only.
 2018-04-10 15:25:34 +02:00
Emanuel Schütze
ca21401384 Linebreak protection for motion sidebox (Fixed #3593). 2018-04-10 14:48:00 +02:00
Emanuel Schütze
9e2c6a14fa
Merge pull request #3685 from FinnStutzenstein/fixedMotionSlide 
Fixed motion slide not showing any diffs
 2018-04-10 14:00:30 +02:00