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

8362 Commits

Author SHA1 Message Date
Ludwig Reiter 62282cc964 motion_submitter does not need a default. In the creating a weight is always set. 2021-07-29 14:14:33 +02:00
Emanuel Schütze b19f2189c9
Merge pull request #6187 from jsangmeister/fix-motion-preamble 
Fix default motion preamble
 2021-07-27 17:37:59 +02:00
Joshua Sangmeister 8b7a8bf6de Fix default motion preamble 2021-07-27 17:12:15 +02:00
reiterl 8d3f0a24ea
Merge pull request #6182 from reiterl/dev_model_gender 
Dev model gender
 2021-07-23 13:49:20 +02:00
Ludwig Reiter 1c3088841a Update initial-data. 2021-07-23 13:44:06 +02:00
Ludwig Reiter d6c5b16a8a Add some gender to example data. 2021-07-23 13:35:18 +02:00
Ludwig Reiter 6e26108531 Update models: user/gender field. 2021-07-23 12:55:27 +02:00
Emanuel Schütze 4913ac5920
Merge pull request #6178 from emanuelschuetze/update-20210720 
Updated os4 services
 2021-07-20 16:59:15 +02:00
Emanuel Schütze a30477ded0 Updated os4 services 2021-07-20 16:56:02 +02:00
Emanuel Schütze 01b2b53e24
Merge pull request #6169 from emanuelschuetze/update-20210716a 
Updated os4 services
 2021-07-16 16:03:46 +02:00
Emanuel Schütze 53fd8148c4 Updated os4 services 2021-07-16 16:02:45 +02:00
Finn Stutzenstein b04fe236f2
Merge pull request #6168 from FinnStutzenstein/adjustModelsYml 
Fix limits for LOS settings (closes #6167)
 2021-07-16 13:57:32 +02:00
Finn Stutzenstein 3b14153965
Fix limits for LOS settings (closes #6167) 2021-07-16 12:37:57 +02:00
Emanuel Schütze 233fb8dfca
Merge pull request #6164 from emanuelschuetze/update-20210716 
Updated os4 client
 2021-07-16 08:52:01 +02:00
Emanuel Schütze a63643e762 Updated os4 client 2021-07-16 08:44:26 +02:00
Emanuel Schütze c603960291
Merge pull request #6163 from emanuelschuetze/update-20210715 
Updated os4 services
 2021-07-15 23:37:54 +02:00
Emanuel Schütze cac529e7c3 Updated os4 services 2021-07-15 23:33:08 +02:00
jsangmeister d8b06c8c2d
Merge pull request #6162 from jsangmeister/user-cascade-deletion 
Add cascade deletion to user->speaker relation
 2021-07-15 16:10:44 +02:00
Joshua Sangmeister 15e37df62d Fix on_delete field in template fields 2021-07-15 16:06:47 +02:00
Joshua Sangmeister 239e0ff30f Add cascade deletion to user->speaker relation 2021-07-15 16:02:59 +02:00
Emanuel Schütze ca4d5783d7
Merge pull request #6159 from emanuelschuetze/update-20210714 
Updated os4 services
 2021-07-14 21:05:27 +02:00
Emanuel Schütze 6762888333 Updated os4 services 2021-07-14 21:01:19 +02:00
jsangmeister 9b3271277f
Merge pull request #6155 from jsangmeister/remove-majority-method 
Remove majority method
 2021-07-12 10:47:30 +02:00
Joshua Sangmeister feee6952e7 Remove majority method 2021-07-12 10:17:06 +02:00
Finn Stutzenstein 372fe17bf1
Merge pull request #6153 from GabrielInTheWorld/interaction-into-models 
Adds applause configs to the meeting model
 2021-07-12 07:21:27 +02:00
GabrielMeyer 0e56d1360e Adds applause configs to the meeting model 2021-07-09 15:46:40 +02:00
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