groups.jsp

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

  1. … 6 more files in changeset.
LDEV-5338 Rename JS and CSS files to reflect changes in classes

  1. … 6 more files in changeset.
LDEV-5338 Allow modifications to all kinds of groupings

  1. … 2 more files in changeset.
LDEV-5338 Rename file to reflect its purpose better

  1. … 2 more files in changeset.