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

4365 Commits

Author SHA1 Message Date
FinnStutzenstein
23c704b5da Projector improvements 
- Moved projector configs to group "General"
- Removed unused projector config related to CLOS
- debounce projector data requests for many projectors
- add (foreground) color
- custom, modifiable CSS classes per projector to cascade dynamic styles into slides
 2019-07-19 12:43:45 +02:00
FinnStutzenstein
88162dd1e9 Little fixes 
- Fixed bug for deleted candidates
- Prevent deleting group 1 and 2
- Creation of topics
 2019-07-17 13:16:36 +02:00
FinnStutzenstein
b4e9b28397 Fix mediafiles for non superadmins 2019-07-13 19:37:49 +02:00
Emanuel Schütze
3fd519e0d4
Merge pull request #4821 from FinnStutzenstein/directories 
Directories and access permissions for mediafiles
 2019-07-12 13:34:46 +02:00
Emanuel Schütze
437d10f693
Merge pull request #4838 from FinnStutzenstein/configMigrationVersion 
Recover-strategy to detect an updated server without a reload
 2019-07-12 13:30:14 +02:00
FinnStutzenstein
56c1da352e Directories and access permissions for mediafiles 2019-07-12 13:08:07 +02:00
FinnStutzenstein
77dee0d977 Recover-strategy to detect an updated server without a reload 2019-07-11 19:23:25 +02:00
FinnStutzenstein
0d5e795f50 Requires agenda.can_manage for settings ageda item information on content object creation 2019-07-11 19:10:55 +02:00
Emanuel Schütze
1cdfea666b Updated translations 2019-07-08 10:22:19 +02:00
GabrielMeyer
7e9190ea84 Corrects the permission-handling 
- Projector-controls aren't seen, if no permission 'can_manage'
- The 'more options'-menu is removed
- New config option: Hide amount of speakers in list of speakers slide subtitle.
 2019-07-08 09:27:45 +02:00
FinnStutzenstein
2ae7776392 Show from recommendation referencing motions 2019-07-04 07:12:31 +02:00
FinnStutzenstein
e604da3240 Quicklink to history (closes #4777) 2019-06-28 08:32:21 +02:00
Emanuel Schütze
5d3bb1fd4a Updated translations 2019-06-27 23:20:49 +02:00
GabrielMeyer
e5b25d7695 Implements checkboxes 
In every motion the user has the option to follow the recommendation or not.
 2019-06-27 22:20:43 +02:00
Emanuel Schütze
a8af0595a6
Merge pull request #4808 from emanuelschuetze/email 
New email sender name and reply-to config options.
 2019-06-26 16:30:17 +02:00
Emanuel Schütze
29dd81ba39 New email sender name and reply-to config options. 2019-06-25 17:26:38 +02:00
FinnStutzenstein
b7e98a565a Fix restriction without restricted data cache 2019-06-25 16:57:29 +02:00
Sean
7d03fddfcf
Merge pull request #4801 from FinnStutzenstein/numberingPrefetchingFix 
Fixed prefetching and ordering of motions during numbering
 2019-06-24 13:08:53 +02:00
FinnStutzenstein
ac303d9f3d Fixed prefetching and ordering of motions during numbering 2019-06-20 14:03:57 +02:00
FinnStutzenstein
8ff0f73477 Optional agenda items 2019-06-17 12:38:17 +02:00
Emanuel Schütze
ded7bac4f7
Merge pull request #4779 from MaximilianKrambach/sequentialNumber 
config to show/hide motion sequential numbers
 2019-06-14 14:21:27 +02:00
Emanuel Schütze
e2e5fe07d0
Merge pull request #4766 from GabrielInTheWorld/pdf-make-enhancement 
Implementation of exporting submitters and recommendation
 2019-06-14 14:17:13 +02:00
Maximilian Krambach
ac1703242e config to show/hide motion sequential numbers 2019-06-14 14:10:34 +02:00
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
ff98ee1b96 Refactured client 2019-06-13 10:09:08 +02:00
Norman Jäckel
5a5bc77e62 Refactored OpenSlides history (HistoryInformation is not a root rest element anymore.). 2019-06-13 09:14:58 +02:00
Emanuel Schütze
35c8dc97f5
Merge pull request #4756 from FinnStutzenstein/subcategories 
Subcategories
 2019-06-12 15:08:46 +02:00
FinnStutzenstein
bf9973a4a7 Subcategories 2019-06-12 14:37:19 +02:00
FinnStutzenstein
6d027f0f75 Compression: Sending compressed messages 2019-06-12 08:25:25 +02:00
FinnStutzenstein
d9c88c02b3 Compression: Recieving compressed messages 2019-06-12 08:21:16 +02:00
Emanuel Schütze
1e8560c9a4
Merge pull request #4768 from normanjaeckel/Review 
Added detail to set permission response.
 2019-06-05 20:01:42 +02:00
Norman Jäckel
b17a0f154f Added detail to set permission response. 2019-06-05 11:57:29 +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
Maximilian Krambach
16477a4e92 filter potential speakers 
- filter by those already on list
- filter by present, if configured
 2019-05-27 11:40:15 +02:00
FinnStutzenstein
d57c5bd132 Fixed updating user data after changing permissions with the new view 2019-05-24 18:22:39 +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
e907599cef
Merge pull request #4726 from GabrielInTheWorld/pdf-make 
Adds config-variable for pdf-export
 2019-05-21 12:23:38 +02:00
GabrielMeyer
eb7b203b33 Adds config-variable for pdf-export 
- Adds the page-size 'A5' for pdf-export
 2019-05-21 11:58:59 +02:00
Emanuel Schütze
31274873f1
Merge pull request #4719 from FinnStutzenstein/chyronColor 
Added custom color for the projector chyron and reset buttons for colors
 2019-05-20 22:12:32 +02:00
FinnStutzenstein
e267279f60 Added custom color for the projector chyron and reset buttons for colors 2019-05-20 21:50:03 +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
7ab040823d
Merge pull request #4671 from tsiegleauq/rework-sort-filter 
Rework sort and filter
 2019-05-20 10:02:12 +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
Emanuel Schütze
fef386ddf8
Merge pull request #4713 from FinnStutzenstein/tooHighChangeIdHandling 
Handles 'change id too high' and generic websocket error message format
 2019-05-16 20:25:13 +02:00
Emanuel Schütze
65dbf37106
Merge pull request #4704 from FinnStutzenstein/setPermissionRequest 
Request for settings a permission in a group (closes #4698)
 2019-05-16 14:14:33 +02:00
Emanuel Schütze
93ef573e09
Merge pull request #4707 from FinnStutzenstein/fixTreeSorting 
fix tree sorting
 2019-05-16 14:10:14 +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
FinnStutzenstein
5ad94cb2f4 Handles 'change id too high' and generic websocket error message format 2019-05-15 14:25:54 +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
10c329da8d fix tree sorting 
Assigns the weight in the preorder traversal of the tree. Now one without every
object (e.g. missing motions/items) still have the correct sorting. Intorduces
the level attribute of items giving the amount of parents in the agenda. This
allows to reduce complexits in the client.
 2019-05-15 14:14:32 +02:00
FinnStutzenstein
665426e954 Remove ChatMessage 2019-05-15 13:44:45 +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
Finn Stutzenstein
6f014279d4
Merge pull request #4687 from FinnStutzenstein/catchDoubleCreationOfPersonalNotes 
Fix doulbe create requests for personal notes.
 2019-05-13 14:49:42 +02:00
FinnStutzenstein
5e13299ae3 Request for settings a permission in a group (closes #4698) 2019-05-13 10:17:24 +02:00
FinnStutzenstein
171f05e7b8 Logging the cache buildup process 2019-05-10 14:20:01 +02:00
FinnStutzenstein
635fd3fad5 Fix doulbe create requests for personal notes. 
When this is done, the clients needs handle this error @tsiegleauq
 2019-05-10 08:18:28 +02:00
FinnStutzenstein
5728b65824 Fixed websocket and encoding errors 2019-05-10 07:35:19 +02:00
Norman Jäckel
dd66e7505d
Merge pull request #4644 from FinnStutzenstein/noProjectiondefaultChanges 
prohibit changes in projectiondefaults
 2019-05-08 09:28:08 +02:00
Emanuel Schütze
51b4b6aba6
Merge pull request #4578 from GabrielInTheWorld/theming 
Implements a mechanism for a fallback theme
 2019-05-07 21:13:55 +02:00
Emanuel Schütze
b3de965a66
Merge pull request #4660 from FinnStutzenstein/logging 
Logging
 2019-05-07 17:42:37 +02:00
GabrielMeyer
376f4e2a31 Implements a mechanism for a fallback theme 
- If the previously selected theme is not available the default OpenSlides theme will be displayed.
- Before the current selected theme was loaded, no theme is displayed.
 2019-05-07 17:32:28 +02:00
FinnStutzenstein
02d82e20c1 websocket logging 2019-05-07 16:37:38 +02:00
FinnStutzenstein
f53d3c2069 Fix numbering with amendments 2019-05-07 16:12:47 +02:00
FinnStutzenstein
febbe9bba2 Prioritize clients with the right operator and added ping-pong mechanism 2019-05-07 13:43:52 +02:00
Sean
e1b8e74e8d
Merge pull request #4657 from tsiegleauq/service-worker-addons 
Service Worker Updates
 2019-05-06 13:59:07 +02:00
Sean Engelhardt
e4d3e119d3 Service Worker Updates 
Introdcues a new update service.
Listens to service-worker updates and shows a snack-bar to inform about updates.
Provides a function to manually check for updates.

The service worker tries to be consistent in it's own version and
updates in the background.
Some manuall trigger will be required to update, which is either a
reload or the execution of the provded check function

with help from
@FinnStutzenstein
 2019-05-06 13:13:09 +02:00
FinnStutzenstein
cc931bc8bf Fixed user slide 2019-05-04 08:35:54 +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
FinnStutzenstein
44b683e361 Add attachments to assignments 2019-04-29 10:31:28 +02:00
FinnStutzenstein
1b15f6ea14 prohibit changes in projectiondefaults 
resolves question in #4541
 2019-04-29 08:25:49 +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
Emanuel Schütze
78c77efd7c
Merge pull request #4638 from FinnStutzenstein/fixRestrictionCheck 
Fix restriction check for motions
 2019-04-26 21:35:09 +02:00
Emanuel Schütze
2a10dd4675
Merge pull request #4615 from FinnStutzenstein/silenceWsSendErrosAfterTermination 
Silence errors after sending to a closed connection
 2019-04-26 16:10:16 +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
6de9616c47 Silence errors after sending to a closed connection 2019-04-26 14:07:13 +02:00
Emanuel Schütze
1e62501f05
Merge pull request #4608 from FinnStutzenstein/autoupdateOnPermissionChangeViaStateRestrictions 
send autoupdate on state update for motions
 2019-04-25 22:34:52 +02:00
Maximilian Krambach
1b1499a660 Assignment slides 2019-04-25 17:12:21 +02:00
Finn Stutzenstein
0c4076fbd7
Merge pull request #4616 from FinnStutzenstein/basicAssignmentSlide 
Basic assignment slide
 2019-04-25 10:11:23 +02:00
Gernot Schulz
5427cfe183 Don't use yourdomain.com as an example domain 2019-04-24 16:02:20 +02:00
FinnStutzenstein
55dd2d1d6f Basic assignment and poll slide 2019-04-24 10:34:44 +02:00
FinnStutzenstein
3eb5273b8e send autoupdate on state update for motions 2019-04-16 15:45:59 +02:00
Maximilian Krambach
9dfac94099 assignment improvements 
- layouting
- fix one-vote polls
- filter candidate list
- candidate sorting
- fix adding/removing of candidates
- avoid ui jumping
- fix quorum calculations
 2019-04-16 09:42:07 +02:00
FinnStutzenstein
a715c0e432 Refresh clients cache when the database was migrated 2019-04-15 16:13:52 +02:00
Finn Stutzenstein
e9a60a54fd
Merge pull request #4597 from GabrielInTheWorld/migrations 
Adds a migration for projector changes
 2019-04-15 13:27:36 +02:00
GabrielMeyer
79cd8e9917 Adds a migration for projector changes 2019-04-15 11:02:39 +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
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
Emanuel Schütze
3490ff3ca4
Merge pull request #4477 from FinnStutzenstein/projectorScroll 
projector scroll and contdown offset
 2019-03-08 14:32:42 +01:00
FinnStutzenstein
5fff7d24ec projector scroll and contdown offset 2019-03-08 13:17:43 +01:00
Emanuel Schütze
40e5ea0a1d
Merge pull request #4473 from FinnStutzenstein/themeInLoginData 
Added theme to login data
 2019-03-08 12:01:32 +01:00
FinnStutzenstein
887c1a3516 Fallback to id when sorting the agenda 2019-03-08 11:59:07 +01:00
FinnStutzenstein
138a52d278 Fix blanks for amendments 2019-03-08 11:05:42 +01:00
FinnStutzenstein
a1018e62e2 Added theme to login data 2019-03-08 09:19:05 +01:00