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
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