EDUCATIC
/
digitaldemocratic
mirror of https://gitlab.com/digitaldemocratic/digitaldemocratic
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
74 Commits
15 Branches
0 Tags
125 MiB
Commit Graph

74 Commits (7d5233228f819e8b50fe1aaaf54e6bae8fed5a00)

Author SHA1 Message Date
Josep Maria Viñolas Auquer 7d5233228f Merge branch 'fix-versions' into 'develop' 
Fixed moodle, nextcloud, wordpress img versions

See merge request isard/isard-apps!18
 2021-06-12 08:00:02 +00:00
root dcff5c0996 Fixed moodle, nextcloud, wordpress img versions 2021-06-11 15:14:46 +02:00
Josep Maria Viñolas Auquer d88a1aa07c Merge branch 'develop' into 'master' 
Develop to Master

See merge request isard/isard-apps!16
 2021-06-11 10:34:32 +00:00
root c06f959181 Fixed multisite rewrite rules 2021-06-11 12:22:31 +02:00
Josep Maria Viñolas Auquer f7c6ceca22 Merge branch 'upgraded-jitsi-bbb-plugins' into 'develop' 
Moodle: Upgrade jitsi and bbb plugins to latest version

See merge request isard/isard-apps!15
 2021-06-10 21:34:21 +00:00
root 117330cfcd Moodle: Upgrade jitsi and bbb plugins to latest version 2021-06-10 23:27:26 +02:00
Josep Maria Viñolas Auquer 492dc9fb62 Merge branch 'fix-moodle-version-lang-noupgrade' into 'develop' 
Moodle: Fixed version in conf / Parametrized lang in conf / Moved upgrade to Makefile

See merge request isard/isard-apps!13
 2021-06-10 11:27:15 +00:00
root 3dcede372c Moodle: Fixed version in conf / Parametrized lang in conf / Moved upgrade to Makefile 2021-06-09 20:09:24 +02:00
Antonio Manzano 0863b46475 Merge branch 'develop' 2021-06-09 12:35:18 +00:00
Josep Maria Viñolas Auquer f5fd1f3ae7 Update README.md 2021-06-09 12:34:45 +00:00
Josep Maria Viñolas Auquer 19a3d1ea8b Update README.md 2021-06-06 21:07:20 +00:00
Josep Maria Viñolas Auquer 224620e33e Update README.md 2021-06-06 21:07:06 +00:00
Simó Albert i Beltran 9a7202cf98 Merge branch 'nextcloud_css_from_api' into 'master' 
Nextcloud CSS from api

See merge request isard/isard-apps!11
 2021-05-31 18:35:51 +00:00
Josep Maria Viñolas Auquer f0bdb4076a Merge branch 'nextcloud_logo_from_api' into 'master' 
Nextcloud logo from api

See merge request isard/isard-apps!12
 2021-05-31 12:33:51 +00:00
Simó Albert i Beltran 02edfc1816 Nextcloud logo from api 2021-05-31 13:14:37 +02:00
Simó Albert i Beltran 30382caf9c Nextcloud CSS from api 2021-05-31 13:08:26 +02:00
root 907d6d7294 upgraded mu-plugins 2021-05-31 08:45:04 +02:00
root 66dc6b5af6 added mu-plugins 2021-05-30 10:05:56 +02:00
root 9641ce03f6 fixed moodle plugins 2021-05-30 08:47:42 +02:00
root 075942cab4 Fixed tipnc moodle module path 2021-05-29 23:45:44 +02:00
root f586628902 Added pend tresipunt block plugin 2021-05-29 23:19:32 +02:00
root db1fef2149 moved plugin to main repo 2021-05-29 23:04:18 +02:00
root ef7afc2bde Auto configure CBE theme and added new zip custom plugin 2021-05-29 23:00:49 +02:00
root ab5458689d Merge branch 'master' of https://gitlab.com/isard/isard-apps 2021-05-29 21:34:00 +02:00
root 8cab2e04e6 added moodle assignment onlyoffice plugin 2021-05-29 21:33:51 +02:00
Alberto Larraz Dalmases 5de371082f Merge branch 'master' of https://gitlab.com/isard/isard-apps 2021-05-29 18:48:19 +02:00
Alberto Larraz Dalmases c0b428633c removed unused vars 2021-05-29 18:47:34 +02:00
root bd3c972771 fixed bug in wp pwd 2021-05-29 17:55:13 +02:00
root f99da311e3 Merge branch 'changes' 2021-05-29 10:10:26 +02:00
root 19a6569e24 updated configuration 2021-05-29 10:06:50 +02:00
Josep Maria Viñolas Auquer 96b2d04752 Merge branch 'nextcloud_navbar_from_api' into 'master' 
nextcloud navbar from api

See merge request isard/isard-apps!10
 2021-05-27 19:28:50 +00:00
Josep Maria Viñolas Auquer 2c41b58cd4 Merge branch 'nextcloud_fontawesome_from_api' into 'master' 
nextcloud get fontawesome from api

See merge request isard/isard-apps!9
 2021-05-27 14:04:40 +00:00
Simó Albert i Beltran acdaa2dec1 nextcloud navbar from api 2021-05-27 15:10:50 +02:00
Simó Albert i Beltran dcbdc94714 nextcloud get fontawesome from api 2021-05-27 15:07:15 +02:00
Josep Maria Viñolas Auquer 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
Josep Maria Viñolas Auquer 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
Josep Maria Viñolas Auquer 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
Josep Maria Viñolas Auquer 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
Simó Albert i Beltran bf3cecc043 PHONY Makefile recipes 2021-05-19 19:18:43 +02:00
Simó Albert i Beltran ea3647372a Fix haproxy docker image build 
Fix it by setting the haproxy docker image version
 2021-05-19 18:47:09 +02:00
Simó Albert i Beltran 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
Simó Albert i Beltran 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
root f534430bdb added localtime 2021-05-18 10:30:32 +02:00
root a3035c5f57 added custom variables 2021-05-12 21:23:00 +02:00
root 8246a54aed removed unused module 2021-05-12 13:01:12 +02:00
root 9eeb53f61f removed unused src 2021-05-12 13:00:23 +02:00
root 6b3f2711cb Moved the SAML integration to digitaldemocratic docs 2021-05-05 20:04:32 +02:00
root dfb5dfa91c Updated saml plugin for wordpress 2021-05-05 17:59:52 +02:00
root ed77ce9ce0 Merge branch 'master' of https://gitlab.com/isard/isard-apps 2021-05-04 08:31:46 +02:00
root c37e27eb70 Updated saml 2021-05-04 08:31:43 +02:00