extGroups.jsp

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

  1. … 44 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 52 more files in changeset.
LDEV-5338 Rename paths to reflect grouping flow better

  1. … 7 more files in changeset.
LDEV-4932 Start using /common/taglibs.jsp in lams_central

  1. … 68 more files in changeset.
LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

  1. … 97 more files in changeset.
LDEV-4440 Fix URLs in course grouping creation

  1. … 4 more files in changeset.
LDEV-4440 <input> tag can't have a closing tag in HTML

Also change <input type="submit"></input> into <button>, as otherwise

button's label is displayed incorrectly

  1. … 15 more files in changeset.
LDEV-4440 Central migration

  1. … 52 more files in changeset.
LDEV-4343 Remove obsolete "style" attribute from CssTag

  1. … 56 more files in changeset.
LDEV-3621 Ability to import and use groups from integrated server

  1. … 2 more files in changeset.
LDEV-3621 Ability to import and use groups from integrated server

  1. … 3 more files in changeset.
LDEV-2917: Use <!DOCTYPE html> everywhere.

  1. … 170 more files in changeset.
LDEV-3621 Ability to import and use groups from integrated server

  1. … 14 more files in changeset.
LDEV-3621 Ability to import and use groups from integrated server

  1. … 19 more files in changeset.