lams-github

Clone
Marcin Cieslak
committed
3f3f34c
on 21 Sep 22
Merge remote-tracking branch 'origin/LDEV-5302' into v4.7
Conflicts:
lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties
l… Show more
Merge remote-tracking branch 'origin/LDEV-5302' into v4.7

Conflicts:

        lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties

        lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java

        lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

        lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

        lams_admin/web/user.jsp

        lams_central/conf/language/lams/ApplicationResources_zh_CN.properties

        lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java

        lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

Show less