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

993 Commits

Author SHA1 Message Date
GabrielMeyer
26cc6556a0 Implementation of exporting submitters and recommendation 
The user can choose the option to export the informtion about submitters and the recommendation including the extension of motions to the 'table of contents'.
 2019-06-14 13:59:19 +02:00
FinnStutzenstein
bf9973a4a7 Subcategories 2019-06-12 14:37:19 +02:00
Emanuel Schütze
708de917e1 Updated translations 2019-05-31 11:09:31 +02:00
FinnStutzenstein
658b1a360d Internal flag for motion blocks 
- ServerSide
- Adds the 'internal'-flag to the edit view of motion blocks
 2019-05-28 15:24:22 +02:00
FinnStutzenstein
9f12763f8b Split AgendaItem and ListOfSpeakers 
Server:
- ListOfSpeakers (LOS) is now a speprate model, containing of an id,
speakers, closed and a content_object.
- Moved all speaker related views from ItemViewSet to the new
ListOfSpeakersViewSet.
- Make Mixins for content objects of items and lists of speakers.
- Migrations: Move the lists of speakers from items to the LOS model.

Client:
- Removed the speaker repo and moved functionality to the new
ListOfSpeakersRepositoryService.
- Splitted base classes for agenda item content objects to items and
LOS.
- CurrentAgendaItemService -> CurrentListOfSpeakersSerivce
- Cleaned up the list of speakers component.
 2019-05-24 08:21:59 +02:00
Emanuel Schütze
0a99c2b0f5
Merge pull request #4722 from FinnStutzenstein/motionTextNotRequiredForParagraphAmendments 
Do not require the motion text for paragraph based amendments
 2019-05-20 21:46:15 +02:00
FinnStutzenstein
11fd8c5762 Do not require the motion text for paragraph based amendments 2019-05-20 20:47:28 +02:00
Emanuel Schütze
bcd7a3d74f
Merge pull request #4723 from FinnStutzenstein/preventDeletionOfLastWorkflow 
prevent deletion of last workflow and update configs on deletion
 2019-05-20 20:43:38 +02:00
FinnStutzenstein
6f798357fa prevent deletion of last workflow and update configs on deletion 2019-05-20 12:54:20 +02:00
Sean Engelhardt
850fcbe243 Rework sort and filter 
More observable based, more scaleable filtering
based on an old branch of @FinnStutzenstein.

cleans some functions and provides some differend features.
 2019-05-17 13:03:48 +02:00
Finn Stutzenstein
0ed00ff603
Merge pull request #4703 from normanjaeckel/ChangeDefaultWorkflows 
Changed default workflows.
 2019-05-15 15:54:31 +02:00
FinnStutzenstein
284e90961a Fixed getting states of amendments (closes #4677) 2019-05-15 15:21:11 +02:00
Norman Jäckel
349fe49e1c Changed default workflows. 2019-05-15 15:18:43 +02:00
Norman Jäckel
cf29f97613 Added view for bulk category set and bulk motion block set. 
Due to rebasing this PR, this are the appropriate authorships:
Server: @normanjaeckel and @FinnStutzenstein
Client: @MaximilianKrambach
 2019-05-15 14:18:36 +02:00
FinnStutzenstein
f9bac798aa Rename the manage restriction field 
Renamed 'managers_only' to 'motions.can_maange' to adapt the (new) behavior of #4638. Closes #4643.
 2019-05-14 16:02:59 +02:00
FinnStutzenstein
f53d3c2069 Fix numbering with amendments 2019-05-07 16:12:47 +02:00
Emanuel Schütze
9f5226c1d9
Merge pull request #4648 from FinnStutzenstein/motionBlockSlideTwoColumns 
Dynamic a two column layout in motion block slides
 2019-04-30 16:38:58 +02:00
FinnStutzenstein
76880100f5 Sort motions in categories 2019-04-30 14:14:41 +02:00
FinnStutzenstein
c234cfe698 Dynamic a two column layout in motion block slides 2019-04-29 11:20:12 +02:00
Norman Jäckel
3d6e87e1ef Server should not require restriction field for motion state. Fixed #4622. 2019-04-27 16:23:31 +02:00
FinnStutzenstein
7cfe22436e Fixed motion state and restriction 
- Fixed restriction check for motions
- Send users via autoupdate on statechanges
 2019-04-26 15:57:21 +02:00
FinnStutzenstein
3eb5273b8e send autoupdate on state update for motions 2019-04-16 15:45:59 +02:00
FinnStutzenstein
ce216204f1 Updates the cache on comment section updates. Implements missing client 
code.
 2019-04-15 10:54:34 +02:00
Emanuel Schütze
58b5ec3f5e
Merge pull request #4573 from CatoTH/OS3-multi-paragraph-amendments 
Creating multi-paragraph amendments
 2019-04-11 21:18:16 +02:00
Tobias Hößl
5978868c37 Creating multi-paragraph amendments 
- new config option to enable/disable multiple paragraphs
 2019-04-11 17:00:25 +02:00
FinnStutzenstein
23264849c9 client and small changes in the serializer 2019-04-08 14:56:32 +02:00
Norman Jäckel
6f24b7c169 Refactored state access level by renaming state field to restriction. 2019-04-08 14:56:14 +02:00
Emanuel Schütze
3fd5d19daa
Merge pull request #4531 from ostcar/fix_config_key_to_id 
Fixes problems with config.key_to_id
 2019-04-08 09:02:52 +02:00
Sean Engelhardt
bd33c59ddf Add permissions to ListViews 
Adds the AuthGuard to certain routes
Adds an error-component
Also hides certain other elements where
permissions should apply
 2019-04-06 21:13:17 +02:00
Oskar Hahn
41aed15426 Make the projector-system explicit async. 
Also lock config.build_key_to_id
 2019-04-06 06:40:15 +02:00
Finn Stutzenstein
2f10fad375
Merge pull request #4553 from FinnStutzenstein/removeMotionLogs 
Remove motion logs
 2019-04-02 12:12:31 +02:00
FinnStutzenstein
4308de3164 Remove motion logs 2019-04-01 09:04:22 +02:00
Norman Jäckel
861dc1c02e Fixed bug that motion reason is required if respective config value is set. 2019-03-30 15:00:54 +01:00
Emanuel Schütze
a3ed1ae00c
Merge pull request #4518 from normanjaeckel/NewPermInternalMotions 
Added new permission to see motions in internal state (so called auth…
 2019-03-20 13:03:48 +01:00
Norman Jäckel
16cde2cd96 Added new permission to see motions in internal state (so called authorized users). 2019-03-20 12:47:26 +01:00
Norman Jäckel
94080df663
Merge pull request #4517 from emanuelschuetze/fixComments 
Fixed permission check for manage comments
 2019-03-20 08:47:11 +01:00
Emanuel Schütze
a20803401f Fixed permission check for manage comments 2019-03-19 21:26:28 +01:00
GabrielMeyer
76d760bd41 Replaces the old angular2tree with a custom drag&drop tree 
Calculates the direction of the moving.

Finishes the moving of nodes in same level

Adds some style

Sets the padding dynamically

Adds placeholder depends on the horizontal movement

Set the placeholder at the correct place, so the user can see, where he will drop the moved node

Finishes moving of nodes

- Old parents change their option to expand.
- New parents change their option to expand.
- If the user moves a node between nodes with a higher level, the node will be moved to the next index with same or lower level.

Fixes the visibility of moved node

- If the new parent is not visible, the moved node will not be seen.

If the user moves an expanded node, the new parent should expanded, too, if it's not already.

Sending successfully data to the server

- Sorting the items

Handles moving nodes between parent and children

- If the user moves a node between a parent and its children, the children will be relinked to the moved node as their new parent.

Replaces the old `sorting-tree` to a new one

- The new `sorted-tree` replaces the old `sorting-tree`.
- The old package `angular-tree-component` was removed.
- The user will only see the buttons to save or cancel his changes, if he made changes.
- The buttons, that do not work currently, were removed.

Adds a guard to check if the user made changes.

- If the user made changes but he has not saved them, then there is a dialog that will prompt to ask for confirmation.

Before cancelling the changes the user has to confirm this.
 2019-03-19 13:19:35 +01:00
Norman Jäckel
8f50caf481 Hotfix for #4491: Autoupdate for motion when change recommendation changes. 2019-03-13 09:40:04 +01:00
Tobias Hößl
6b685924d9 Bugfix: Amendment statuses 2019-03-09 22:48:21 +01:00
FinnStutzenstein
138a52d278 Fix blanks for amendments 2019-03-08 11:05:42 +01:00
FinnStutzenstein
ed4b1c80f1 Replace recommendation on client and server for motion slide 2019-03-07 08:52:33 +01:00
FinnStutzenstein
ecdfdf4b87 Resort python import for isort 4.3.11 (fixes #4467) 
One dot imports are again behind two dot imports since this new isort
release.
 2019-03-06 14:54:03 +01:00
FinnStutzenstein
20e2639323 set allow_null for integerfields, when they are not required 2019-03-05 14:23:01 +01:00
Oskar Hahn
dd4754d045 Disable the future-lock when updating the restircted data cache 
Before this commit, there where two different locks when updating the restricted
data cache. A future lock, what is faster but only works in the same thread. The
other lock is in redis, it is not so fast, but also works in many threads.

The future lock was buggy, because on a second call of update_restricted_data
the same future was reused. So on the second run, the future was already done.

I don't see any way to delete. The last client would have to delete it, but there
is no way to find out which client the last one is.
 2019-03-04 21:37:00 +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
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
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
63f1802d7a (Current) list of speaker slide 2019-02-22 10:40:28 +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
FinnStutzenstein
7ef36e93c6 List of speakers slide 2019-02-21 12:34:41 +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
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
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
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
FinnStutzenstein
06147affe5 Separate motion state access level migration 2019-02-12 10:10:40 +01:00
Maximilian Krambach
c487d688f6 sort categories in dropdowns 2019-02-08 14:37:58 +01:00
FinnStutzenstein
3ba8636acf Allow motions to go a state back 2019-02-08 11:58:11 +01:00
FinnStutzenstein
35056f5ccc seperate motion version migration operations 2019-02-07 09:28:12 +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
617eccb85f New config to set reason field required. 2019-02-01 09:53:38 +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
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
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
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
33d9468e6b
Merge pull request #4153 from normanjaeckel/RecExtension 
Fixed following recommendations with extensions.
 2019-01-20 10:21:56 +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
FinnStutzenstein
74e0bea108 Wirst work for the projector system on the client 2019-01-19 21:26:05 +01:00
Norman Jäckel
9db12293a3 Added history information for some motion views. 2019-01-19 16:41:58 +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
27cb63174e
Merge pull request #4134 from normanjaeckel/MotionCreatedTimestamp 
Added timestamp fields for motions.
 2019-01-19 14:23:21 +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
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
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
Oskar Hahn
b329115007 use f-string syntax for strings 2019-01-18 17:37:36 +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
Oskar Hahn
eddbd86d3a Run black 2019-01-08 21:51:52 +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
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