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

6836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Finn Stutzenstein
d10dfb0915
Merge pull request #4469 from MaximilianKrambach/speakertime 
clarifying duration service usage
 2019-03-11 08:07:41 +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
1ecc7f4baa
Merge pull request #4485 from tsiegleauq/user-detail-template-fixes 
User detail template fixes
 2019-03-09 22:06:15 +01:00
Emanuel Schütze
f4b798d6a2
Merge pull request #4479 from FinnStutzenstein/losSpeakerCount 
(current) list of speakers: show amount of waiting speakers
 2019-03-09 21:54:59 +01:00
Emanuel Schütze
cee7c39c7d
Merge pull request #4481 from tsiegleauq/speaker-list-perms 
Prevent drag and final versions without perms
 2019-03-09 21:49:08 +01:00
Emanuel Schütze
a26c44ca73
Merge pull request #4483 from tsiegleauq/motion-block-perms 
Motion block permission fixes
 2019-03-09 21:41:12 +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
Emanuel Schütze
023eb54773
Merge pull request #4488 from ostcar/fix_config_key_to_id 
Fix a race condition when creating config.key_to_id
 2019-03-09 21:27:24 +01:00
Sean Engelhardt
6acecccc6e Motion block permission fixes 
Adds fixes to motion block permission checks.
Users with "Can See motion"
Can see motion blocks in list view

The menu-column in motion blocks list will be completely hidden
without "Motion Can Manage" permissions

In motion block list view, the motion will be displayed with
identifier rather than just the title
 2019-03-09 21:22:56 +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
fc7a3a7f51
Merge pull request #4486 from tsiegleauq/amendment-wizzard-fixes 
Fix amendment creation
 2019-03-08 20:56:43 +01:00
Emanuel Schütze
5e7c604c4b
Merge pull request #4480 from FinnStutzenstein/sortMotionBlocksOnSlide 
Sort motions on the motion block slide
 2019-03-08 20:49:18 +01:00
Sean Engelhardt
07d3ea4c25 Fix amendment creation 
Categories and blocks not appear after (paragraph based) amendment
creation.
Reason for amendments is now required if the config was set
accordingly
 2019-03-08 16:45:45 +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
d90e88fa53 Sort motions on the motion block slide 2019-03-08 16:16:05 +01:00
FinnStutzenstein
66ebdc4f8a Add text-decoration to bleach whitelist, fix tinymce toolbar 2019-03-08 15:11:55 +01:00
Sean Engelhardt
62e3256c54 User detail template fixes 
Adds a new template to user detail, to show user information in multiple
lines

Also adds a new feature to the headbar. Long titles (over title slot) will
break using ellipsis
 2019-03-08 14:51:48 +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
0290449b8b
Merge pull request #4452 from FinnStutzenstein/reworkPersonalNotes 
rework personal notes
 2019-03-08 12:45:54 +01:00
FinnStutzenstein
f198a21543 rework personal notes 2019-03-08 12:09:53 +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
Sean Engelhardt
985fe9cc8b Prevent drag and final versions without perms 
Fixes an issue where users without manage rights
were able to use the drag and drop feature of the
list of speakers.
Also hides "modified final version" prints without
sufficient permissions.

Alters OSPerms to support "and" operators,
so "perm" and "other condition" is now possible
 2019-03-08 11:53:25 +01:00
Emanuel Schütze
16b6c814cf
Merge pull request #4478 from FinnStutzenstein/AmendmentNumbering 
Fix blanks for amendments
 2019-03-08 11:27:42 +01:00
FinnStutzenstein
f60e66c1a8 (current) list of speakers: show amount of waiting speakers 2019-03-08 11:15:53 +01:00
FinnStutzenstein
138a52d278 Fix blanks for amendments 2019-03-08 11:05:42 +01:00
Sean
83ff758977
Merge pull request #4456 from tsiegleauq/motion-modules 
Add more motion modules
 2019-03-08 11:01:19 +01:00
Sean Engelhardt
6a421f8f6b Add more motion modules 
Seperates the previously large motion module in various smaller
and very small feature modules.
Motion Detail, and all direct dependancies to Motion Detail
is now an own module.
This significantly increases the response time of openslides 3
 2019-03-08 10:43:54 +01:00
FinnStutzenstein
a1018e62e2 Added theme to login data 2019-03-08 09:19:05 +01:00
Emanuel Schütze
70191ce455
Merge pull request #4470 from FinnStutzenstein/motionSLideRecommendationFix 
Replace recommendation on client and server for motion slide
 2019-03-07 16:55:53 +01:00
Emanuel Schütze
6b7aaeac6f
Merge pull request #4442 from MaximilianKrambach/zindex 
fix legalnotice and privacy z-index issue
 2019-03-07 15:40:32 +01:00
Maximilian Krambach
9cdc909d25 fix legalnotice and privacy z-index issue 2019-03-07 15:06:41 +01:00
FinnStutzenstein
ed4b1c80f1 Replace recommendation on client and server for motion slide 2019-03-07 08:52:33 +01:00
Maximilian Krambach
e05874cf6f clarifying duration service usage 2019-03-06 16:54:00 +01:00
Finn Stutzenstein
cc21c77667
Merge pull request #4466 from MaximilianKrambach/ripple 
disable some unnecessary ripples in motion detail view
 2019-03-06 15:49:02 +01:00
Maximilian Krambach
21893f00b8 disable some unnecessary ripples in motion detail view 2019-03-06 15:35:27 +01:00
Finn Stutzenstein
4fedae63a8
Merge pull request #4468 from FinnStutzenstein/fixIsort 
Resort python import for isort 4.3.11 (fixes #4467)
 2019-03-06 15:14:12 +01:00
Jochen Saalfeld
dcccfb41b5
Merge pull request #4462 from FinnStutzenstein/fixIsStable 
Fixed SW registration issues due to pending mikrotasks
 2019-03-06 15:09:43 +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
Maximilian Krambach
b978029fff
Merge pull request #4432 from MaximilianKrambach/csvExport 
csv example export refactor
 2019-03-06 11:29:55 +01:00
Maximilian Krambach
0ddded4a86 csv example export refactor 
- make csv example data respect config separators
- refactor at a more central place
 2019-03-06 11:03:51 +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
Emanuel Schütze
ad653de915
Merge pull request #4450 from FinnStutzenstein/offlineOperator 
offline operator
 2019-03-06 09:24:52 +01:00
Norman Jäckel
01a61ab292 Fixed autoupdate for m2m relation. Fixed #4055. 2019-03-06 08:58:52 +01:00
Emanuel Schütze
6588cd9cd4
Merge pull request #4463 from FinnStutzenstein/fixInSomeGroups 
Fix inSomeGroups for the superadmin
 2019-03-06 08:57:36 +01:00
FinnStutzenstein
b0d4851651 Fix inSomeGroups for the superadmin, delete empty comments 2019-03-06 08:35:00 +01:00
FinnStutzenstein
e1fcda7890 Fixed SW registration issues due to pending mikrotasks 2019-03-06 08:15:19 +01:00
FinnStutzenstein
0c6a7b9c4b offline operator 2019-03-06 07:50:54 +01:00