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

4200 Commits

Author SHA1 Message Date
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
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