Shun Miyazawa
|
6da42317e8
Merge branch 'master' into dev/7.0.x
|
2 lat temu |
Futa Arai
|
d6ff69488d
Merge branch 'master' into feat/ldap-group-sync
|
2 lat temu |
sakazuki
|
202a6057a3
- feat: add Azure BLOB storage support
|
2 lat temu |
Futa Arai
|
444cd03a62
Merge branch 'feat/ldap-group-sync' into imprv/133399-133400-provider-dependent-group-sync
|
2 lat temu |
Futa Arai
|
4ab47b2bca
Merge branch 'feat/ldap-group-sync' into imprv/132883-133247-alert-user-before-external-user-group-sync-exec
|
2 lat temu |
Futa Arai
|
e320ec7d90
add icon to modal title
|
2 lat temu |
Futa Arai
|
e1b3626e30
provider dependent group sync
|
2 lat temu |
Futa Arai
|
187d06bb88
alert user before group sync execution
|
2 lat temu |
Futa Arai
|
177d168d43
show error message when ldap auth is not enabled and group sync is executed
|
2 lat temu |
Futa Arai
|
50830b5f11
Merge branch 'master' into feat/ldap-group-sync
|
2 lat temu |
WNomunomu
|
0462ca01b6
Merge branch 'feat/create-modal-for-parent-page-selection' into dev/7.0.x
|
2 lat temu |
Yuki Takei
|
02bd300a85
Merge branch 'master' into dev/7.0.x
|
2 lat temu |
WNomunomu
|
75cfeab1ff
fix
|
2 lat temu |
ryoji-s
|
2b09066697
add admin json
|
2 lat temu |
ryoji-s
|
c34494dbaf
add admin json
|
2 lat temu |
Futa Arai
|
2e52b79ff7
Merge branch 'master' into feat/ldap-group-sync
|
2 lat temu |
WNomunomu
|
d1b0167665
Merge branch 'master' into feat/create-modal-for-parent-page-selection
|
2 lat temu |
moekumasaka
|
5267b0c74f
update labels
|
2 lat temu |
moekumasaka
|
b87f506d0f
imprv: 131279 update link in admin settings for marp
|
2 lat temu |
Futa Arai
|
f1b09483f8
refactor socket io logic
|
2 lat temu |
Yuki Takei
|
981fd00047
remove server side codes
|
2 lat temu |
Futa Arai
|
031b8cdc58
improve sync conflict message
|
2 lat temu |
Futa Arai
|
418f167ebc
separate websocket events of ldap and keycloak group sync
|
2 lat temu |
Futa Arai
|
e0dde64a4c
remove inappropriate error handling in service
|
2 lat temu |
Futa Arai
|
b35a14accc
Merge branch 'feat/ldap-group-sync' into imprv/129542-129840-show-sync-status-on-ldap-group-sync
|
2 lat temu |
Futa Arai
|
262cefb0bf
Merge pull request #8072 from weseek/feat/123280-130394-keycloak-group-sync-exec
|
2 lat temu |
Futa Arai
|
7c8b630a0b
improve external user group sync error handling
|
2 lat temu |
Futa Arai
|
e500a28ab5
Merge branch 'feat/ldap-group-sync' into imprv/129542-129840-show-sync-status-on-ldap-group-sync
|
2 lat temu |
Futa Arai
|
49633b4e64
Merge branch 'master' into feat/ldap-group-sync
|
2 lat temu |
Futa Arai
|
392f1813d3
Merge branch 'feat/ldap-group-sync' into imprv/129542-129840-show-sync-status-on-external-group-sync
|
2 lat temu |