Commit Graph

816 Commits (0c8d40e9dfd45bab026624401461b506e596a8b3)

Author SHA1 Message Date
root aede44f0c4 Moved moodle vars to conf and upgrade to makefile 2021-06-09 20:10:56 +02:00
root 3dcede372c Moodle: Fixed version in conf / Parametrized lang in conf / Moved upgrade to Makefile 2021-06-09 20:09:24 +02:00
Antonio Manzano 0863b46475 Merge branch 'develop' 2021-06-09 12:35:18 +00:00
Josep Maria Viñolas Auquer f5fd1f3ae7 Update README.md 2021-06-09 12:34:45 +00:00
root 0edae2f593 Avatars endpoint 2021-06-09 13:55:23 +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
Josep Maria Viñolas Auquer 36562d6ac0 Merge branch 'develop' into 'master'
Fixed add/edit

See merge request isard/isard-sso!26
2021-06-09 08:43:59 +00:00
Josep Maria Viñolas Auquer 9342d5dd62 Merge branch 'develop' into 'develop'
Develop

See merge request isard/isard-sso!25
2021-06-09 08:42:11 +00:00
Melina Gamboa 90d78d81db Fixed select groups on edit 2021-06-09 10:35:01 +02:00
Melina Gamboa ec23d2ecb7 Only keycloak roles and enabled checkbox added 2021-06-08 22:47:07 +02:00
Melina Gamboa 2218490763 Password style changes 2021-06-08 22:46:22 +02:00
Melina Gamboa 80990552b3 Flash error messages 2021-06-08 22:45:42 +02:00
Melina Gamboa e88a602baf Changed users table groups field 2021-06-08 22:43:58 +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 50418914c9 Added postgres tuner and fixed backups cron 2021-06-08 20:50:03 +02:00
root 515ccf7cf6 Disabled edit user and adds as needs more testing 2021-06-07 10:42:38 +02:00
root 1edb71bb0e Disabled edit user and adds as needs more testing 2021-06-07 08:41:42 +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
root 09ae3e16e6 Fixed avatars on deleting and UI things 2021-06-07 03:02:59 +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
root fab77bc09e Merge branch 'master' of https://gitlab.com/isard/isard-sso 2021-06-06 23:34:28 +02:00
root cc1d33efef Added admin groups and delete users events. Also fixed missing creation of /admin group in nextcloud. 2021-06-06 23:34:19 +02:00
Josep Maria Viñolas Auquer 153159052b Update README.md 2021-06-06 21:08:54 +00:00
Josep Maria Viñolas Auquer 80e8c3f007 Update README.md 2021-06-06 21:07:42 +00:00
Josep Maria Viñolas Auquer 19a3d1ea8b Update README.md 2021-06-06 21:07:20 +00:00
Josep Maria Viñolas Auquer 224620e33e Update README.md 2021-06-06 21:07:06 +00:00
Josep Maria Viñolas Auquer f26f54a579 Update README.md 2021-06-06 21:06:36 +00:00
Josep Maria Viñolas Auquer a503e1f0c1 Update README.md 2021-06-06 21:05:10 +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
root 90ef56bbdf updated admin functs 2021-06-06 22:05:12 +02:00
root a65441bc03 testing sso in admin 2021-06-04 11:23:15 +02:00
root 919aadd77c fixed appadmin user environ 2021-06-03 19:41:38 +02:00
root 4e9174bd67 Merge remote-tracking branch 'melina/editUser' 2021-06-03 19:13:32 +02:00
root 6a04b24259 Merge remote-tracking branch 'melina/updatePassword' 2021-06-03 19:13:25 +02:00
root 6d90cb073a Merge remote-tracking branch 'melina/login' 2021-06-03 19:13:18 +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 5563922004 Added default avatars and default generation for users 2021-06-03 19:06:15 +02:00
root 8b65eaecf1 added csv and gevents 2021-06-03 19:03:42 +02:00
root c942d5fa96 Added default avatars 2021-06-03 19:02:40 +02:00
Melina Gamboa 38b45de7b4 Edit user 2021-06-03 18:42:03 +02:00
Melina Gamboa b1981973c0 Update password and delete user 2021-06-03 15:40:43 +02:00
Melina Gamboa a382f2ff09 Admin login 2021-06-03 10:49:05 +02:00