Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5440 Use version 3 of JSP and JSTL and their schemas

Make IntelliJ understand the Web aspect of LAMS projects.

  1. … 2102 more files in changeset.
LDEV-5440 Reintroduce more strict security rules in web.xml

  1. … 38 more files in changeset.
LDEV-5440 Fix file uploads

  1. … 38 more files in changeset.
LDEV-5440 Fix multipart config in web.xml files

  1. … 35 more files in changeset.
LDEV-5440 Configure file uploads in Spring servlet

  1. … 34 more files in changeset.
LDEV-5440 Update web.xml version

  1. … 40 more files in changeset.
LDEV-5440 Update code to match dependencies

In particular javax -> jakarta package change and new JPA not accepting some attributes.

  1. … 223 more files in changeset.
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-3000 Secure access to QTI and Word question import pages

# WARNING: head commit changed in the meantime

Merge remote-tracking branch 'origin/v4.6' into v4.7

  1. … 8 more files in changeset.
LDEV-4828 Secure access to other monitors' collections

WEB-001

  1. … 1 more file in changeset.
LDEV-3959 Secure access to CKEditor file manager view

WEB-002

LDEV-5330 adding font-awesome6 to web.xml

LDEV-5338 Rename JS and CSS files to reflect changes in classes

  1. … 6 more files in changeset.
LDEV-5329 Remove obsolete configuration items

  1. … 13 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5302' into v4.7

Conflicts:

lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.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/user.jsp

lams_central/conf/language/lams/ApplicationResources_zh_CN.properties

lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

  1. … 58 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

  1. … 4 more files in changeset.
LDEV-5320 Audit Login As feature

Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/web/authoring/svgGenerator.jsp

  1. … 8 more files in changeset.
LDEV-5304 Secure forgot password page

  1. … 2 more files in changeset.
LDEV-5302 Rename sysadmin role to appadmin

  1. … 181 more files in changeset.
Merge branch 'LDEV-5260' into v4.7

Conflicts:

lams_build/3rdParty.userlibraries

  1. … 8 more files in changeset.
Merge branch 'v4.6' into LDEV-5277

LDEV-5277 Allow LD tree to work with user without a session

  1. … 2 more files in changeset.
LDEV-4293 Skip session creation when displaying error page

If the error was HTTP session being stale or incorrectly invalidated, we

should not try to use the same session to display the error page. The

error page should not require a session at all.

Also if making a decision which session to invalidate in case of double

login, always invalidate the other session and not current one as

otherwise it can lead to a loop of self-invalidating sessions.

  1. … 2 more files in changeset.
LDEV-5259 Manually create parent application context

Previous attempt to reproduce BeanFactoryLocater was an overkill. A

simple singleton parent application context is sufficient.

  1. … 45 more files in changeset.
LDEV-5259 Reintroduce BeanFactoryLocator mechanism back to LAMS

It was removed for Spring 5

  1. … 58 more files in changeset.
LDEV-5156 Fix schema info in web.xml files

  1. … 37 more files in changeset.
LDEV-5153 Remove obsolete GradebookServlet.

It was introduced for LDEV-2711.

Unnecessary optional layout modification has also been removed.

  1. … 4 more files in changeset.