Fisheye: Diff - lams-github/lams_admin/web/integration/ltiConsumerList.jsp

Tree
Options

c7c5d74

Merge remote-tracking branch 'origin/v4.6' into v4.7
Conflicts:
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.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/integration/ltiConsumerList.jsp
lams_admin/web/signupmanagement/list.jsp

24 Oct 22 Marcin Cieslak c7c5d74f9c402bdab97bd3fd46436adbfa9202b8

85121f2

LDEV-5330 Merge changes made for sysadmin
It included upgrading to Bootstrap 5 and using UI guidelines set for
Monitoring UI.

29 Sep 22 Marcin Cieslak 85121f2d5a0394c96ef2ad1859c22b82391279b7

Loading ...