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

149 Commits (681af6751922d1bd62d35c542b7e9e1c34a83514)

Author SHA1 Message Date
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
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
root 81434a1766 created develop branch 2021-06-08 21:54:25 +02:00
root 4c98da9f91 Added pgtuner and moved adminer to not be there by default and cleaned conf.sample 2021-06-08 20:50:50 +02:00
root 515ccf7cf6 Disabled edit user and adds as needs more testing 2021-06-07 10:42:38 +02:00
root ff1b217a57 Merge branch 'master' of https://gitlab.com/digitaldemocratic/digitaldemocratic 2021-06-07 03:03:28 +02:00
root a24ba287b2 Fixed avatars on deleting and UI things 2021-06-07 03:03:19 +02:00
Josep Maria Viñolas Auquer 26645b0405 Update README.md 2021-06-06 21:47:54 +00:00
root 4de113c443 Removed image from readme 2021-06-06 23:38:32 +02:00
root a7e98b5b83 Merge branch 'master' of https://gitlab.com/digitaldemocratic/digitaldemocratic 2021-06-06 23:35:05 +02:00
root 1fc7db2b3e Added admin info to readme 2021-06-06 23:34:56 +02:00
Josep Maria Viñolas Auquer 153159052b Update README.md 2021-06-06 21:08:54 +00:00
root e85ff8fe07 Merge branch 'master' of https://gitlab.com/digitaldemocratic/digitaldemocratic 2021-06-06 22:06:55 +02:00
root a3db994452 user for admin 2021-06-06 22:06:46 +02:00
Josep Maria Viñolas Auquer 98408e2054 Merge branch 'fix_configuration_by_removing_duplicated_allow_local_remote_servers' into 'master' 
Fix configuration by removing duplicated allow_local_remote_servers

See merge request digitaldemocratic/digitaldemocratic!21
 2021-06-03 17:07:53 +00:00
root 7691ecec60 Added avatars 2021-06-03 19:06:54 +02:00
root c942d5fa96 Added default avatars 2021-06-03 19:02:40 +02:00
root 2ef1c897dd added csv and gevents 2021-06-03 00:21:11 +02:00
root 892c1cccc5 admin tests 2021-06-02 12:15:06 +02:00
Simó Albert i Beltran ed3da4413b Fix configuration by removing duplicated allow_local_remote_servers 2021-06-02 11:17:21 +02:00
root d302f951e6 fixed moodle cohorts sync 2021-06-02 10:19:16 +02:00
root 42d387f172 fixed bug in showing users groups 2021-06-02 08:07:14 +02:00
root b869dc99e6 activated pass dict 2021-06-01 23:39:21 +02:00
root dc7138af39 Merge branch 'master' of https://gitlab.com/digitaldemocratic/digitaldemocratic 2021-06-01 22:59:45 +02:00
root 9637a436e7 fixes in admin 2021-06-01 22:59:37 +02:00
Josep Maria Viñolas Auquer a603c50885 Merge branch 'fix_menu_configuration' into 'master' 
Fix menu configuration

See merge request digitaldemocratic/digitaldemocratic!20
 2021-06-01 18:25:24 +00:00
Simó Albert i Beltran 62863ee8e2 Fix menu configuration 2021-06-01 19:13:07 +02:00
root b48f386551 removed delete buttons 2021-06-01 14:37:28 +02:00
root 86b27c072a added reset bulk users pwd 2021-06-01 14:13:48 +02:00
root ad748426d0 Merge branch 'master' of https://gitlab.com/digitaldemocratic/digitaldemocratic 2021-06-01 14:07:05 +02:00
root 96ef7fb49b new imports in admin 2021-06-01 14:06:56 +02:00