Fisheye: Diff - lams-github/lams_central/web/orgGrouping.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

0132ac7

Merge remote-tracking branch 'origin/v4.6' into v4.7
Conflicts:
lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
lams_central/web/includes/javascript/orgGroup.js
lams_central/web/orgGroup.jsp
lams_central/web/orgGrouping.jsp
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

17 Dec 22 Marcin Cieslak 0132ac7723f6060a3a656d216ac93a1540634c7f

Loading ...