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

181 Commits (53fbbc123aa77c2be1b34a7d0506f8a0d0948ef0)

Author SHA1 Message Date
Josep Maria Viñolas Auquer 53fbbc123a Merge branch 'sample-domain' into 'master' 
refactor(various): changed the sample domain

See merge request isard/isard-sso!59
 2021-12-28 11:47:38 +00:00
darta 1a230faa6d refactor(various): changed the sample domain 2021-12-28 11:18:28 +01:00
darta a43fc0f05a Added missing nextcloud mappers 2021-12-09 15:12:50 +01:00
Josep Maria Viñolas Auquer 23bd3d27cf Merge branch 'fix_nextcloud_avatar_shadow' into 'master' 
Fix nextcloud avatar shadow

See merge request isard/isard-sso!57
 2021-12-09 07:30:42 +00:00
darta 59770ce22c Fixed admin sync to moodle 2021-11-11 11:39:55 +01:00
Simó Albert i Beltran ac0f4050d5 Fix nextcloud avatar shadow 2021-09-29 16:37:23 +02:00
root fbe87a9b27 Merge branch 'develop' 2021-09-29 15:29:02 +02:00
root 67bdacca61 fixed missing key 2021-09-29 15:26:48 +02:00
root 700d117e97 Merge branch 'develop' 2021-09-29 14:36:31 +02:00
root 24d38c3e36 fixed null endpoint in api to keep moodle apps bar working 2021-09-29 14:35:42 +02:00
root fb32b4413c Merge branch 'develop' 2021-09-28 11:01:24 +02:00
root b4d578918f New user menu 2021-09-28 10:58:46 +02:00
Josep Maria Viñolas Auquer 9c8528028c Merge branch 'develop' into 'master' 
Develop merge

See merge request isard/isard-sso!56
 2021-09-15 08:13:32 +00:00
Josep Maria Viñolas Auquer 06bd30e312 Merge branch 'bugfix-remove-roles-on-edit-user' into 'develop' 
Remove roles on edit user if changed

See merge request isard/isard-sso!55
 2021-09-15 08:12:38 +00:00
root a9ac4fe81d Remove roles on edit user if changed 2021-09-15 10:11:47 +02:00
Josep Maria Viñolas Auquer d30b77926a Merge branch 'develop' into 'master' 
Develop merge

See merge request isard/isard-sso!54
 2021-09-15 07:43:53 +00:00
Josep Maria Viñolas Auquer 285930b332 Merge branch 'bulk-actions' into 'develop' 
Added bulk actions

See merge request isard/isard-sso!53
 2021-09-15 07:41:27 +00:00
root b0eba9d7bb Added bulk actions 2021-09-15 09:40:26 +02:00
root 3b14e30f59 Merge branch 'develop' 2021-09-14 22:11:16 +02:00
root 931809fe7c Fixed access to import from centre 2021-09-14 22:07:59 +02:00
Josep Maria Viñolas Auquer a382826bca Merge branch 'develop' into 'master' 
Merge develop into master

See merge request isard/isard-sso!52
 2021-09-14 18:15:02 +00:00
Josep Maria Viñolas Auquer ce50a22638 Merge branch 'new-csv-import' into 'develop' 
Fixed import from CSV

See merge request isard/isard-sso!51
 2021-09-14 18:14:12 +00:00
root 0bad243ea8 testing 2021-09-14 20:12:34 +02:00
Josep Maria Viñolas Auquer f742da68d4 Merge branch 'develop' into 'master' 
Merge develop changes

See merge request isard/isard-sso!50
 2021-09-08 07:41:48 +00:00
Josep Maria Viñolas Auquer 68bd400c1c Merge branch 'groups-redone' into 'develop' 
New groups behaviour

See merge request isard/isard-sso!49
 2021-09-08 07:39:06 +00:00
root 6fa4d9639e Will use name as group and based on paths with replaced / with dots . 2021-09-08 09:38:09 +02:00
darta 945566815a Merge branch 'master' of https://gitlab.com/isard/isard-sso 2021-09-06 12:16:44 +02:00
root d9c7bb1cba Internal api will open some ports internally to wordpress initially 2021-09-06 12:14:50 +02:00
Josep Maria Viñolas Auquer e8cbf898e8 Merge branch 'fix-moodle-enabled' into 'develop' 
fixed bug in enabled moodle

See merge request isard/isard-sso!48
 2021-09-06 09:43:16 +00:00
Josep Maria Viñolas Auquer dd10eb5697 fixed bug in enabled moodle 2021-09-06 09:43:16 +00:00
Josep Maria Viñolas Auquer 769af1990c Merge branch 'main-domain-to-moodle' into 'develop' 
Redirects main domain to moodle

See merge request isard/isard-sso!47
 2021-09-06 09:42:38 +00:00
root 6a8150fb08 Redirects main domain to moodle 2021-09-05 10:37:17 +02:00
Josep Maria Viñolas Auquer 4a2b1c3058 Merge branch 'develop' into 'master' 
Merge develop into master

See merge request isard/isard-sso!46
 2021-09-01 06:45:14 +00:00
Josep Maria Viñolas Auquer da43fd10df Merge branch 'add-user-modal' into 'develop' 
Fixed add/update/delete ops for users and groups

See merge request isard/isard-sso!45
 2021-09-01 06:43:09 +00:00
root 8731d7d98f User modal 2021-09-01 08:41:13 +02:00
Josep Maria Viñolas Auquer c389f1eef9 Merge branch 'feature/internal-admin-api' into 'develop' 
Feature/internal admin api

See merge request isard/isard-sso!44
 2021-08-30 20:00:38 +00:00
darta e2be29348c Solved merge 2021-08-30 21:35:05 +02:00
Josep Maria Viñolas Auquer ea187ecdc4 Merge branch 'fix-gen-certs' into 'develop' 
fixed self signed generation certs

See merge request isard/isard-sso!43
 2021-08-30 11:32:26 +00:00
darta ac1ca9227d fixed self signed generation certs 2021-08-30 13:23:34 +02:00
Josep Maria Viñolas Auquer d984ace2da Merge branch 'feature/internal-admin-api' into 'develop' 
Added filter for roles and groups

See merge request isard/isard-sso!42
 2021-08-24 10:02:55 +00:00
root 5048236e4e Added filter for roles and groups 2021-08-24 12:01:42 +02:00
Josep Maria Viñolas Auquer 31d994d917 Merge branch 'feature/internal-admin-api' into 'develop' 
Internal admin api views

See merge request isard/isard-sso!40
 2021-08-22 07:50:38 +00:00
root b8ade3bd10 Wordpress api 2021-08-22 09:49:24 +02:00
root 369efb980f Internal api will open some ports internally to wordpress initially 2021-07-26 18:53:59 +02:00
Antonio Manzano 2c223b2b02 Added temporary 2021-07-25 18:54:58 +02: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