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

4171 Commits

Author SHA1 Message Date
Emanuel Schütze
8072c26983
Merge pull request #4586 from FinnStutzenstein/unsetFontOnDelete 
Unset font if the mediafile is deleted
 2019-04-11 23:14:51 +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
Norman Jäckel
8927982554 Fixed countdown on projector. 2019-04-10 08:48:57 +02:00
FinnStutzenstein
648aabc310 Unset font if the mediafile is deleted 2019-04-09 19:38:01 +02:00
FinnStutzenstein
5a1f638f8d Protect element fields from the projector model. Fixes creation of 
projectors.
 2019-04-09 17:15:16 +02:00
Finn Stutzenstein
fc5f6f4e54
Merge pull request #4521 from normanjaeckel/RefactorStateAccessLevel 
Refactored state access level by renaming state field to restriction.
 2019-04-08 15:28:21 +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
Maximilian Krambach
6f62e5c7e4
Merge pull request #4537 from MaximilianKrambach/assignments 
assignment detail and list views
 2019-04-08 10:25:56 +02:00
Maximilian Krambach
464fb89b53 include per-poll values, some travis fix 2019-04-08 10:16:47 +02:00
Norman Jäckel
e6daf32924 Added check for double serializer class registering. 
Removed AssignmentShortPollSerializer.
 2019-04-08 10:16:47 +02:00
Maximilian Krambach
52193e9fb2 Assignments 2019-04-08 10:16:46 +02:00
Gernot Schulz
58a0da7945 Fix typo in SESSION_REDIS configuration 2019-04-08 09:52:04 +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
Norman Jäckel
aa9af9db8c
Merge pull request #4557 from FinnStutzenstein/removeUnnecessaryView 
Remove unnecessary view (fixed #4549)
 2019-04-05 12:44:36 +02:00
Emanuel Schütze
6364a04d22
Merge pull request #4562 from FinnStutzenstein/redisSessionTimeout 
Set a longer socket timeout for redis session
 2019-04-03 22:13:52 +02:00
Emanuel Schütze
ab0e83ff0b
Merge pull request #4563 from FinnStutzenstein/catchEmailExceptions 
Catch more email exceptiopns
 2019-04-03 21:22:21 +02:00
Emanuel Schütze
58e0e4155e
Merge pull request #4556 from FinnStutzenstein/postgresAuthGroupSequence 
Restart the AuthGroup id sequence on postgres
 2019-04-03 21:16:42 +02:00
FinnStutzenstein
b058bda4f6 Catch more email exceptiopns 2019-04-02 16:08:52 +02:00
FinnStutzenstein
231cb60f5a Set a longer socket timeout for redis session 
Related to #4555
 2019-04-02 14:24:39 +02:00
Finn Stutzenstein
29762ad89e
Merge pull request #4541 from FinnStutzenstein/projectionDefaults2 
Projectiondefaults, width slider direct save
 2019-04-02 12:30:20 +02:00
Finn Stutzenstein
2f10fad375
Merge pull request #4553 from FinnStutzenstein/removeMotionLogs 
Remove motion logs
 2019-04-02 12:12:31 +02:00
FinnStutzenstein
d3e98ac158 Remove unnecessary view (fixed #4549) 2019-04-02 12:11:26 +02:00
Emanuel Schütze
ff41aa8061
Merge pull request #4551 from normanjaeckel/MotionReasonRequired 
Fixed bug that motion reason is required if respective config value i…
 2019-04-02 11:08:44 +02:00
FinnStutzenstein
018df697fa Restart the AuthGroup id sequence on postgres 2019-04-02 07:51:13 +02:00
FinnStutzenstein
4308de3164 Remove motion logs 2019-04-01 09:04:22 +02:00
FinnStutzenstein
cee6d55b82 Projectiondefaults, width slider direct save 2019-04-01 08:48:52 +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
Oskar Hahn
206eb9bcba decode only the needed data when calculating the required users 2019-03-29 22:38:12 +01:00
Oskar Hahn
77a1975369 Use redis connection pool 2019-03-27 22:51:33 +01:00
Emanuel Schütze
fbbd5fa135
Merge pull request #4516 from normanjaeckel/FixCommands 
Fixed commands.
 2019-03-20 13:19:09 +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
35198f6e64 Fixed commands. 2019-03-20 08:50:57 +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
Emanuel Schütze
4950ca084f
Merge pull request #4507 from normanjaeckel/ManyToManyMigrationsFix 
Hotfix for #4501: Skipped many to many related objects autoupdate sig…
 2019-03-14 11:34:48 +01:00
Norman Jäckel
baacda2b8e Hotfix for #4501: Skipped many to many related objects autoupdate signal during migrations. 2019-03-13 10:58:01 +01:00
Norman Jäckel
8f50caf481 Hotfix for #4491: Autoupdate for motion when change recommendation changes. 2019-03-13 09:40:04 +01:00
FinnStutzenstein
eb4537c1bf rework login system (again) 2019-03-11 13:45:17 +01:00
Emanuel Schütze
0419ea629f
Merge pull request #4487 from CatoTH/OS3-Bugfix-Amendment-Status-Handling 
Bugfix: Amendment statuses
 2019-03-09 23:14:29 +01:00
Tobias Hößl
6b685924d9 Bugfix: Amendment statuses 2019-03-09 22:48:21 +01:00
Emanuel Schütze
2e2bf9bf54
Merge pull request #4482 from FinnStutzenstein/sortAgendaOnProjector 
Fallback to id when sorting the agenda
 2019-03-09 21:40:51 +01:00
Oskar Hahn
8409378e00 Fix a race condition when creating config.key_to_id 2019-03-09 18:55:58 +01:00
Emanuel Schütze
07c723a7dc
Merge pull request #4475 from FinnStutzenstein/addTextDecorationToHtmlWhitelist 
Add text-decoration to bleach whitelist
 2019-03-08 16:19:32 +01:00
FinnStutzenstein
66ebdc4f8a Add text-decoration to bleach whitelist, fix tinymce toolbar 2019-03-08 15:11:55 +01:00