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
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
root 24ec2f7163 New commit for submodules 2021-09-14 20:55:38 +02:00
Josep Maria Viñolas Auquer d4b125c5ec Merge branch 'develop' into 'master' 
Develop

See merge request isard/isard-apps!26
 2021-09-14 18:54:55 +00:00
Josep Maria Viñolas Auquer a55af184ed Merge branch 'added-etherpad-plugins' into 'develop' 
Added etherpad plugins

See merge request isard/isard-apps!25
 2021-09-14 18:54:14 +00:00
root 2f32d3fa5e Added etherpad plugins 2021-09-14 20:53:06 +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
root d70568b511 New isard-apps submodule commit 2021-09-13 12:37:52 +02:00
Josep Maria Viñolas Auquer b4295c898a Merge branch 'develop' into 'master' 
Develop

See merge request isard/isard-apps!24
 2021-09-13 10:33:21 +00:00
Josep Maria Viñolas Auquer 74d3addb89 Merge branch 'added-etherpad-plugins' into 'develop' 
New plugins added for etherpad

See merge request isard/isard-apps!23
 2021-09-13 10:32:17 +00:00
root cd904a14e1 New plugins added for etherpad 2021-09-13 12:31:19 +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
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
root ae890da2c6 Added custom roles 2021-09-08 00:55:55 +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
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 ae3c4281e6 Merge branch 'develop' into 'master' 
Merge develop into master

See merge request isard/isard-apps!22
 2021-09-01 06:46:47 +00: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 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
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
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
root 8ea70d68cb Set backups to be done every 24h 2021-08-22 09:56:47 +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 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