Emanuel Schütze
|
77f6516438
|
Merge pull request #6149 from emanuelschuetze/update-20210708
Updated services
|
2021-07-08 18:19:20 +02:00 |
|
Emanuel Schütze
|
c98e10e607
|
Updated os4 services
|
2021-07-08 17:15:53 +02:00 |
|
Finn Stutzenstein
|
47ac8ac984
|
Merge pull request #6147 from FinnStutzenstein/datastoreLib
Datastore lib
|
2021-07-08 10:30:27 +02:00 |
|
Finn Stutzenstein
|
ba72cb8b01
|
Datastore library
|
2021-07-08 10:29:43 +02:00 |
|
Finn Stutzenstein
|
a0ec4be644
|
Merge pull request #6144 from FinnStutzenstein/openslides4-dev
clean up docs that are in the wiki
|
2021-07-08 09:07:49 +02:00 |
|
jsangmeister
|
238f8fa602
|
Merge pull request #6145 from jsangmeister/split-forwarding-tree-motion-ids
Split forwarding_tree_motion_ids into two fields
|
2021-07-08 09:07:28 +02:00 |
|
Joshua Sangmeister
|
7f8a00ea4e
|
Split forwarding_tree_motion_ids into two fields
|
2021-07-05 14:52:29 +02:00 |
|
Finn Stutzenstein
|
65bd70375d
|
clean up docs that are in the wiki
|
2021-07-05 08:22:56 +02:00 |
|
Sean
|
610a10712d
|
Merge pull request #6142 from tsiegleauq/add-helpdesk-to-yml
Add conference_enable_helpdesk to models
|
2021-07-01 16:33:47 +02:00 |
|
Sean
|
a131424c8f
|
Add conference_enable_helpdesk to models
Adjust models.yml and the json files to support the helpdesk settings
|
2021-07-01 16:17:14 +02:00 |
|
Sean
|
fb9e9513fc
|
Merge pull request #6141 from jsangmeister/fix-number-fields
Fix initial data for conference_auto_connect_next_speakers and datavalidator for number fields
|
2021-07-01 16:03:25 +02:00 |
|
Joshua Sangmeister
|
d7c67248dc
|
Fix initial data for conference_auto_connect_next_speakers and datavalidator for number fields
|
2021-07-01 15:58:14 +02:00 |
|
Emanuel Schütze
|
d1d69954f5
|
Merge pull request #6136 from emanuelschuetze/icc-image
Added icc image
|
2021-06-30 16:04:43 +02:00 |
|
Emanuel Schütze
|
334931c0d9
|
Added icc image
|
2021-06-30 16:03:10 +02:00 |
|
Emanuel Schütze
|
dbb146e92c
|
Merge pull request #6135 from emanuelschuetze/services
Updated services
|
2021-06-30 14:33:20 +02:00 |
|
Emanuel Schütze
|
de01e81306
|
Updated services
|
2021-06-30 14:31:30 +02:00 |
|
Oskar Hahn
|
d56800b510
|
Merge pull request #6131 from ostcar/icc-service
Add ICC Service
|
2021-06-29 20:22:38 +02:00 |
|
Oskar Hahn
|
a38942b6eb
|
Add ICC Service
|
2021-06-29 20:20:59 +02:00 |
|
Finn Stutzenstein
|
a9fbac74bb
|
Merge pull request #6133 from FinnStutzenstein/openslides4-dev
Fix exporting the DS
|
2021-06-28 12:45:01 +02:00 |
|
Finn Stutzenstein
|
9519849c45
|
Fix exporting the DS
Introduced with #6055
|
2021-06-28 12:42:33 +02:00 |
|
Emanuel Schütze
|
a52467f740
|
Merge pull request #6132 from emanuelschuetze/os4-update
Updated os4 sevices
|
2021-06-28 12:11:39 +02:00 |
|
Emanuel Schütze
|
6bbca6cc66
|
Updated os4 services
|
2021-06-28 12:05:04 +02:00 |
|
Finn Stutzenstein
|
1df22d4fc3
|
Merge pull request #6128 from FinnStutzenstein/adjustDatavalidator
Adjust datavalidator
|
2021-06-24 11:25:10 +02:00 |
|
Finn Stutzenstein
|
b3f17db2a3
|
Adjust datavalidator
- collection whitelist instead of blacklist
- added field mediafile/blob for import
|
2021-06-24 11:23:07 +02:00 |
|
Sean
|
6f24efa544
|
Merge pull request #6125 from tsiegleauq/add-imported_at
Add imported_at to models.yml
|
2021-06-21 15:08:47 +02:00 |
|
Sean
|
a841919c31
|
Add imported_at to models.yml
Adds the imported_at field to the models.yml file
|
2021-06-21 15:07:30 +02:00 |
|
Finn Stutzenstein
|
603a558b42
|
Merge pull request #6124 from FinnStutzenstein/datavalidator
Enhance datavalidator for template fields
|
2021-06-21 15:06:54 +02:00 |
|
Finn Stutzenstein
|
e8dd5d56d1
|
Enhance datavalidator for template fields
|
2021-06-21 11:18:59 +02:00 |
|
Ralf Peschke
|
8c1fa5be91
|
Merge pull request #6116 from r-peschke/PR_Move_translation_from_org_to_meeting
- Move custom_translation from organization to meeting
- Initialization of custom_translations as {}
|
2021-06-15 11:36:06 +02:00 |
|
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 |
|