Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4759 Authoring and monitoring tabs working

    • -2
    • +2
    ./org/lamsfoundation/lams/web/tag/HelpTag.java
  1. … 315 more files in changeset.
Merge ordered branching LDEV-4587 into develop

  1. … 23 more files in changeset.
LDEV-4755 Scan when importing LDs

  1. … 3 more files in changeset.
LDEV-4755 Scan when uploading files to CKEditor

LDEV-4728 Lesson Description CKEditor restricted palette, update saves

  1. … 2 more files in changeset.
LDEV-4726 Licenses updated to Creative Commons 4.0

  1. … 19 more files in changeset.
LDEV-4731 Initial implementation of enrolments parser

    • -0
    • +327
    ./org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
  1. … 1 more file in changeset.
LDEV-4705 Add missing sysadmin role in a check

LDEV-4705 Remove references to Group Admin role from Java code

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

Conflicts:

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

lams_central/web/forgotPassword.jsp

lams_central/web/forgotPasswordChange.jsp

lams_central/web/forgotPasswordProc.jsp

lams_tool_assessment/web/pages/learning/results.jsp

  1. … 10 more files in changeset.
LDEV-4711 Show only generic message when resetting passwords

  1. … 4 more files in changeset.
LDEV-4710 Add config setting to enable "Forgot your password?" option

Also if people try to get to the login page by going to the URL

directly, we display a 404 error message.

  1. … 5 more files in changeset.
LDEV-4714 Fix LD access adding and processing

  1. … 3 more files in changeset.
LDEV-4714 Clear overflow of LD access entries

There is no point in keeping hundreds of LD access entries in DB for

each user, if there are always displayed only few of them.

LDEV-4649 Get rid of obsolete field

  1. … 1 more file in changeset.
LDEV-4649 Fix outcome and scale import

Fixed paths for import and outcome/scale removal.

Description is now an optional field when importing.

  1. … 4 more files in changeset.
LDEV-4696 Fix transition removal from LD

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

  1. … 54 more files in changeset.
LDEV-4696 Remove obsolete DTO

    • -2
    • +3
    ./org/lamsfoundation/lams/web/tag/HelpTag.java
  1. … 13 more files in changeset.
LDEV-4440 Fix construction of redirectURL in LTI calls

LDEV-4698 Stop using Apache httpcomponents library in LAMS

  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.

  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.

  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

  1. … 4 more files in changeset.
LDEV-4683 Ensure new learning designs have a unique name within folder

  1. … 7 more files in changeset.