Fisheye: Diff - lams-github/lams_central/web/authoring/authoring.jsp

Tree
Options

3eab31a

Merge remote-tracking branch 'origin/LDEV-5357' into v4.7
Conflicts:
lams_admin/web/userChangePass.jsp
lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
lams_central/web/WEB-INF/web.xml
lams_central/web/authoring/authoring.jsp
lams_central/web/authoring/svgGenerator.jsp
lams_central/web/extGroups.jsp
lams_central/web/orgGroup.jsp
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
lams_monitoring/web/grouping/chosenGrouping.jsp

30 Jan 23 Marcin Cieslak 3eab31a1109437bc25679e6ebe38be0a350e17ac

a40a77e

Merge remote-tracking branch 'origin/v4.6' into v4.7
Conflicts:
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
lams_central/conf/language/lams/ApplicationResources.properties
lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java
lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java
lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
lams_tool_assessment/conf/language/lams/ApplicationResources.properties

31 Oct 22 Marcin Cieslak a40a77e307317e8038ed9e6b8699c18386286497

Loading ...