Commit Graph

8307 Commits

Author SHA1 Message Date
Ralf Peschke
6816419da9 Initialization of custom_translations as {} 2021-06-15 11:31:48 +02:00
Ralf Peschke
18534b6f75 Move custom_translation from organization to meeting: initial and example.json 2021-06-14 15:18:51 +02:00
Ralf Peschke
80b05fda2f Move custom_translation from organization to meeting 2021-06-14 15:08:01 +02:00
jsangmeister
41b5ee0340
Merge pull request #6115 from jsangmeister/model-locked-error-interface
Update datastore interface for model locked error
2021-06-14 09:16:17 +02:00
Joshua Sangmeister
0778681181 Update datastore interface for model locked error 2021-06-10 16:05:56 +02:00
Finn Stutzenstein
a3b2784cc7
Merge pull request #6111 from reiterl/permission_chat_group_can_manage
Add chat.can_manage to permissions enum.
2021-06-08 21:51:39 +02:00
Ludwig Reiter
d5a43ea8c4 Add chat.can_manage to permissions enum. 2021-06-08 12:15:06 +02:00
Finn Stutzenstein
e56786d375
Merge pull request #6107 from FinnStutzenstein/chatgroups
[WIP] Added chat groups
2021-06-07 11:55:17 +02:00
Finn Stutzenstein
bc310a98e6
Added chat groups 2021-06-07 11:18:05 +02:00
Finn Stutzenstein
cc2a40a178
Merge pull request #6101 from FinnStutzenstein/organizationSpelling
Fixed spelling of organization and update submodules
2021-06-03 15:18:49 +02:00
Finn Stutzenstein
6572e8b20c
Fixed spelling of organization and update submodules 2021-06-03 15:15:15 +02:00
Finn Stutzenstein
cdbb5f1a83
Merge pull request #6093 from r-peschke/PR_OS4_is_demo_user_not_RO
is_demo_user is no more read only
2021-06-03 07:21:35 +02:00
Ralf Peschke
ac457fdb2c is_demo_user is no more read only 2021-06-01 10:01:50 +02:00
reiterl
1e52ef9148
Merge pull request #6092 from reiterl/models_orga
Rm ro from organisation.enable_electronic_voting
2021-05-31 15:25:53 +02:00
Ludwig Reiter
2f80d1a11e Rm ro from organisation.enable_electronic_voting 2021-05-31 15:23:12 +02:00
Finn Stutzenstein
aaf476fba7
Merge pull request #6090 from FinnStutzenstein/fixDatastoreCommands
Fix clearing the DS.
2021-05-31 09:16:58 +02:00
Finn Stutzenstein
acdb206632
Fix clearing the DS.
Introduced with #6055
2021-05-31 09:14:47 +02:00
Finn Stutzenstein
d990b098c5
Merge pull request #6068 from FinnStutzenstein/fixDefaultProjectorRelation
Fix default projector relation
2021-05-20 13:22:15 +02:00
Finn Stutzenstein
56423737bc
Fix example data for default projectors 2021-05-20 13:18:33 +02:00
reiterl
a956f2d996
Merge pull request #6069 from reiterl/models_jitsi_rm_ro
Remove read_only from meeting/jitsi_*
2021-05-20 13:13:24 +02:00
Ludwig Reiter
8a51e6ae85 Remove read_only from meeting/jitsi_* 2021-05-20 13:10:21 +02:00
Finn Stutzenstein
6d64c0c62b
Merge pull request #6065 from FinnStutzenstein/ownPassword
change model of can_change_own_password
2021-05-20 12:25:23 +02:00
Finn Stutzenstein
fa67c4874b
change model of can_change_own_password 2021-05-20 12:23:43 +02:00
Norman Jäckel
3d44fc4730
Merge pull request #6055 from ostcar/tunnel
Update manage service
2021-05-17 00:18:52 +02:00
Oskar Hahn
f473796ce6 Update manage service
It know has a tunnel command. See

manage help tunnel

for more information and examples.

There is not need to open the ports
2021-05-17 00:17:26 +02:00
Oskar Hahn
3b41fb468e
Merge pull request #6027 from normanjaeckel/ManageSetupCommand
Manage setup command
2021-05-16 23:59:41 +02:00
jsangmeister
12f465e0b8
Merge pull request #6062 from jsangmeister/fix-typo
Fix typos
2021-05-11 10:19:26 +02:00
Joshua Sangmeister
ae8951ee82 Fix typos 2021-05-11 10:16:16 +02:00
jsangmeister
862bc8c182
Merge pull request #6052 from jsangmeister/fix-models
Fix models
2021-05-10 12:49:39 +02:00
Joshua Sangmeister
24e0771d05 Fix models.yml 2021-05-06 09:10:04 +02:00
Finn Stutzenstein
50fdaca46f
Merge pull request #6029 from FinnStutzenstein/remodelUsers
Remodel users
2021-05-03 14:01:19 +02:00
Norman Jäckel
e99eb0bf0b Review 2021-05-01 11:15:03 +02:00
Norman Jäckel
b4a034d900 Switched to GitHub Container Registry. 2021-04-30 13:54:05 +02:00
Norman Jäckel
e9357b2c10 New production setup with Docker Compose
Updated openslides-manage-service and changed README.md

Added GitHub workflow.
2021-04-30 00:41:04 +02:00
Finn Stutzenstein
be883f2a0d
Remodel users 2021-04-29 14:29:08 +02:00
Finn Stutzenstein
2fd4160aaa
Merge pull request #6041 from FinnStutzenstein/os4-pro-contra-note
Pro/contra/marked/note for OS4
2021-04-29 14:12:13 +02:00
Finn Stutzenstein
4c10007bab
example- and initial data 2021-04-29 14:09:21 +02:00
Finn Stutzenstein
e2c7287812
Pro/contra/marked/note for OS4 2021-04-29 12:00:53 +02:00
Finn Stutzenstein
09ba505277
Merge pull request #6039 from FinnStutzenstein/revert-6032
Revert updating manageservice
2021-04-29 08:05:33 +02:00
Finn Stutzenstein
eaef28029b
Revert updating manageservice
It breaks the deployment
2021-04-29 08:03:38 +02:00
GabrielInTheWorld
9efb47f2a5
Merge pull request #6032 from GabrielInTheWorld/update-subprojects
Update subprojects to their current master
2021-04-27 10:10:21 +02:00
GabrielMeyer
dbe74308b7 Update subprojects to current master 2021-04-26 16:36:27 +02:00
Finn Stutzenstein
60cae02ec7
Merge pull request #6016 from FinnStutzenstein/pollBackend
poll backend
2021-04-26 07:20:48 +02:00
jsangmeister
25d8f88ea0
Merge pull request #6018 from jsangmeister/locked-fields-as-list
Change locked fields to a list
2021-04-22 15:31:44 +02:00
Joshua Sangmeister
595a3fea90 Make change non-breaking 2021-04-22 12:23:16 +02:00
Joshua Sangmeister
6ca37f8067 Lock CollectionField with array 2021-04-22 09:33:20 +02:00
Finn Stutzenstein
5fff49e336
poll backend 2021-04-19 09:22:55 +02:00
Finn Stutzenstein
d216e3121f
Merge pull request #6013 from FinnStutzenstein/update
Update submodules
2021-04-15 16:24:40 +02:00
Finn Stutzenstein
6eccda1217
Update submodules 2021-04-15 16:19:11 +02:00
jsangmeister
f703a77796
Merge pull request #6012 from jsangmeister/make-countdown-times-required
Make countdown times required
2021-04-15 11:27:27 +02:00