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

8554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
4d706f648f
Merge pull request #5943 from emanuelschuetze/translationDiffService 
Add translation service to DiffService.
 2021-03-08 13:28:59 +01:00
Emanuel Schütze
ba0e9b3bc6 Add translation service to DiffService. 2021-03-08 12:54:22 +01:00
Emanuel Schütze
92afd07b62
Merge pull request #5940 from CatoTH/bugfix/dont-show-diff-view-with-no-crs-on-slides 
Don't show diff view on slides if no change recos exist
 2021-03-08 11:49:05 +01:00
Finn Stutzenstein
3ba4f99876
Delete unused code 
@oscar: Only the user restricter is still present in the code since it is needed for whoami
 2021-03-08 08:57:21 +01:00
Tobias Hößl
bef322d0a4
Don't show diff view on slides if no change recos exist 2021-03-06 19:16:22 +01:00
Emanuel Schütze
a11682a708
Merge pull request #5939 from emanuelschuetze/translation-20210304 
Updated translations
 2021-03-05 08:33:10 +01:00
Emanuel Schütze
bc9b028624 Updated translations 2021-03-05 07:44:49 +01:00
Emanuel Schütze
291402e159
Merge pull request #5920 from CatoTH/bugfix/inconsistency-amendment-paragraphs 
Bugfix: better handling of inconsistent states in amendments if the b…
 2021-03-04 21:26:12 +01:00
Emanuel Schütze
bd7fa9b3db
Merge pull request #5935 from FinnStutzenstein/userAutoupdateOnPermissionChange 
Update users on can_see_extra_data permission change
 2021-03-04 21:23:04 +01:00
Tobias Hößl
ac50d6f8dc Bugfix: better handling of inconsistent states in amendments if the base motion has shrunk 2021-03-04 21:17:14 +01:00
Finn Stutzenstein
265145f001
Merge pull request #5936 from FinnStutzenstein/redisTimeoutErrors 
Attempt on handling timeout errors
 2021-03-04 09:09:38 +01:00
Finn Stutzenstein
39fb2fadec
Attempt on handling timeout errors 
This code retries to load sessions three times. If not an error will be
thrown. There are other solutions (Like not throwing the error), but
I would like to see errors in production usage to see, if this helps or
not.
 2021-03-04 08:45:45 +01:00
Finn Stutzenstein
d62d1a687b
Merge pull request #5918 from FinnStutzenstein/removeVotedIds 
Remove voted_ids
 2021-03-04 08:20:19 +01:00
Finn Stutzenstein
d0c1879521
Update users on can_see_extra_data permission change 2021-03-04 08:20:05 +01:00
Finn Stutzenstein
93da435e7c
Remove voted_id for ongoing polls 2021-03-04 07:56:11 +01:00
Emanuel Schütze
45948c47fb
Merge pull request #5881 from FinnStutzenstein/updateDeps 
Update Dependencies
 2021-03-02 23:15:53 +01:00
Finn Stutzenstein
3504a87295 Update Dependencies 2021-03-02 22:53:48 +01:00
Emanuel Schütze
d83b7c0ea9
Merge pull request #5933 from emanuelschuetze/translations-20210302 
Updated translations
 2021-03-02 22:48:41 +01:00
Emanuel Schütze
155ade1a8c Updated translations 2021-03-02 22:27:45 +01:00
Emanuel Schütze
f80ac1d9c5
Merge pull request #5932 from emanuelschuetze/autoupdate 
Updated autoupdate service
 2021-03-01 20:45:56 +01:00
Emanuel Schütze
2c7196493d Updated autoupdate service 2021-03-01 20:24:19 +01:00
Emanuel Schütze
46223328f7
Merge pull request #5926 from FinnStutzenstein/quotaexceedederror 
Error handling
 2021-03-01 17:38:55 +01:00
Finn Stutzenstein
619a698272 Error handling: 
- catch QuotaExceededError
- add generic error message to the spinner
 2021-03-01 17:10:22 +01:00
GabrielInTheWorld
a450a1dff5
Merge pull request #5898 from GabrielInTheWorld/cleanup-fix-spinner 
Some cleanup in favor of spinner-fixes
 2021-03-01 16:49:02 +01:00
Emanuel Schütze
d73b2142b7
Merge pull request #5928 from FinnStutzenstein/orderAssignmentOptions 
order assignment options by weight
 2021-03-01 16:25:14 +01:00
Emanuel Schütze
05fcf40b51
Merge pull request #5929 from FinnStutzenstein/chatPersistance 
Do not clear chat notifications from local storage
 2021-03-01 16:19:28 +01:00
Emanuel Schütze
83ff7b938c
Merge pull request #5927 from FinnStutzenstein/pointOfOrderOnlyCanSpeak 
Point of order only for agenda.can_be_speaker
 2021-03-01 16:12:44 +01:00
GabrielMeyer
7314bf0999 Cleanup spinner-fixes 
- Rename: noop-interceptor -> stable-interceptor
- Put logic from stable.service to openslides-status.service
 2021-03-01 16:11:08 +01:00
Emanuel Schütze
d3530a3657
Merge pull request #5931 from emanuelschuetze/caddy-dev 
Disabled caddy debug mode in dev setup.
 2021-03-01 15:49:30 +01:00
Emanuel Schütze
3d8f3a69af Disabled caddy debug mode in dev setup. 2021-03-01 15:39:51 +01:00
Emanuel Schütze
7dcc0ad42a
Merge pull request #5924 from emanuelschuetze/agenda-config 
Fixed showSubtitle config. Reordered agenda config.
 2021-03-01 15:37:17 +01:00
Finn Stutzenstein
c35cacebb1
Merge pull request #5930 from FinnStutzenstein/losPermissions 
Fix usage of osPerms
 2021-03-01 15:37:06 +01:00
Emanuel Schütze
4e6f0850c4 Fixed showSubtitle config. Reordered agenda config. 2021-03-01 15:21:43 +01:00
Finn Stutzenstein
33fca309c4
Fix usage of osPerms 2021-03-01 15:14:13 +01:00
Finn Stutzenstein
b13732f9ec
Do not clear chat notifications from local storage 2021-03-01 15:00:47 +01:00
Finn Stutzenstein
0a8274e6e2
order assignment options by weight 2021-03-01 14:40:06 +01:00
Finn Stutzenstein
a9045b6a1c
Point of order only for agenda.can_be_speaker 2021-03-01 14:31:40 +01:00
Emanuel Schütze
2d4ece84a0
Merge pull request #5922 from gsiv/dev/build-proxy-default 
Docker: Remove proxy as a default build target
 2021-03-01 13:26:36 +01:00
Emanuel Schütze
a796b2a8b8
Merge pull request #5923 from gsiv/dev/yml-nocmd 
Docker: Remove server command override examples
 2021-03-01 13:25:17 +01:00
Gernot Schulz
cd98502b1c Docker: Remove server command override examples 
The YAML configuration files include comments outlining how to override
the server image's default command.  They are supposed to help with, for
example, replacing gunicorn with daphne.

These comments have diverged from the actual command used in current
images.  Furthermore, at least to my knowledge, the setup has not been
used or tested with daphne in a long time.  For these reasons, this
patch removes the comments without a replacement.

If there still is, in fact, a use case for the instructions, they would
need to be updated and their location should be reconsidered.
 2021-03-01 11:06:52 +01:00
Gernot Schulz
8d393ba17f Docker: Remove proxy as a default build target 
The proxy image is not going to be subject to regular change and is
instead more similar to services such as the database.  Therefore, it
does not need to be a default build target of build.sh.
 2021-03-01 10:48:47 +01:00
Emanuel Schütze
e75bdeb0f7
Merge pull request #5913 from FinnStutzenstein/fixPointOfOrderWeighting 
Fix point of order weighting
 2021-02-23 11:11:51 +01:00
Finn Stutzenstein
f8446ee609
Fix point of order weighting 2021-02-22 13:33:36 +01:00
Emanuel Schütze
baad950698
Merge pull request #5902 from FinnStutzenstein/ChatAccessGroups 
Change chat access groups
 2021-02-19 15:18:08 +01:00
Finn Stutzenstein
4929e2b6f6 Change chat access groups 
Adjust some client chat feature

- Cleanup some stuff
- Read and write chatting
 2021-02-19 15:08:02 +01:00
Emanuel Schütze
e72cebca4a
Merge pull request #5909 from emanuelschuetze/autoupdate-20210219 
Updated autoupdate service
 2021-02-19 13:20:15 +01:00
Emanuel Schütze
e11f0f6f25
Merge pull request #5908 from fwolfst/README-IMPROVEMENTS 
improve links in README
 2021-02-19 13:20:03 +01:00
Emanuel Schütze
9f16bfee21 Updated autoupdate service 2021-02-19 13:01:07 +01:00
Felix Wolfsteller
5152a448be improve links in README 2021-02-19 12:52:17 +01:00
Emanuel Schütze
500b773ee1
Merge pull request #5903 from emanuelschuetze/autoupdate 
Updated autoupdate service
 2021-02-18 11:52:48 +01:00