Commit Graph

18 Commits (22e35c01af1c815032a2170e13ca1b257675e926)

Author SHA1 Message Date
root 22e35c01af updated submodule 2021-05-25 19:19:42 +02:00
root 5b935c9bbd Updated sso submodule and moved admin there 2021-05-25 18:38:13 +02:00
Josep Maria Viñolas Auquer a4a417ecee Merge branch 'makefile_phony' into 'master'
PHONY Makefile recipes

See merge request digitaldemocratic/digitaldemocratic!4
2021-05-20 03:56:46 +00:00
Simó Albert i Beltran b048557c09 PHONY Makefile recipes 2021-05-19 22:33:12 +02:00
Simó Albert i Beltran 8699d16592 Fix docker-compose config enviroment 2021-05-19 22:26:51 +02:00
Josep Maria Viñolas Auquer 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
Josep Maria Viñolas Auquer 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
root 7a8217ed21 added admin container 2021-05-19 19:19:16 +02:00
Simó Albert i Beltran 9cfaae1bd4 Disable nextcloud file recommendations 2021-05-19 19:03:17 +02:00
Simó Albert i Beltran ee3d400279 Allow nextcloud into other app iframes 2021-05-19 18:35:30 +02:00
root da162f0b00 fixed customs 2021-05-19 13:49:42 +02:00
info 877e05460d fixed paths 2021-05-18 09:20:23 +00:00
root 90c26c063e login personalizations 2021-05-18 10:57:37 +02:00
root 0a5ed86c20 updated 2021-05-18 10:31:00 +02:00
root 2ab7063968 Added customs for nextcloud 2021-05-17 20:39:53 +02:00
root ffa650d2dd Updated custom 2021-05-17 20:08:32 +02:00
root 17a45de141 Added api functional 2021-05-12 21:20:33 +02:00
darta 432e61f54a Added etherpad 2021-05-05 20:05:57 +02:00