d550bb2b55
Configure HAProxy to use camelcase Content-Type header
2021-05-26 19:24:17 +02:00
dc9a92f193
Updated repo
2021-05-26 18:18:04 +02:00
cf50f2b839
Updates
2021-05-26 18:17:50 +02:00
d3c959301d
Merge branch 'master' of https://gitlab.com/digitaldemocratic/digitaldemocratic
2021-05-26 16:01:14 +02:00
bb0e29c6bc
updated submodule
2021-05-26 16:00:34 +02:00
dc9804973f
progress in admin
2021-05-26 16:00:16 +02:00
c92ff92c1c
Merge branch 'fix_docker-compose_config_environment_again' into 'master'
...
Fix docker-compose config enviroment again
See merge request digitaldemocratic/digitaldemocratic!9
2021-05-26 12:11:01 +00:00
d1c155d00f
Fix docker-compose config enviroment again
2021-05-26 13:28:41 +02:00
ec0721cc3a
updated submodule
2021-05-26 11:22:40 +02:00
7a8f47157c
fixed keycloak timeout session
2021-05-26 11:22:22 +02:00
22e35c01af
updated submodule
2021-05-25 19:19:42 +02:00
6a0e2f145a
Modified admin path to isard-sso-admin
2021-05-25 19:19:12 +02:00
5b935c9bbd
Updated sso submodule and moved admin there
2021-05-25 18:38:13 +02:00
757beff4e2
Added admin
2021-05-25 18:33:02 +02:00
155c5e86a4
Added web interface
2021-05-23 11:10:45 +02:00
34feaeb91a
updated submodule
2021-05-23 07:57:41 +02:00
e482c77bff
added admin against SPs and avatars on api
2021-05-23 01:12:45 +02:00
7a0176a6e3
added avatars on api
2021-05-23 01:12:07 +02:00
7edd696d9a
added test lib
2021-05-21 18:53:39 +02:00
974e5419c7
Merge branch 'master' of https://gitlab.com/digitaldemocratic/digitaldemocratic
2021-05-21 18:44:38 +02:00
6138e9c65b
added keycloak python lib
2021-05-21 18:44:25 +02:00
790afd2a9c
added jsons
2021-05-21 18:39:40 +02:00
a4a417ecee
Merge branch 'makefile_phony' into 'master'
...
PHONY Makefile recipes
See merge request digitaldemocratic/digitaldemocratic!4
2021-05-20 03:56:46 +00:00
a1042c89a8
Merge branch 'fix_docker-compose_config_environment' into 'master'
...
Fix docker-compose config enviroment
See merge request digitaldemocratic/digitaldemocratic!1
2021-05-20 03:56:23 +00:00
b048557c09
PHONY Makefile recipes
2021-05-19 22:33:12 +02:00
8699d16592
Fix docker-compose config enviroment
2021-05-19 22:26:51 +02:00
9f3952dc86
updated submodules
2021-05-19 21:59:02 +02:00
61739eae52
Merge branch 'nextcloud_disable_recommendations' into 'master'
...
Disable nextcloud file recommendations
See merge request digitaldemocratic/digitaldemocratic!3
2021-05-19 19:41:40 +00:00
0564b32306
Merge branch 'allow_nextcloud_into_other_app_iframes' into 'master'
...
Allow nextcloud into other app iframes
See merge request digitaldemocratic/digitaldemocratic!2
2021-05-19 19:41:18 +00:00
174a6d3ae5
Merge branch 'makefile_phony' into 'master'
...
PHONY Makefile recipes
See merge request isard/isard-sso!3
2021-05-19 19:39:24 +00:00
47fb5dd341
Merge branch 'fix_haproxy_docker_image_build_setting_version' into 'master'
...
Fix haproxy docker image build
See merge request isard/isard-sso!2
2021-05-19 19:39:16 +00:00
7a6b416e46
Merge branch 'makefile_phony' into 'master'
...
PHONY Makefile recipes
See merge request isard/isard-apps!7
2021-05-19 19:38:59 +00:00
45a5715092
Merge branch 'fix_haproxy_docker_image_build_setting_version' into 'master'
...
Fix haproxy docker image build
See merge request isard/isard-apps!6
2021-05-19 19:38:05 +00:00
6aebaee34a
Merge branch 'fix_wordpress_volumes_from' into 'master'
...
Fix wordpress volumes_from
See merge request isard/isard-apps!5
2021-05-19 19:37:46 +00:00
1006f273f1
Merge branch 'fix_etherpad_docker-comopose_version' into 'master'
...
Fix etherpad docker-compose version
See merge request isard/isard-apps!4
2021-05-19 19:37:11 +00:00
e911dba833
addes mising ymls
2021-05-19 19:30:24 +02:00
f494b4f454
PHONY Makefile recipes
2021-05-19 19:21:03 +02:00
7a8217ed21
added admin container
2021-05-19 19:19:16 +02:00
bf3cecc043
PHONY Makefile recipes
2021-05-19 19:18:43 +02:00
70e3946ac2
moved to dd
2021-05-19 19:15:38 +02:00
9cfaae1bd4
Disable nextcloud file recommendations
2021-05-19 19:03:17 +02:00
1cfa7c6eab
Fix haproxy docker image build
...
Fix it by setting the haproxy docker image version
2021-05-19 18:50:03 +02:00
ea3647372a
Fix haproxy docker image build
...
Fix it by setting the haproxy docker image version
2021-05-19 18:47:09 +02:00
ee3d400279
Allow nextcloud into other app iframes
2021-05-19 18:35:30 +02:00
d99a6f7334
Fix wordpress volumes_from
...
ERROR: The Compose file './docker/wordpress/wordpress.yml' is invalid because:
Unsupported config option for services.isard-apps-wordpress-cli: 'volumes_from'
2021-05-19 16:40:27 +02:00
d3c6c37b71
Fix etherpad docker-compose version
...
ERROR: Version mismatch: file ./docker/moodle/moodle.yml specifies version 3.7 but extension file ./docker/etherpad/etherpad.yml uses version 3.0
2021-05-19 16:39:37 +02:00
da162f0b00
fixed customs
2021-05-19 13:49:42 +02:00
68bb6874f5
Customs
2021-05-19 13:48:44 +02:00
234aa84e74
Updated personalization
2021-05-19 12:52:36 +02:00
877e05460d
fixed paths
2021-05-18 09:20:23 +00:00
Simó Albert i Beltran
root
info