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
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
Norman Jäckel
d9369ab9c1
Merge pull request #4201 from normanjaeckel/ManyToManyFix
...
Fixed autoupdate for m2m relation.
2019-03-06 09:31:18 +01:00
Norman Jäckel
01a61ab292
Fixed autoupdate for m2m relation. Fixed #4055 .
2019-03-06 08:58:52 +01:00
FinnStutzenstein
b0d4851651
Fix inSomeGroups for the superadmin, delete empty comments
2019-03-06 08:35:00 +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
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
