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

8357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ludwig Reiter
1078a7101a Change theme/organization_ids 
It should be a relation and not a relation-list, as there is only one
organization and it is renamed to avoid name conflict.
 2021-10-08 09:15:09 +02:00
Ludwig Reiter
9c0329b2ad Change theme attribute names, because large letters are not allowed. 2021-10-08 09:15:09 +02:00
Ludwig Reiter
703d61a3b7 Update models.yml, initial-data.json and example-data.json 2021-10-08 09:15:09 +02:00
Ludwig Reiter
d5d41a532a Add organization/theme_ids to models.yml 2021-10-08 09:14:29 +02:00
Ludwig Reiter
c293544f24 Remove user/theme_id. 2021-10-08 09:14:29 +02:00
Ludwig Reiter
225a6eb5de Update initial and example data. 2021-10-08 09:14:29 +02:00
Ludwig Reiter
494b8d54f4 Rename organization/theme_id into default_theme_id. 2021-10-08 09:14:29 +02:00
Ludwig Reiter
1da3c6dced Changes to the models.yml. 2021-10-08 09:14:29 +02:00
Ludwig Reiter
23e7bc4df2 Fix minus problem in var names. 2021-10-08 09:14:29 +02:00
Ludwig Reiter
38ac9c2838 Fix type. 2021-10-08 09:14:29 +02:00
Ludwig Reiter
90d705666d Add theme collection to models. 2021-10-08 09:14:29 +02:00
Emanuel Schütze
855f5f2e86
Merge pull request #6247 from GabrielInTheWorld/updates 
Updates services
 2021-10-07 19:27:57 +02:00
GabrielMeyer
42b30d1ea9 Updates services 2021-10-07 16:33:38 +02:00
jsangmeister
4021c7620b
Merge pull request #6244 from jsangmeister/add-state-weight 
Add motion state weight
 2021-10-07 14:04:02 +02:00
Joshua Sangmeister
cb85892447 Fix checksum 2021-10-06 15:43:00 +02:00
Joshua Sangmeister
3f4a020808 Update Backend 2021-10-06 15:25:47 +02:00
Joshua Sangmeister
615736eda2 Fix example & initial data 2021-10-06 12:54:52 +02:00
Joshua Sangmeister
9483414fb3 Add motion state weight 2021-10-06 10:45:15 +02:00
reiterl
973184237a
Merge pull request #6243 from jsangmeister/fix-gh-actions 
Fix initial data workflow
 2021-10-05 13:12:35 +02:00
Joshua Sangmeister
72d5ee06d3 Fix initial data workflow 2021-10-04 15:18:29 +02:00
Norman Jäckel
0e95e7f7e0
Merge pull request #6236 from normanjaeckel/Typo 
Fixed typo and changed some format.
 2021-10-02 20:07:05 +02:00
GabrielInTheWorld
34b6fcd0b3
Merge pull request #6239 from GabrielInTheWorld/updates 
Updates the client, backend and media-service
 2021-10-01 15:14:04 +02:00
GabrielMeyer
788afca754 Updates the client, backend and media-service 2021-10-01 14:29:57 +02:00
Emanuel Schütze
c4dcedcb17
Merge pull request #6238 from emanuelschuetze/update-20210930 
Updated services
 2021-09-30 09:37:05 +02:00
Emanuel Schütze
8859892e10 Updated services 2021-09-30 09:18:01 +02:00
GabrielInTheWorld
5415f68723
Merge pull request #6237 from GabrielInTheWorld/updating-client 
New version of the client
 2021-09-29 17:40:31 +02:00
GabrielMeyer
64908007c7 New version 2021-09-29 16:54:41 +02:00
Norman Jäckel
44a3193406 Fixed typo and changed some format. 2021-09-28 22:13:13 +02:00
Emanuel Schütze
c628fe3244
Merge pull request #6235 from emanuelschuetze/update-20210924 
Updated services
 2021-09-24 11:51:58 +02:00
Emanuel Schütze
ddc8cd2716 Updated services 2021-09-24 11:34:17 +02:00
Emanuel Schütze
5aa0b84123
Merge pull request #6233 from peb-adr/fix-tagging 
fix client/version.txt path
 2021-09-24 11:31:02 +02:00
Adrian Richter
cc4666646d shouldve double checked the path 2021-09-24 11:08:14 +02:00
Emanuel Schütze
cda2c0c21c
Merge pull request #6224 from peb-adr/tagging 
unique version tag for docker images
 2021-09-24 10:36:18 +02:00
GabrielInTheWorld
058ee57658
Merge pull request #6232 from GabrielInTheWorld/of-perm-can-forward 
Updates the wording according to #6231
 2021-09-24 08:22:16 +02:00
Adrian Richter
4e00e13038 tag images uniquely + write to client/version.txt 
* adjust path to client/src/assets/version.txt

      * also tag as latest

      * add timestamp to image tag + client/version.txt
 2021-09-23 18:54:23 +02:00
GabrielMeyer
6629cf9ee7 Updates the wording 2021-09-23 16:57:50 +02:00
GabrielInTheWorld
7ffe5922a0
Merge pull request #6226 from r-peschke/BA939_New_field_motion_state_dont_set_identifier 
New field motion_state/dont_set_identifier (Backend #939)
 2021-09-23 14:45:46 +02:00
Ralf Peschke
0e830e677b Initia-dat.json plus workflow and new backend submodule 2021-09-23 14:10:44 +02:00
Ralf Peschke
761c248e19 Changed hash for initial_data.json 2021-09-23 14:10:44 +02:00
Ralf Peschke
1fe6e4e58e New field motion_state/dont_set_identifier (Backend #939) 2021-09-23 14:10:44 +02:00
GabrielInTheWorld
b81b7e9980
Merge pull request #6231 from GabrielInTheWorld/of-perm-can-forward 
Adjusts the models.yml to the new perm (#6230)
 2021-09-23 13:54:03 +02:00
GabrielMeyer
1fb1d834e1 Adjusts the models.yml to the new perm (#6230) 2021-09-23 13:31:28 +02:00
GabrielInTheWorld
3e553a2714
Merge pull request #6230 from GabrielInTheWorld/of-perm-can-forward 
Adds the perm 'motion.can_forward_to_this'
 2021-09-23 11:21:11 +02:00
GabrielMeyer
8b0811efa9 Adds the perm 'motion.can_forward_to_this' 2021-09-23 11:01:53 +02:00
Sean
b7c97baa1e
Merge pull request #6218 from tsiegleauq/integration-cypress 
Integration tests using cypress
 2021-09-21 11:02:09 +02:00
Sean
4134367b8a
Merge pull request #6225 from ostcar/remove_permission_service 
Remove permission service
 2021-09-17 12:26:39 +02:00
Sean
85c0e50c21 Integration tests using cypress 
Test client integration (client loads)
Test auth integration (client logs in)
Test backend integration (accept request)
  - broken
Test autoupdate integration (sends au to client)

Add manual cypress tests
Add dockered cypress tests

Add Readme
Add test execution to makefile
Add test execution to github-actions

TODO:
- Create user for tests
- flush db after every test
 2021-09-16 17:16:51 +02:00
Oskar Hahn
b504a1c51e Remove permission service 2021-09-15 16:20:39 +02:00
Emanuel Schütze
7c43e77fcb
Merge pull request #6221 from emanuelschuetze/update-20210913 
(4.0-beta-20210913) Updated services.
 2021-09-13 14:21:53 +02:00
Emanuel Schütze
a958549adb (4.0-beta-20210913) Updated services. 2021-09-13 14:16:27 +02:00