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

816 Commits (0c8d40e9dfd45bab026624401461b506e596a8b3)

Author SHA1 Message Date
Antonio Manzano 45f93d9e69 Merge actual develop 2021-07-25 19:00:03 +02:00
Josep Maria Viñolas Auquer d1c74b23a1 Merge branch 'fix_nextcloud_navbar_hiding_menu_clicking_outside' into 'develop' 
Fix nextcloud navbar by hiding menu when clicking outside

See merge request isard/isard-apps!21
 2021-07-25 17:10:25 +00:00
Antonio Manzano 7973022287 Modified htaccess for wordpress 2021-07-25 18:57:53 +02:00
Antonio Manzano 2c223b2b02 Added temporary 2021-07-25 18:54:58 +02:00
Simó Albert i Beltran 15a1d577fb Fix nextcloud navbar by hiding menu when clicking outside 
This doesn't fix when clicking files app + button.
 2021-07-22 11:00:27 +02:00
root 840f85d6e8 fixed master submodules 2021-07-21 23:40:11 +02:00
root dab2b74fc8 fixed develop branch on submodules 2021-07-21 23:39:01 +02:00
Josep Maria Viñolas Auquer 690acf10fe Moved license and credits to the top 2021-07-21 15:36:54 +00:00
Josep Maria Viñolas Auquer 5353ba09df Moved license and credits to the top 2021-07-21 15:34:30 +00:00
darta f34c3ffa5d Fixed missing translation 2021-07-06 19:32:18 +02:00
darta fc9685164a Added catalan version and added credits 2021-07-06 19:24:51 +02:00
Josep Maria Viñolas Auquer 19b42e9f3a Added license 2021-07-05 15:32:33 +00:00
Josep Maria Viñolas Auquer 52d6270e54 Upload New File 2021-07-05 15:31:16 +00:00
Josep Maria Viñolas Auquer 212bdeda83 Merge branch 'develop' into 'master' 
Fixes certificates endtime and adds scripts to update on client apps

See merge request isard/isard-sso!39
 2021-07-01 15:33:42 +00:00
Josep Maria Viñolas Auquer b025819c3a Merge branch 'fix-certificates' into 'develop' 
Fixes certificates endtime and adds scripts to update on client apps

See merge request isard/isard-sso!38
 2021-07-01 15:32:55 +00:00
Josep Maria Viñolas Auquer 9e57b51661 Merge branch 'develop' into 'fix-certificates' 
# Conflicts:
#   admin/src/wordpress_saml_onlycerts.py
 2021-07-01 15:32:32 +00:00
darta· 57fdebf25c Fixes certificates endtime and adds scripts to update on client apps 2021-07-01 17:30:57 +02:00
Josep Maria Viñolas Auquer 132d722a99 Merge branch 'develop' into 'master' 
Add fix to certificates endtime

See merge request isard/isard-sso!37
 2021-07-01 15:22:22 +00:00
Josep Maria Viñolas Auquer 05814cbef5 Merge branch 'fix-certificates' into 'develop' 
Fixes certificates endtime and adds scripts to update on client apps

See merge request isard/isard-sso!36
 2021-07-01 15:19:57 +00:00
darta· 4f99de246c Fixes certificates endtime and adds scripts to update on client apps 2021-07-01 17:07:08 +02:00
root 23691ce866 Current procedure to upgrade from previous versions 2021-06-21 14:43:54 +02:00
Josep Maria Viñolas Auquer ea0f9d28e1 Merge branch 'develop' into 'master' 
Develop

See merge request digitaldemocratic/digitaldemocratic!29
 2021-06-14 17:58:17 +00:00
Josep Maria Viñolas Auquer b94e6a937d Merge branch 'fix-restart-policy' into 'master' 
Fix restart policy

See merge request isard/isard-sso!34
 2021-06-14 07:47:33 +00:00
Josep Maria Viñolas Auquer bef6958ffb Merge branch 'fix-restart-policy' into 'master' 
Fix restart policy

See merge request isard/isard-apps!20
 2021-06-14 07:47:31 +00:00
Josep Maria Viñolas Auquer a88ebbeaa5 Merge branch 'fix-restart-policy' into 'develop' 
Fixed restart to unless-stopped

See merge request isard/isard-sso!33
 2021-06-14 07:36:25 +00:00
Josep Maria Viñolas Auquer b565620424 Merge branch 'fix-restart-policy' into 'develop' 
Fixed restart to unless-stopped

See merge request isard/isard-apps!19
 2021-06-14 07:36:23 +00:00
root 116ebff07e Fixed restart to unless-stopped 2021-06-14 09:34:38 +02:00
root 83cb6c4538 Fixed restart to unless-stopped 2021-06-14 09:33:02 +02:00
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
Josep Maria Viñolas Auquer 9432d4ad04 Merge branch 'fix-versions' into 'develop' 
Fixed keycloak version

See merge request isard/isard-sso!32
 2021-06-12 07:59:39 +00:00
Josep Maria Viñolas Auquer 3da4e2b7b2 Merge branch 'fix-versions' into 'develop' 
Fixed moodle, nextcloud, wordpress and keycloak img versions

See merge request digitaldemocratic/digitaldemocratic!28
 2021-06-12 07:54:04 +00:00
root dcff5c0996 Fixed moodle, nextcloud, wordpress img versions 2021-06-11 15:14:46 +02:00
root 2d37d17ffa Fixed moodle, nextcloud, wordpress and keycloak img versions 2021-06-11 15:11:56 +02:00
root cc7b89e7b1 Fixed keycloak version 2021-06-11 14:02:50 +02:00
Josep Maria Viñolas Auquer 448e9d3ece Merge branch 'develop' into 'master' 
Develop to Master

See merge request digitaldemocratic/digitaldemocratic!27
 2021-06-11 10:52:09 +00:00
Josep Maria Viñolas Auquer fae1558342 Merge branch 'develop' into 'master' 
Develop to Master

See merge request isard/isard-sso!30
 2021-06-11 10:34:37 +00: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
Josep Maria Viñolas Auquer e3fe14efbc Merge branch 'system-users-not-temporary' into 'develop' 
The default users should not have a temporary password by now

See merge request isard/isard-sso!29
 2021-06-10 21:33:56 +00:00
root bef5844acb The default users should not have a temporary password by now 2021-06-10 23:29:44 +02: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 959b60f986 Merge branch 'fix-moodle-version-lang-noupgrade' into 'develop' 
Fix moodle version lang noupgrade

See merge request digitaldemocratic/digitaldemocratic!24
 2021-06-10 19:48:39 +00:00
Josep Maria Viñolas Auquer e60c7bb463 Removed: 2021-06-10 19:43:19 +00:00
Josep Maria Viñolas Auquer e674ae48d8 Removed: 2021-06-10 19:43:07 +00: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
Josep Maria Viñolas Auquer c249062b2e Merge branch 'kcadm-script' into 'develop' 
Added script to get clients json from keycloak

See merge request isard/isard-sso!28
 2021-06-10 10:11:27 +00:00
Josep Maria Viñolas Auquer 6e2e2d4988 Merge branch 'avatars-endpoint' into 'develop' 
Avatars endpoint

See merge request isard/isard-sso!27
 2021-06-10 10:11:16 +00:00
root daade6e1ba Added script to get clients json from keycloak 2021-06-10 12:08:32 +02:00
root 94ce08d1d8 Merge branch 'develop' into fix-moodle-version-lang-noupgrade 2021-06-09 20:12:07 +02:00