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

7909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Emanuel Schütze
3169e4f30b
Merge pull request #5336 from FinnStutzenstein/fixVoting 
Fixed validation of options in asignment polls
 2020-04-24 12:10:04 +02:00
FinnStutzenstein
4221351223 Fixed validation of options in asignment polls 
Also fixed #5334
 2020-04-24 09:31:39 +02:00
Emanuel Schütze
0c6da9799c
Merge pull request #5335 from GabrielInTheWorld/fixTopicPreview 
Fixes preview of topics in global search
 2020-04-24 09:13:36 +02:00
Emanuel Schütze
a71e36c861
Merge pull request #5331 from emanuelschuetze/translations-20200423 
Updated German translations
 2020-04-24 08:55:39 +02:00
GabrielMeyer
41b9065807 Fixes preview of topics in global search 2020-04-23 23:36:10 +02:00
Emanuel Schütze
527f947143 Updated German translations 2020-04-23 20:35:59 +02:00
FinnStutzenstein
c8faa982ac Subtitles for projected elements in the projector detail view 2020-04-23 16:01:18 +02:00
FinnStutzenstein
38486463bc delete all speakers of all lists of speakers 2020-04-23 09:43:04 +02:00
Finn Stutzenstein
6a488eb78e
Merge pull request #5323 from tsiegleauq/linter-prettier-updates 
Update linting rules
 2020-04-22 17:32:42 +02:00
Emanuel Schütze
0aef3f79ce
Merge pull request #5305 from tsiegleauq/weight-votes 
Implement vote weight in client
 2020-04-22 17:28:02 +02:00
Sean
97c2299aec Implement vote weight in client 
Implements vote weight in client
The user detail page has a new property
change deserialize to parse floats
change "yes"-voting to send "Y" and "0" instead of "1" and "0"
add vote weight to user list, filter, sort
add vote weight to single voting result
votesvalid and votescast respect the individual vote weight
fix parse-poll pipe and null in pdf
 2020-04-22 16:54:50 +02:00
Sean
e702843f07 Update linting rules 
Includes strickt(er) tslint line-length of 120, with an exception
for import statements (prettier does not like these)
 2020-04-22 16:24:08 +02:00
Emanuel Schütze
0f3d07f151
Merge pull request #5324 from tsiegleauq/another-round-of-python-travis-fixes 
Set version of pytest-django and pytest-asyncio
 2020-04-22 16:09:23 +02:00
Sean
aa097ee689 Set version of pytest-django and pytest-asyncio 
Apparently, updates in these two libraries are not compatible
with out current testing setup
 2020-04-22 14:56:25 +02:00
Sean
f7a97cf886
Merge pull request #5299 from CatoTH/delete-obsolete-tests 
Delete old test files that are reimplemented in Typescript by now
 2020-04-21 13:21:16 +02:00
Emanuel Schütze
25f8f42c92
Merge pull request #5320 from sarah-github/sarah-github-typo-settings-rst 
typo with brackets in settings.rst for logging config
 2020-04-21 12:49:04 +02:00
Sarah
523eb96f9d
typo with brackets 2020-04-20 22:37:01 +02:00
Emanuel Schütze
2c548d2dfb
Merge pull request #5319 from tsiegleauq/fix-admin-self-set-present 
Fixes an issue regarding self-set-present
 2020-04-20 19:38:11 +02:00
Sean
91d4b3c7af Fixes an issue regarding self-set-present 2020-04-20 19:17:03 +02:00
Emanuel Schütze
d210496146
Merge pull request #5293 from GabrielInTheWorld/subline-comment 
Adds a third line for comments
 2020-04-20 18:09:52 +02:00
Emanuel Schütze
35ce596706
Merge pull request #5317 from tsiegleauq/set_presence_on_userlist 
Allow set present on user list if config was set
 2020-04-20 17:13:48 +02:00
Tobias Hößl
f007e07544
Delete old test files that are reimplemented in Typescript by now 2020-04-20 15:15:00 +02:00
Sean
70aadcdd28
Merge pull request #5307 from GabrielInTheWorld/no-found-button 
Adds a 'not found'-button to search-value-selector
 2020-04-20 14:52:46 +02:00
Sean
9ffbb39e95 Allow set present on user list if config was set 
Depending on "selt self presence" config, allow users to set
themselves as present on the user list
 2020-04-20 13:46:14 +02:00
GabrielMeyer
170aa1c8f0 Adds a third line for comments 2020-04-20 07:46:37 +02:00
jsangmeister
ad4ed3443a
Merge pull request #5316 from jsangmeister/voting-autoupdate-fix 
Fixes the voting autoupdate bug
 2020-04-17 16:58:50 +02:00
Joshua Sangmeister
42fbe93314 fixes the voting autoupdate bug 2020-04-17 16:38:38 +02:00
Emanuel Schütze
6cdf9a5582
Merge pull request #5315 from emanuelschuetze/prepare-3.2 
Prepare new 3.2 release
 2020-04-16 13:55:24 +02:00
Emanuel Schütze
75ebf5bc77 Prepare new 3.2 release 2020-04-16 13:41:56 +02:00
Emanuel Schütze
c26ef8c0bb
Merge pull request #5314 from jsangmeister/permissiveHtmlValidation 
Adds more permissive html validation for topics and welcome page
 2020-04-16 10:57:43 +02:00
Joshua Sangmeister
6eae497abe adds more permissive html validation 2020-04-16 10:26:48 +02:00
Finn Stutzenstein
1570b5b806
Merge pull request #5313 from jsangmeister/fix-user-import 
Fixed user import
 2020-04-15 13:44:30 +02:00
Emanuel Schütze
537eeadce4
Merge pull request #5312 from jsangmeister/adjustSettingsReadme 
Add ENABLE_ELECTRONIC_VOTING to settings readme
 2020-04-15 11:09:48 +02:00
Joshua Sangmeister
96ee1c0af3 fixed user import 2020-04-15 10:27:07 +02:00
Joshua Sangmeister
99416e3043 added ENABLE_ELECTRONIC_VOTING to settings readme 2020-04-15 10:15:19 +02:00
Emanuel Schütze
0f8167e39c
Merge pull request #5311 from jsangmeister/fixPseudoanonymize 
Fix pseudoanonymize on client
 2020-04-15 09:54:21 +02:00
Joshua Sangmeister
9864ff3847 fixed pseudoanonymize on client 2020-04-15 09:42:22 +02:00
Emanuel Schütze
a7518ed5b6
Merge pull request #5310 from tsiegleauq/better-category-sorting 
Sort motions in categories by inner weight (again)
 2020-04-15 09:25:19 +02:00