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

160 Commits (b44129ad52306ee2fb4df74eedc607884f6973e8)

Author SHA1 Message Date
root 325fe429a0 Merge branch 'master' of https://gitlab.com/digitaldemocratic/digitaldemocratic 2021-05-28 11:00:36 +02:00
root 80b85a630f fixed paths 2021-05-28 11:00:31 +02:00
Josep Maria Viñolas Auquer 540214909f Merge branch 'fix_custom_sample_logo' into 'master' 
Fix custom sample logo

See merge request digitaldemocratic/digitaldemocratic!12
 2021-05-28 08:29:09 +00:00
Simó Albert i Beltran debd240224 Fix custom sample logo 2021-05-28 10:07:22 +02:00
root 6def906a2f Removed database adding tags as it can be done with occ command (https://github.com/nextcloud/server/pull/27101) 2021-05-28 02:42:43 +02:00
root 9e39c7b5e0 Added securization script and haproxy auth to admin app 2021-05-28 02:33:50 +02:00
Josep Maria Viñolas Auquer 98ede3b05b Merge branch 'allow_nextcloud_get_content_from_api' into 'master' 
Allow nextcloud get content from api

See merge request digitaldemocratic/digitaldemocratic!10
 2021-05-27 15:40:39 +00:00
Josep Maria Viñolas Auquer c6653ee048 Merge branch 'fix_docs_recovering_it' into 'master' 
Fix docs recovering it

See merge request digitaldemocratic/digitaldemocratic!11
 2021-05-27 15:40:09 +00:00
Simó Albert i Beltran 07d95a3f7f Fix docs recovering it 
Regresion of 5b935c9bbd
 2021-05-27 16:36:19 +02:00
root ead1a721be updated sso 2021-05-27 16:14:35 +02:00
root 2a5c626b70 updated sso 2021-05-27 15:58:04 +02:00
Simó Albert i Beltran 1e07f713b5 Allow nextcloud get content from api 2021-05-27 15:35:22 +02:00
root 85707fae9e updated sso 2021-05-27 11:26:17 +02:00
root a0001c5e1f updated sso 2021-05-27 00:44:50 +02:00
root dc9a92f193 Updated repo 2021-05-26 18:18:04 +02:00
root d3c959301d Merge branch 'master' of https://gitlab.com/digitaldemocratic/digitaldemocratic 2021-05-26 16:01:14 +02:00
root bb0e29c6bc updated submodule 2021-05-26 16:00:34 +02:00
Josep Maria Viñolas Auquer 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
Simó Albert i Beltran d1c155d00f Fix docker-compose config enviroment again 2021-05-26 13:28:41 +02:00
root ec0721cc3a updated submodule 2021-05-26 11:22:40 +02:00
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
root 155c5e86a4 Added web interface 2021-05-23 11:10:45 +02:00
root 34feaeb91a updated submodule 2021-05-23 07:57:41 +02:00
root e482c77bff added admin against SPs and avatars on api 2021-05-23 01:12:45 +02:00
root 7edd696d9a added test lib 2021-05-21 18:53:39 +02:00
root 974e5419c7 Merge branch 'master' of https://gitlab.com/digitaldemocratic/digitaldemocratic 2021-05-21 18:44:38 +02:00
root 6138e9c65b added keycloak python lib 2021-05-21 18:44:25 +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
Josep Maria Viñolas Auquer 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
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
root 9f3952dc86 updated submodules 2021-05-19 21:59:02 +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 e911dba833 addes mising ymls 2021-05-19 19:30:24 +02: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
root 234aa84e74 Updated personalization 2021-05-19 12:52:36 +02:00
info 877e05460d fixed paths 2021-05-18 09:20:23 +00:00
root 6e2b79d25e updated 2021-05-18 11:18:01 +02: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 6d7cc4f68e remvoved yaml 2021-05-18 10:24:15 +02:00
root 62a1d9e2ba added menu samples 2021-05-18 10:23:30 +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 e4ff9c1f4c New sso commit 2021-05-12 22:01:24 +02:00