Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Fix construction of redirectURL in LTI calls

    • -1
    • +2
    ./lamsfoundation/lams/web/LoginRequestLtiServlet.java
LDEV-4698 Stop using Apache httpcomponents library in LAMS

    • -36
    • +30
    ./lamsfoundation/lams/web/LoginRequestLtiServlet.java
  1. … 3 more files in changeset.
LDEV-4691 Fix file uploads

MultipartFilter was introduced for LAMS servlets to work with Spring

MVC. It appears that for WildFly 14 it is not required anymore.

Furthermore, without it will not work without extra configuration. It

was removed.

Also a controller method was rewritten to Spring MVC style.

    • -25
    • +9
    ./lamsfoundation/lams/web/QuestionsController.java
  1. … 1 more file in changeset.
Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_admin/web/sessionmaintain.jsp

lams_build/build.xml

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

  1. … 16 more files in changeset.
Merge remote-tracking branch 'origin/master' into lams31

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_build/build_base.xml

# lams_build/lib/lams/lams.jar

# lams_central/web/WEB-INF/struts-config.xml

# lams_common/build.xml

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

  1. … 9 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-4644'

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/web/WEB-INF/struts-config.xml

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java

lams_gradebook/web/gradebookMonitor.jsp

lams_monitoring/conf/language/lams/ApplicationResources.properties

  1. … 13 more files in changeset.
LDEV-4691 Update libraries provided by WildFly

  1. … 47 more files in changeset.
LDEV-4689 Live Edit has a contribution entry and button changes colour.

Also fixed the SVG rendering in monitor (did not return 404 properly

when missing) and fixed the path for the monitor chosen grouping page.

    • -0
    • +1
    ./lamsfoundation/lams/web/HomeController.java
  1. … 10 more files in changeset.
LDEV-4440 Remove an unnecessary dependency from Email validator

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

    • -8
    • +5
    ./lamsfoundation/lams/web/OrganisationGroupController.java
  1. … 4 more files in changeset.
LDEV-4683 Ensure new learning designs have a unique name within folder

  1. … 7 more files in changeset.
LDEV-4440 Fix comments feature

  1. … 36 more files in changeset.
LDEV-4440 Switch controllers to use @Autowired service beans

Also in cases when service bean in Controller has the same name as in

applicationContext, @Qualifier(..) can be removed. Which was done almost

in all cases, except for messageService due to "messageService" name

seems to be more preferable than adminMessageService,

centralMessageService and so on. Thus they were kept as before:

@Autowired

@Qualifier("centralMessageService")

private MessageService messageService;

    • -12
    • +6
    ./lamsfoundation/lams/web/DisplayGroupController.java
    • -9
    • +0
    ./lamsfoundation/lams/web/FindUserLessonsController.java
    • -7
    • +0
    ./lamsfoundation/lams/web/HomeController.java
    • -6
    • +1
    ./lamsfoundation/lams/web/IndexController.java
    • -9
    • +2
    ./lamsfoundation/lams/web/LessonConditionsController.java
    • -20
    • +15
    ./lamsfoundation/lams/web/LoginAsController.java
    • -4
    • +0
    ./lamsfoundation/lams/web/NotificationController.java
    • -9
    • +2
    ./lamsfoundation/lams/web/OrganisationGroupController.java
    • -12
    • +8
    ./lamsfoundation/lams/web/PasswordChangeController.java
  1. … 168 more files in changeset.
LDEV-4440 Add necessary qualifiers for service injection

LDEV-4440 Remove reference to the deleted AuthoringConstants

LDEV-4440 Switch servlets to using autowired service beans

Besides, RegisterAction was renamed to RegisterServlet. And one

remaining constant was moved from AuthoringConstants to CentralConstants

with subsequent removal of AuthoringConstants.java.

    • -1
    • +1
    ./lamsfoundation/lams/rest/LearningDesignRestServlet.java
    • -58
    • +29
    ./lamsfoundation/lams/rest/RestServlet.java
    • -27
    • +33
    ./lamsfoundation/lams/web/ForgotPasswordServlet.java
    • -25
    • +18
    ./lamsfoundation/lams/web/GradebookServlet.java
    • -7
    • +16
    ./lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -15
    • +15
    ./lamsfoundation/lams/web/LaunchLearnerUrlServlet.java
    • -10
    • +20
    ./lamsfoundation/lams/web/LessonOrderServlet.java
    • -23
    • +17
    ./lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -14
    • +19
    ./lamsfoundation/lams/web/LoginRequestServlet.java
    • -91
    • +81
    ./lamsfoundation/lams/web/OrganisationGroupServlet.java
  1. … 15 more files in changeset.
LDEV-4440 Fix Spring MVC related issues with signup pages

  1. … 10 more files in changeset.
LDEV-4440 Use forwards instead of redirects to keep Struts behaviour

    • -8
    • +8
    ./lamsfoundation/lams/web/IndexController.java
    • -6
    • +3
    ./lamsfoundation/lams/web/PortraitSaveController.java
  1. … 8 more files in changeset.
LDEV-4440, LDEV-3676 Fix HTML tags stripping after reload

  1. … 1 more file in changeset.
LDEV-4440 Fix redirectURL after changing password

    • -7
    • +14
    ./lamsfoundation/lams/web/IndexController.java
  1. … 1 more file in changeset.
LDEV-4135 Identified parallel activity children with tool signatures

Identification with description words sometimes fails.

  1. … 5 more files in changeset.
LDEV-4440 Fix profile editing validation and save

    • -1
    • +1
    ./lamsfoundation/lams/web/IndexController.java
  1. … 1 more file in changeset.
LDEV-4440 Error tag to standardise error message layout

    • -3
    • +1
    ./lamsfoundation/lams/web/PasswordChangeController.java
  1. … 10 more files in changeset.
LDEV-4440 Adjust lams:textarea tag to support "disabled" attribute

    • -14
    • +22
    ./lamsfoundation/lams/web/tag/LAMSMultiLinesTextareaTag.java
  1. … 34 more files in changeset.
LDEV-4440 Always get idle timeout from current configuration cache

    • -6
    • +1
    ./lamsfoundation/lams/web/SessionListener.java
LDEV-4440 Merge FileValidatorSpringUtil and FileValidatorUtil into FileValidatorUtil

  1. … 21 more files in changeset.
LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

  1. … 28 more files in changeset.
LDEV-4440 Fix paths to JSP pages for profile controller

Merge remote-tracking branch 'andrey/LDEV-4440' into LDEV-4440

    • -11
    • +12
    ./lamsfoundation/lams/web/LAMSConnectorServlet.java
  1. … 3 more files in changeset.