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

4208 Commits

Author SHA1 Message Date
Emanuel Schütze
4174f70d2b
Merge pull request #4448 from normanjaeckel/SetStateView 
Set state view
 2019-03-04 11:17:33 +01:00
Norman Jäckel
e22274653d Added identifier to saved fields on multiple state management. 2019-03-01 21:11:27 +01:00
Norman Jäckel
c21d8be108 Revert "fix identifier setting on mass setstate" 
This reverts commit e870ed495a.
 2019-03-01 21:09:01 +01:00
Norman Jäckel
9eec2404dd Fixed on_delete field attr. Fixed #4405 2019-03-01 20:53:01 +01:00
FinnStutzenstein
d0e6681aad One global clos reference. More projector buttons for the clos view 2019-03-01 13:17:26 +01:00
FinnStutzenstein
ab0955d890 Fixed countdown model 2019-03-01 12:10:49 +01:00
Maximilian Krambach
44d16eb244 countdown: new title field, description optional 2019-03-01 11:22:09 +01:00
FinnStutzenstein
3f77cc7b24 Add item number to topic title, hide clos slide for one projector 2019-03-01 10:26:52 +01:00
FinnStutzenstein
85903dbb44 Hotfix for #4408 2019-02-28 09:09:32 +01:00
Emanuel Schütze
e59327efd5
Merge pull request #4421 from MaximilianKrambach/setMultiStateFix 
fix identifier setting on mass setstate
 2019-02-27 22:31:18 +01:00
Emanuel Schütze
367df3b095
Merge pull request #4409 from FinnStutzenstein/motionBlockSlide 
Add referenced motions by the server (fixes #4383)
 2019-02-27 22:22:11 +01:00
Norman Jäckel
197ff7264c Fixed deletion of motions with change recommendations. Fixed #4415. 2019-02-27 20:16:51 +01:00
Maximilian Krambach
e870ed495a fix identifier setting on mass setstate 2019-02-27 18:14:25 +01:00
FinnStutzenstein
4cde0431ab Add referenced motions by the server (fixes #4383) 2019-02-27 07:35:52 +01:00
FinnStutzenstein
f039293c09 current speaker chyron 2019-02-26 21:56:59 +01:00
Emanuel Schütze
4d62d99099 Fixes 
- use always color black on projector, also in dark mode
- show border for projector preview
- Fix projector logo margin by using img instead of os-logo
- Use also 'username' in invitation email subject
 2019-02-25 18:26:27 +01:00
Emanuel Schütze
889aad48ed
Merge pull request #4395 from FinnStutzenstein/fixAgendaItemDeletion 
Fixed deletion of agenda items.
 2019-02-25 11:54:21 +01:00
FinnStutzenstein
70d7f49afe Fixed deletion of agenda items. 
Introduced by #4352
 2019-02-25 11:29:01 +01:00
Jochen Saalfeld
f546cd9e27
increasing default upload size 2019-02-25 09:28:32 +01:00
FinnStutzenstein
63f1802d7a (Current) list of speaker slide 2019-02-22 10:40:28 +01:00
FinnStutzenstein
3f58538afb Agenda item list slide 2019-02-21 21:56:40 +01:00
Emanuel Schütze
80a061db38 Motion block slide template 2019-02-21 15:06:14 +01:00
FinnStutzenstein
2abe71313c Motion block slide 2019-02-21 14:01:02 +01:00
Emanuel Schütze
650054dfc9
Merge pull request #4373 from normanjaeckel/HistoryPermission 
Added new permission to see the history.
 2019-02-21 13:07:07 +01:00
FinnStutzenstein
7ef36e93c6 List of speakers slide 2019-02-21 12:34:41 +01:00
Norman Jäckel
d06a4a5c6d Added new permission to see the history. 2019-02-21 11:45:40 +01:00
Norman Jäckel
4b6ce77d36 Reset logo configs if logo is deleted. 2019-02-19 21:45:41 +01:00
Emanuel Schütze
c1a818a368
Merge pull request #4370 from normanjaeckel/FixAgendaHidden 
Fixed permission check for hidden and internal items.
 2019-02-19 19:55:33 +01:00
Emanuel Schütze
8ab66418ac
Merge pull request #4369 from normanjaeckel/HistoryForMotionChangeRecommendations 
Added history information for motion change recommendations.
 2019-02-19 17:26:31 +01:00
Norman Jäckel
6585c072ae Fixed permission check for hidden and internal items. 2019-02-19 14:04:49 +01:00
Norman Jäckel
085d2f58cb Added history information for motion change recommendations. 2019-02-19 13:41:31 +01:00
Maximilian Krambach
4c8da7b04d minor improvements 
- add a 'lock' symbol to hidden files
- default disable (and rename) hidden filter status
- limit display of workflow states for restricted users
- remove supporter sorting
- mark other strings for translation
- fix new workflow id for statute amendments
- remove csv file type check (on Windows file type is always empty)
 2019-02-19 13:05:51 +01:00
Emanuel Schütze
c9c4566c08 several fixes and improvements 
- Add projector logo/headerimage
- Fixed opening multiselect action menu for users.
- Used defined toolbar color for multiselect mode.
- (server) Added check for 'request.data._mutable = True' to edit user
  profile as normal user.
 2019-02-18 16:40:46 +01:00
Tobias Hößl
7b2e116f51 Change reco default value, Slide test cases 2019-02-15 15:15:58 +01:00
FinnStutzenstein
35cd49e4fe read crmode from the projector element 2019-02-15 14:56:41 +01:00
Tobias Hößl
453fedbc3e Initial support for line numbering and change recommendations in Projector 
Read projector settings from the config
Preamble, styling fixes
Styling fixes
Show amendments inside of the motion view
Amendment view
Projector and statute paragraphs
Bugfix: Imports
 2019-02-15 14:56:40 +01:00
FinnStutzenstein
d1508161d2 Basic mediafile slide 2019-02-15 14:41:56 +01:00
Maximilian Krambach
edd22eeef6
Merge pull request #4348 from MaximilianKrambach/fixStatute 
fix statute paragraph creation for delegates
 2019-02-15 12:38:47 +01:00
Finn Stutzenstein
9e794c4669
Merge pull request #4344 from FinnStutzenstein/countdowns 
Countdown slide and controls
 2019-02-15 12:37:23 +01:00
FinnStutzenstein
2801e28704 Countdown slide and controls 2019-02-15 12:21:23 +01:00
Maximilian Krambach
3262dd0da8 fix statute paragraph creation for delegates 2019-02-15 12:11:54 +01:00
Maximilian Krambach
6b58541079 pdf export options 
- export comments as own pdf
- export comments as  part of an advanced motion pdf export,
- change sequential number export options for pdf and csv
 2019-02-14 18:22:25 +01:00
Maximilian Krambach
59ed906a36 user sorting by config 2019-02-14 10:53:13 +01:00
Emanuel Schütze
c77075f807 Topic slide 2019-02-14 08:14:50 +01:00
FinnStutzenstein
06147affe5 Separate motion state access level migration 2019-02-12 10:10:40 +01:00
Emanuel Schütze
b5294cc5fd
Merge pull request #4289 from FinnStutzenstein/resetPassword 
Rework the reset password component (fixes #4079)
 2019-02-10 11:54:52 +01:00
FinnStutzenstein
6a33b68a41 Rework the reset password component (fixes #4079) 2019-02-10 11:36:01 +01:00
Oskar Hahn
7e25a858d4 Fix projector error message 2019-02-10 10:50:18 +01:00
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