Commit Graph

178 Commits (1653ca6ad3e5024b8efcfb261bea5a3f9f5d18dd)

Author SHA1 Message Date
root 1653ca6ad3 Merge branch 'develop' 2021-09-29 13:34:18 +02:00
root c3979c0988 Updated dd-ctl 2021-09-29 13:33:59 +02:00
root 2bd7667f9f Merge branch 'develop' 2021-09-29 13:08:28 +02:00
root f0e4b55201 Updated inital install 2021-09-29 13:07:52 +02:00
root 2e1085c17d Merge branch 'develop' 2021-09-29 08:27:40 +02:00
root 2a9a84abc5 upgrade-plugins 2021-09-29 08:27:23 +02:00
root 72ec8f85f7 Merge branch 'develop' 2021-09-28 16:20:44 +02:00
root 85e4a97faf Better info on dd-ctl 2021-09-28 16:20:23 +02:00
root 88d2422adc Merge branch 'develop' 2021-09-28 16:00:31 +02:00
root 59abcda572 new apps master branch 2021-09-28 15:59:44 +02:00
root 5b4e2bd9cf New dd-ctl instead of Makefile 2021-09-28 15:57:57 +02:00
Josep Maria Viñolas Auquer b44129ad52 Merge branch 'fix_onlyoffice_size_with_custom_navbar' into 'develop'
Fix onlyoffice size with custom navbar

See merge request digitaldemocratic/digitaldemocratic!33
2021-09-28 13:53:43 +00:00
Simó Albert i Beltran 27c7187837 Fix onlyoffice size with custom navbar 2021-09-28 14:50:29 +02:00
root bb32f63511 Merge branch 'develop' 2021-09-28 11:03:07 +02:00
root 802cf345c9 new submodule hash 2021-09-28 11:03:04 +02:00
root ebd9f6aff9 updated system menu for user menu 2021-09-28 10:59:50 +02:00
root 24ec2f7163 New commit for submodules 2021-09-14 20:55:38 +02:00
root d70568b511 New isard-apps submodule commit 2021-09-13 12:37:52 +02:00
root a34f9e7b58 Fixed sso new master commit 2021-09-08 09:45:26 +02:00
Josep Maria Viñolas Auquer 0e556af64c Merge branch 'develop' into 'master'
Added custom roles

See merge request digitaldemocratic/digitaldemocratic!32
2021-09-08 07:44:09 +00:00
root ae890da2c6 Added custom roles 2021-09-08 00:55:55 +02:00
darta fa879d4619 Fixed latest commits for submodules 2021-09-01 08:54:50 +02:00
darta 727c115e57 Fixed latest commits for submodules 2021-09-01 08:48:16 +02:00
Josep Maria Viñolas Auquer 063d769f36 Merge branch 'upgrade-comments' into 'develop'
Current procedure to upgrade from previous versions

See merge request digitaldemocratic/digitaldemocratic!30
2021-08-30 11:47:17 +00:00
Josep Maria Viñolas Auquer f6bd22c4e0 Merge branch 'new-flavours' into 'develop'
New flavours

See merge request digitaldemocratic/digitaldemocratic!31
2021-08-30 11:46:05 +00:00
root 5ab28bf6d9 new flavours 2021-08-30 13:45:45 +02:00
root a6f496768e Merge branch 'develop' of https://gitlab.com/digitaldemocratic/digitaldemocratic into develop 2021-08-22 10:56:58 +02:00
root f6ab094cc9 Fixed wp login url in custom 2021-08-22 10:56:47 +02:00
Antonio Manzano 681af67519 Merge branch 'develop' of https://gitlab.com/digitaldemocratic/digitaldemocratic into develop 2021-07-25 19:01:35 +02:00
root 6d24443de1 fixed develop branch on submodules 2021-07-25 19:01:11 +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
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 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 2d37d17ffa Fixed moodle, nextcloud, wordpress and keycloak img versions 2021-06-11 15:11:56 +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 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
root 94ce08d1d8 Merge branch 'develop' into fix-moodle-version-lang-noupgrade 2021-06-09 20:12:07 +02:00
root aede44f0c4 Moved moodle vars to conf and upgrade to makefile 2021-06-09 20:10:56 +02:00
Josep Maria Viñolas Auquer 90bdd62de2 Merge branch 'develop' into 'master'
Fixed submodules to branch master on new installs

See merge request digitaldemocratic/digitaldemocratic!23
2021-06-09 09:03:39 +00:00
root 819e636ab4 Fixed submodules to branch master on new installs 2021-06-09 10:52:41 +02:00