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

8047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
ca039860f7
Merge pull request #5365 from jsangmeister/default-voting-type 
Added config for default poll type
 2020-05-14 13:02:51 +02:00
Sean
fca4154bb5 Add permission as lookup object 
Adds a lookup object for a more solid approach to handling permissions.
Permissions are now an actual type rather than just a string.
 2020-05-14 10:12:22 +02:00
Emanuel Schütze
621d0f4e1a
Merge pull request #5366 from tsiegleauq/motion-not-switching-state 
Change motion cr mode view behavior
 2020-05-14 08:25:01 +02:00
Emanuel Schütze
d1b6ed8d29
Merge pull request #5367 from tsiegleauq/hide-submitter-in-projector 
Hide the submitter-box in motion slide if empty
 2020-05-14 08:22:28 +02:00
Emanuel Schütze
8058a4d695
Merge pull request #5369 from FinnStutzenstein/fixProjectorSubtitle 
Fix projector subtitles for items without agenda items
 2020-05-14 08:20:55 +02:00
Sean
853bc31e21 Change motion cr mode view behavior 
if the default cr mode is 'original' nothing really happens
if the default cr mode is 'changed' you will stay in original view after
creating cr's. That's due to the autoupdate limitation. Changing this
would mean that you cannot change the view anymore
if the default cd mode is 'diff' you will switch to diff view after
creating a cr. It seems that the diff view has an automatic fallback to
the original view if no cr exists, perhaps Tobias knows more about that.
If the default cr mode if 'final' you will try to change to
mod-final-version if it exists. If there is no change-reco, you will
fall back to original version.
 2020-05-14 07:42:25 +02:00
Joshua Sangmeister
fa63ef0307 added config for default poll type 2020-05-14 07:38:14 +02:00
Sean
fef3cf41bb Hide the submitter-box in motion slide if empty 
Hides the "submitter" text and corresponding boxes if they are empty
 2020-05-14 07:37:18 +02:00
FinnStutzenstein
34d85c996c Fix projector subtitles for items without agenda items 2020-05-14 07:32:44 +02:00
Emanuel Schütze
b7b27d2e88
Merge pull request #5368 from jsangmeister/fix-flake 
Fixed formatting after flake update
 2020-05-14 07:31:15 +02:00
Joshua Sangmeister
b0bf4990f8 fixed formatting after flake update 2020-05-13 16:16:03 +02:00
Emanuel Schütze
0ee70b7434
Merge pull request #5363 from emanuelschuetze/translation-20200511 
Updated translations
 2020-05-11 15:45:29 +02:00
Emanuel Schütze
9938a68865 Updated translations 2020-05-11 15:33:58 +02:00
Sean
3e19840b08
Merge pull request #5352 from tsiegleauq/speaker-list-change-detection 
Manual cd for list of speakers
 2020-05-11 11:19:55 +02:00
Sean
7a31cff612
Merge pull request #5347 from GabrielInTheWorld/statistics 
Create statistics of closed list of speakers
 2020-05-11 11:07:53 +02:00
GabrielMeyer
e7de593b54 Create statistics of closed list of speakers 2020-05-11 07:56:50 +02:00
Sean
602d1c8e7b Manual cd for lost of speakers 
Adds better cd for list of speakers
 2020-05-08 12:20:15 +02:00
Emanuel Schütze
c5dd2ea261
Merge pull request #5348 from CatoTH/toggle-show-all-amendments 
Toggle to show all amendments in diff view
 2020-05-08 08:50:47 +02:00
Paul Wolf
8796eeeb62
added proxy pass to nginx configuration file 
prevent request hostname being localhost:8000 | passthrough server hostname from nginx
 2020-05-07 07:42:48 +02:00
Tobias Hößl
25839ea709
Toggle to show all amendments in diff view 2020-05-06 20:28:19 +02:00
Emanuel Schütze
ea830f53b0
Merge pull request #5355 from FinnStutzenstein/SamlInfitySpinnerFix 
fixed endless spinner on SAML login
 2020-05-06 19:20:28 +02:00
FinnStutzenstein
c643a233ae
fixed endless spinner on SAML login 2020-05-06 18:23:38 +02:00
Emanuel Schütze
5aa895bda2
Merge pull request #5354 from FinnStutzenstein/fixUnnenessaryBrokenLock 
Fix unnecessary and unfunctional lock for production usage with gunicorn
 2020-05-06 17:29:28 +02:00
FinnStutzenstein
2910701422
Fix unnecessary and unfunctional lock for production usage with gunicorn 2020-05-06 16:57:50 +02:00
Sean
1e2395c1e6
Merge pull request #5351 from tsiegleauq/ios-touch-callout 
Fix poll results under iOS
 2020-05-06 15:07:34 +02:00
Sean
fede11b59f Fix poll results under iOS 
Fixes an issue on iOS devices regarding click-bindungs in structural
loops. iOS devices did not respond to touch inputs in the given view
 2020-05-06 14:32:46 +02:00
Emanuel Schütze
77cf3e2785
Merge pull request #5321 from tsiegleauq/projector-indicator-on-agenda 
Projector indicator list view tables
 2020-05-05 17:50:27 +02:00
Sean
4e624384e7 Projector indicator list view tables 
Shows a projector indicator in the list view tables.
Width is 24px, just as small as mat-icon needs.
Works in every list view that allows projector buttons (which should
cover everything where an indicator could be demanded)
 2020-05-05 16:08:32 +02:00
Emanuel Schütze
f9cd3ebd89
Merge pull request #5304 from CatoTH/change-recommendations-for-amendments 
Change recommendations for amendments
 2020-05-05 15:46:00 +02:00
Emanuel Schütze
6a6e90067a
Merge pull request #5349 from tsiegleauq/tinymce-link-settings 
Set tinymce urls to absolute
 2020-05-05 15:41:52 +02:00
Sean
1a653c3fa7 Set tinymce urls to absolute 
Potentially fixes a deeper TinyMCE issue that causes TinyMCE to remove
important parts of pasted URLs
 2020-05-04 17:19:05 +02:00
Tobias Hößl
b51787129b
Change recommendations for amendments 2020-05-02 18:40:59 +02:00
Emanuel Schütze
e0069f734a
Merge pull request #5346 from emanuelschuetze/translations-20200430 
Updated translations
 2020-04-30 19:29:59 +02:00
Emanuel Schütze
f415fd0554 Updated translations 2020-04-30 17:43:48 +02:00
Emanuel Schütze
c6836ff6c5
Merge pull request #5294 from GabrielInTheWorld/sort-speakers 
Changes workflow for sorting speakers
 2020-04-30 16:42:52 +02:00
GabrielMeyer
4a24da12da Changes workflow for sorting speakers 2020-04-30 15:58:49 +02:00
Emanuel Schütze
3842f66877
Merge pull request #5330 from tsiegleauq/mark-first-time-speaker 
Show first contribution hint in list of speaker
 2020-04-30 15:03:55 +02:00
Sean
38ee6bb2f1 Show first contribution hint in list of speaker 
Shows a hint in the list of speakers if a speaker contributes for the
first time.
 2020-04-30 14:06:37 +02:00
Emanuel Schütze
a47285c0ff
Merge pull request #5309 from tsiegleauq/integrate-jitsi-meet-client 
Integrate jitsi-meet in OpenSlides
 2020-04-30 13:05:12 +02:00
Sean
1439444b2e Integrate jitsi-meet in OpenSlides 
- minimal jitsi client in the bottom right of the screen
- can be shown and hidden like a messenger
- allows to mute, unmute, call, stop call
- automatically connects to a conference
- shows a list of users connected to the room
- jitsi iframe is currently hidden
- "open in jitsi meet" link
- only one connection will be opened if using multiple tabs
- JITSI_DOMAIN and JITSI_ROOM_NAME must be present in the settings.py
- config variables in settings
 2020-04-30 11:07:32 +02:00
Emanuel Schütze
cce76118c3
Merge pull request #5344 from FinnStutzenstein/voteWeight 
Removed vote weight from votes_cast
 2020-04-30 10:54:28 +02:00
FinnStutzenstein
aa1a2cec89
Removed vote weight from votes_cast 2020-04-30 08:10:39 +02:00
Emanuel Schütze
46d0bbd8f5
Merge pull request #5341 from FinnStutzenstein/loadConfigsBeforeModels 
Load configs before models
 2020-04-27 10:00:53 +02:00
FinnStutzenstein
b78372f8a3
Load configs before models 2020-04-27 09:41:23 +02:00
Emanuel Schütze
fd9b8b1c5c
Merge pull request #5340 from emanuelschuetze/translations-20200424 
Updated German translations.
 2020-04-24 14:40:40 +02:00
Emanuel Schütze
7a25a2496d Updated German translations. 2020-04-24 14:28:26 +02:00
Emanuel Schütze
ddfe7d0c5a
Merge pull request #5295 from GabrielInTheWorld/duplicate-topics 
Duplicates single and multiple items in the agenda
 2020-04-24 14:03:44 +02:00
FinnStutzenstein
152401a9a3
Duplicates single and multiple topics in the agenda 2020-04-24 12:34:22 +02:00
Emanuel Schütze
2057150076
Merge pull request #5322 from FinnStutzenstein/delete-all-speakers 
delete all speakers of all lists of speakers
 2020-04-24 12:25:49 +02:00
Emanuel Schütze
cb52347354
Merge pull request #5328 from FinnStutzenstein/projectorSubtitles 
Subtitles for projected elements in the projector detail view
 2020-04-24 12:12:22 +02:00