Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
LDEV-5083 Add custom JSP tags than will be used in next version

    • -0
    • +29
    ./tags/PageComponent.tag
  1. … 93 more files in changeset.
LDEV-5083 Add missing custom JSP tags

  1. … 62 more files in changeset.
LDEV-5083 Add missing custom JSP tags to TLD

  1. … 32 more files in changeset.
LDEV-5083 Fix popovers and rewrite tRAT tooltips to popovers

  1. … 36 more files in changeset.
LDEV-5317 Fix thread preventing server from shutting down

Using <c:import> in cross-module context prevents WildFly from shutting

down properly. The mechanism was replaced with an Ajax call.

  1. … 10 more files in changeset.
LDEV-5317 Move time limit panel to single source in monitoring

Each tool using time limits (Assessment, Scratchie, Doku, Whiteboard)

had it own code to display and operate time limits.

In preparations for time limit widget in monitoring the code was

refactored so there is single source of time limit feature.

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

  1. … 181 more files in changeset.
LDEV-5290 Improve detection of multiple tabs being open on autosave

  1. … 32 more files in changeset.
LDEV-5287 Allow multiple collapsible Comment tags on a single page

If one folded panel gets expanded, all other ones get collapsed and

emptied.

  1. … 32 more files in changeset.
LDEV-5290 Prevent multiple tabs from being open on autosave

  1. … 40 more files in changeset.
LDEV-5287 Add missing CKEditor init parameter

  1. … 32 more files in changeset.
LDEV-5287 Allow multiple comments tags on a single page

  1. … 32 more files in changeset.
LDEV-5282 Prevent Unicode characters from being displayed incorrectly

  1. … 33 more files in changeset.
LDEV-5155 Escape rubrics text as it breaks authoring

    • -1
    • +3
    ./tags/AuthoringRatingAllStyleCriteria.tag
  1. … 32 more files in changeset.
LDEV-5268 Add max word limit to CKEditor tag

  1. … 32 more files in changeset.
LDEV-4644 Use [] instead of () to recognise LO code

Teachers tend to use () as a part of Learning Outcome name

  1. … 34 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 Use MVC initialisation via annotation

Manually triggering controller scanning by adding an annotation handler

bean does not register all useful support beans. If

<mvc:annotation-driven> is used in spring-servlet.xml, all support beans

are registered via WebMvcConfigurer.

<mvc:path-matching suffix-pattern="true" /> need to be added because we

use .do suffix for Spring actions and suffix was turned off for Spring

5.3

https://github.com/spring-projects/spring-framework/issues/24179

  1. … 51 more files in changeset.
LDEV-5259 Manually start controller annotation detection

  1. … 38 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-5247 Fix user name parameter sent to Etherpad

LAMS allows apostrophes but not quotation marks in names, so it is safer

to use quotations when operating with javascript.

  1. … 33 more files in changeset.
LDEV-5155 Highlight rubrics row title

Make it more distinguished from selectable options in next columns

  1. … 33 more files in changeset.
LDEV-5155 Allow free flow of rubrics columns

Trying to calculate their width actually yields worse results.

  1. … 33 more files in changeset.
LDEV-5223 Prevent ep_resize from rendering short initial Etherpad

  1. … 34 more files in changeset.
LDEV-5220 Distribute the new popover tag

  1. … 62 more files in changeset.
LDEV-5223 Fix Etherpad resizing

  1. … 33 more files in changeset.
Merge branch 'LDEV-5155' into v4.0

  1. … 33 more files in changeset.
LDEV-5155 Add column with average rating for given rubrics row

  1. … 31 more files in changeset.
LDEV-5155 Always put rubrics column's value next to its description

  1. … 31 more files in changeset.