Fisheye: Diff - lams-github/lams

Tree
Options

3f3f34c

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

21 Sep 22 Marcin Cieslak 3f3f34c22194aeaf302e1fd332925dffd35019aa

399fafe

LDEV-5302 Appadmins need to have 2FA on
Only sysadmin can turn off 2FA to appadmins

25 Mar 22 Marcin Cieslak 399fafea8d30e59f81414f332a7e8a5ed527aee4

Loading ...