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

Tree
Options

2edfce7

LDEV-5348 General UI improvements for admin

22 Nov 22 Ernie Ghiglione 2edfce711a67f11355c2fa2a908589db72aa96d7

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

Loading ...