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

8102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
fbb0be6fb4
Merge pull request #5404 from emanuelschuetze/whitelist 
Updated server whitelist of allowed styles.
 2020-06-09 23:15:17 +02:00
Emanuel Schütze
acf499f6e1
Merge pull request #5378 from jsangmeister/monospace-countdown 
Replaces the countdown font with a monospaced one
 2020-06-09 23:15:06 +02:00
Emanuel Schütze
79e3780a26 Updated server whitelist of allowed styles. 
added 'vertical-align'
 2020-06-09 22:59:41 +02:00
Joshua Sangmeister
e653021eff Add a configurable monospace font for the countdown 
use Roboto Condensed bold by default
 2020-06-09 22:54:31 +02:00
Emanuel Schütze
aeb893a8d9
Merge pull request #5399 from tsiegleauq/normal-amendments-in-list 
Fix error for freely editable amendments
 2020-06-09 21:48:13 +02:00
Emanuel Schütze
82efbe76bd
Merge pull request #5356 from flowluap/patch-2 
added proxy pass to nginx configuration file
 2020-06-09 21:22:08 +02:00
Emanuel Schütze
ff9125fb9f
Merge pull request #5401 from tsiegleauq/assignment-poll-chart-abstain 
Hide abstain bar in assignment polls chart
 2020-06-09 21:20:54 +02:00
Sean
d4f211e344 Fix error for freely editable amendments 
Recent changes to amendment had various bugs.
This one regarded the amendment list, where amendments without amendmend
paragraphs returned several errors.
 2020-06-09 21:16:04 +02:00
Emanuel Schütze
4673c741e9
Merge pull request #5402 from jsangmeister/fix-tiny-mce 
Fix change detection for Tiny MCE
 2020-06-09 20:56:29 +02:00
Emanuel Schütze
e1345cb808
Merge pull request #5398 from CatoTH/bugfix-non-paragraph-based-amendments 
Bugfix non paragraph based amendments
 2020-06-09 20:53:03 +02:00
Joshua Sangmeister
bf35c55956 Fix change detection for Tiny MCE 2020-06-09 13:14:05 +02:00
Sean
6efdc9a3dd Hide abstain bar in assignment polls chart 
If the percent base does not include "abstain", the grey abstain bar
will not be shown in the assignment poll chart
 2020-06-09 12:47:38 +02:00
Tobias Hößl
cadef6d42e
Don't show amendment CR-diff-view if no CRs exist 2020-06-07 15:02:35 +02:00
Tobias Hößl
bc3b8be78d
Increase recalculation performance by additional caching 2020-06-07 11:44:07 +02:00
Tobias Hößl
18bc495bd8
Bugfix: errors with non-paragraph-based amendments 2020-06-07 10:54:57 +02:00
Emanuel Schütze
8451cd2d88
Merge pull request #5395 from emanuelschuetze/translation-20200604 
Updated translations
 2020-06-04 17:06:55 +02:00
Emanuel Schütze
5072e66a7e Updated translations 2020-06-04 17:06:08 +02:00
Emanuel Schütze
3109337004
Merge pull request #5394 from tsiegleauq/jitsi-iframe-dialog 
Show Jitsi iFrame in Dialog
 2020-06-04 16:37:01 +02:00
Sean
3ca4714812 Show Jitsi iFrame in Dialog 
Replace the external link button with a (real) Dialog containing the
jitsi iFrame.
The dialog can be hidden but not entirly closed.
Replace all dialogService.closeAll() functions by closing the specific
dialog rather than all of them.
 2020-06-04 16:29:35 +02:00
FinnStutzenstein
429473dcf9
Merge branch 'pollprogressCd' 2020-06-04 15:16:20 +02:00
FinnStutzenstein
c186a575f6
Fixed incomplete autoupdates 
A conceptional issue in `get_data_since` leads to incomplete
autoupdates. The behaviour was long time in the code, but only with a
lot of autoupdates (high concurrency) and the autoupdate delay I noticed
the bug during testing. I'm sure, that this issue might have caused
incomplete autoupdates (which the user may experience as "lost
autoupdates") in previous productive instances. Instead of quering a
range (from_change_id to to_change_id) one now can only get data from a
change id up to the max change id in the element cache. The max change
id gets now returned by `get_data_since`.

I also added a get_all_data with the capability of returning the
max_change_id at this point of time.

As a usability-"fix" (more like a fix the result of a bug, not the bug
itself) a refresh button for a poll was added, that issues an autoupdate
for the poll and all options.
 2020-06-04 15:16:05 +02:00
Emanuel Schütze
c4f482b70c
Merge pull request #5391 from jsangmeister/update-poll-slide 
Fixes motion poll slide icon size & rounding
 2020-06-03 19:16:29 +02:00
Emanuel Schütze
0275df6ab2
Merge pull request #5392 from tsiegleauq/vote-await-server-answer 
Wait for server while voting
 2020-06-03 17:35:19 +02:00
Sean
dced8fbcc7 Wait for server while voting 
Blocks voting state changes and prevents the user from sending multiple
vote values while the server is not responding during voting
 2020-06-03 14:53:31 +02:00
Joshua Sangmeister
f4907e6604 Fixes motion poll slide icon size & rounding 2020-06-02 22:41:23 +02:00
Emanuel Schütze
d7408b40f9
Merge pull request #5390 from jsangmeister/hide-amendments-when-deactivated 
Hides amendments entry in menu if deactivated
 2020-06-02 22:26:14 +02:00
Finn Stutzenstein
e215a23b80
Merge pull request #5389 from jsangmeister/reverse-motion-relations 
Adds reverse relations for motions and blocks
 2020-06-02 16:26:07 +02:00
Joshua Sangmeister
a31fa7dda6 Adds reverse relations for motions and blocks 2020-06-02 14:44:56 +02:00
Emanuel Schütze
7665634d42
Merge pull request #5375 from FinnStutzenstein/autoupdatePerformance 
Autoupdate performance
 2020-05-29 17:31:32 +02:00
Finn Stutzenstein
9c7b9b0920
Merge pull request #5387 from FinnStutzenstein/hugeautoupdatesInRedis 
Inserting changed and deleted elements into redis in batches (fixes #5386)
 2020-05-29 15:48:21 +02:00
FinnStutzenstein
0eee839736
Small improvements and first attempt to make to poll progress responsive 
to massive autoupdates. The "optimization" didn't help, so this has to
be continued in another PR.
 2020-05-29 15:46:19 +02:00
Joshua Sangmeister
a84bfccd07 Hides amendments entry in menu if deactivated 2020-05-28 15:26:56 +02:00
FinnStutzenstein
600b9c148b
Inserting changed and deleted elements into redis in batches (fixes #5386) 2020-05-28 14:00:57 +02:00
FinnStutzenstein
d8b21c5fb5
(WIP) Ordered and delayed autoupdates: 
- Extracted autoupdate code from consumers
- collect autoupdates until a AUTOUPDATE_DELAY is reached (since the first autoupdate)
- Added the AUTOUPDATE_DELAY parameter in the settings.py
- moved some autoupdate code to utils/autoupdate
- moved core/websocket to utils/websocket_client_messages
- add the autoupdate in the response (there are some todos left)
- do not send autoupdates on error (4xx, 5xx)
- the client blindly injects the autoupdate in the response
- removed the unused autoupdate on/off feature
- the clients sends now the maxChangeId (instead of maxChangeId+1) on connection
- the server accepts this.
 2020-05-27 16:05:27 +02:00
Emanuel Schütze
dcf5d5316c
Merge pull request #5384 from FinnStutzenstein/logErrorsOnServer 
Log APIExceptions on the server
 2020-05-25 14:52:34 +02:00
FinnStutzenstein
fba043fedf
Log APIExceptions on the server 2020-05-25 09:16:37 +02:00
Emanuel Schütze
762d1f9912
Merge pull request #5382 from topelrapha/master 
Fix tinymce version to 5.2.2
 2020-05-23 10:37:34 +02:00
Raphael Topel
60621bf4d0 Fix tinymce version to 5.2.2 2020-05-22 22:19:45 +02:00
FinnStutzenstein
bf88cea200
Rewrite projector code to be cache friendly 
This speeds up the requests/seconds by a factor of 100
 2020-05-22 15:23:54 +02:00
FinnStutzenstein
23842fd496
Synchronize autoupdate code in the client 
If autoupdates are too fast, the first one may not be fully executed. Especially when the maxChangeId is not yet updated, the second Autoupdate will trigger a refresh, because for the client it "lay in the future". This can be prevented by synchronizing the autoupdate-handling code with a mutex.
 2020-05-22 15:23:53 +02:00
Sean
4ac7b1eb4b
Merge pull request #5380 from FinnStutzenstein/closService 
Fix the CLOS service to trigger on CLOS updates
 2020-05-20 18:29:11 +02:00
FinnStutzenstein
17049cc0f3 Fix the CLOS service to trigger on CLOS updates 
additionally fixed some naming issues
 2020-05-20 18:09:50 +02:00
Emanuel Schütze
fd026e165f
Merge pull request #5377 from jsangmeister/migrate-deprecated-slides 
Adds migration to remove deprecated slides
 2020-05-19 14:35:07 +02:00
Joshua Sangmeister
e52697ad7e Adds migration to remove deprecated slides 2020-05-19 12:55:47 +02:00
Emanuel Schütze
0c93c44f0d
Merge pull request #5374 from emanuelschuetze/translations-20200514 
Updated translations
 2020-05-14 20:09:36 +02:00
Emanuel Schütze
4b95398ac1
Merge pull request #5371 from jsangmeister/jitsi-settings 
Added jitsi settings to template and readme
 2020-05-14 19:59:28 +02:00
Emanuel Schütze
37c3ac5aff Updated translations 2020-05-14 19:52:18 +02:00
Joshua Sangmeister
3f03f27cdb added jitsi settings to template and readme 2020-05-14 19:41:35 +02:00
Emanuel Schütze
f694e2355d
Merge pull request #5373 from tsiegleauq/assignment-poll-card-with-table 
Show assignment poll result table instad of chart
 2020-05-14 19:36:43 +02:00
Sean
3820e09b89 Show assignment poll result table instad of chart 
Replaces the assignment result chart with the result table from the
detail view and projector
 2020-05-14 16:40:19 +02:00