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

7819 Commits

Author SHA1 Message Date
Finn Stutzenstein 708e176c2c
Merge pull request #5477 from FinnStutzenstein/schema 
OS4 Schema: agenda items have tags
 2020-07-22 13:29:28 +02:00
FinnStutzenstein 7d5cee923a
OS4 Schema: agenda items have tags 2020-07-17 08:38:55 +02:00
Finn Stutzenstein 846fb982f0
Merge pull request #5471 from tsiegleauq/ignore-more 
Ignore venv
 2020-07-17 07:04:54 +02:00
Sean ce3446bbe5 Ignore venv 
.virtualenv should be ignored since it might still exist
from openslides 3.
 2020-07-16 15:10:57 +02:00
Finn Stutzenstein 357e54ec93
Merge pull request #5474 from FinnStutzenstein/update 
Updated auth service
 2020-07-15 16:54:35 +02:00
FinnStutzenstein b6b041d0b6
Updated auth service 2020-07-15 16:54:01 +02:00
Finn Stutzenstein 06b520f3e6
Merge pull request #5466 from GabrielInTheWorld/add-auth-service 
Adds submodule openslides-auth-service
 2020-07-15 16:41:10 +02:00
GabrielMeyer 1f8e3d60e6 Adds submodule openslides-auth-service 2020-07-14 16:21:49 +02:00
Finn Stutzenstein 89f4323d11
Merge pull request #5460 from jsangmeister/update-models 
Add new settings to meeting model
 2020-07-09 12:53:00 +02:00
Joshua Sangmeister bedbb75c69 Add new settings to meeting model 2020-07-09 12:46:54 +02:00
Finn Stutzenstein 64628e4be9
Merge pull request #5458 from jsangmeister/update-datastore 
Update datastore commit & config
 2020-07-09 12:38:14 +02:00
Joshua Sangmeister 7cc6d1fda2 Update autoupdate, backend, client 2020-07-09 11:56:00 +02:00
Joshua Sangmeister 5dc22a7a60 Update datastore commit & config 2020-07-09 09:25:37 +02:00
Finn Stutzenstein 57b4dbd463
Merge pull request #5436 from FinnStutzenstein/clientStartup 
Fixed client startup
 2020-07-06 09:14:39 +02:00
FinnStutzenstein 8b537d32c0
Fixed client startup 2020-07-06 09:14:03 +02:00
Finn Stutzenstein c6fdb627f6
Merge pull request #5409 from FinnStutzenstein/integration 
Integration of the backend and autoupdate service
 2020-06-18 12:45:38 +02:00
FinnStutzenstein fe8a74ddf4
Integrate the autoupdate and backend service 2020-06-18 12:43:06 +02:00
jsangmeister b6a9d7dee8
Merge pull request #5400 from jsangmeister/fix-reserve-ids-specs 
Fix reserveIds specification
 2020-06-09 13:55:03 +02:00
Joshua Sangmeister 1f822d59dd Fix reserveIds specification 2020-06-09 13:55:40 +02:00
jsangmeister 38c67c6dd3
Merge pull request #5358 from jsangmeister/add-reader-to-dc 
Add reader to docker compose files
 2020-06-02 09:58:30 +02:00
jsangmeister 6c944eeaa8
Merge pull request #5379 from jsangmeister/change-return-types 
Change return type of getAll and filter
 2020-05-19 16:27:32 +02:00
Joshua Sangmeister ba69386f94 Change return type of getAll and filter 2020-05-19 16:04:48 +02:00
jsangmeister 209eff276e
Merge pull request #5357 from jsangmeister/datastore-rename-getids 
Datastore: Rename getIds
 2020-05-14 13:29:34 +02:00
Joshua Sangmeister 46ecb24f59 added reader to docker compose files 2020-05-13 16:29:46 +02:00
Joshua Sangmeister ff9acfe81d renamed getIds 2020-05-07 10:13:07 +02:00
jsangmeister 1196d1052b
Merge pull request #5350 from jsangmeister/updateDatastoreSpecs 
Added routes to datastore spec
 2020-05-05 14:24:24 +02:00
Joshua Sangmeister 66119dffda added routes to datastore spec 2020-05-05 14:24:40 +02:00
Finn Stutzenstein 8696beb6a9
Merge pull request #5327 from FinnStutzenstein/fixExampleData 
Fixed example data II
 2020-05-05 12:29:33 +02:00
jsangmeister ae6c214cd4
Merge pull request #5342 from jsangmeister/update-interface 
Updated datastore interface
 2020-05-05 10:05:52 +02:00
FinnStutzenstein 52d992d2ff
Fixed example data II 2020-04-30 09:11:11 +02:00
Joshua Sangmeister f66346405b updated datastore interface 2020-04-28 11:59:28 +02:00
Norman Jäckel bc19de9570
Merge pull request #5287 from FinnStutzenstein/fixExampleData 
Small fixes for models and example data
 2020-04-17 14:29:56 +02:00
FinnStutzenstein 4b1c9bc190 Small fixes for models and example data 2020-04-14 15:26:37 +02:00
jsangmeister d3b9404efd
Update datastore-service.txt 2020-04-08 11:20:55 +02:00
Norman Jäckel 952355ab94
Merge pull request #5292 from normanjaeckel/SmallFixes 
Fixed typos in docs.
 2020-04-03 14:08:51 +02:00
Norman Jäckel 252fe7dd51 Fixed typos in docs. 2020-04-03 13:24:15 +02:00
Norman Jäckel a45ac5d2e5
Merge pull request #5220 from normanjaeckel/RestrictionDev 
Added first draft for restriction and presenter interfaces.
 2020-04-03 13:14:29 +02:00
Finn Stutzenstein c4711cf714
Merge pull request #5261 from FinnStutzenstein/modelle 
Refined models
 2020-03-25 13:40:39 +01:00
jsangmeister 3ae373b8f1
Merge pull request #5263 from jsangmeister/minor-fixes 
Adjustments for datastore spec
 2020-03-25 13:04:15 +01:00
Joshua Sangmeister 1f80202218 adjustments to datastore specs 2020-03-25 13:04:20 +01:00
Norman Jäckel 642fae8bdc Fixed typos. 2020-03-24 21:14:43 +01:00
FinnStutzenstein 34ccd7abe8 Refined models 2020-03-24 15:49:02 +01:00
Finn Stutzenstein d77e1c4cd8
Merge pull request #5258 from GabrielInTheWorld/dev-auth 
Adds interface for auth-service
 2020-03-23 14:45:20 +01:00
Finn Stutzenstein a2da322a4d
Merge pull request #5268 from OpenSlides/autoupdate-interface 
Fix autoupdate interface
 2020-03-23 14:44:09 +01:00
Oskar Hahn e076fca655 Fix autoupdate interface 2020-03-23 14:43:19 +01:00
Finn Stutzenstein d7fd87d249
Merge pull request #5257 from FinnStutzenstein/serverClientStreaming 
Client server communication
 2020-03-23 14:36:18 +01:00
GabrielMeyer ce1df508cd Adds interface for auth-service 2020-03-23 13:30:26 +01:00
FinnStutzenstein e43e46fca7 Client server communication 2020-03-18 08:18:00 +01:00
FinnStutzenstein 73e6eddf89 Refine presenter service 2020-03-17 11:21:59 +01:00
Finn Stutzenstein 4f029d336c
Merge pull request #5256 from FinnStutzenstein/updatedClient 
Updated Client
 2020-03-17 09:02:50 +01:00