lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'v4.0' into LDEV-5095

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

LDEV-5096 Allow closing gate from TBL monitor

    • -1
    • +3
    /lams_monitoring/web/tblmonitor/gates.jsp
LDEV-5097 Embed teacher's view of Assessment result in TBL monitoring

LDEV-5020 Prevent "Show options" link from going to top of page

LKC-221 Move TBL template Assessment methods to Authoring service

Workflow Automation needs to have access to them to create Application

Exercise activities.

LDEV-5094, LDEV-4030 Fix loop of user integrated relogin and lock out

LDEV-5098 Do not allow incorrect values in Doku time limit in authoring

    • -1
    • +1
    /lams_tool_doku/web/pages/authoring/advance.jsp
LDEV-5200 Add CSS style to SVG file so LD thumbnail displays correctly

    • -0
    • +1
    /lams_central/web/authoring/authoring.jsp
    • -84
    • +0
    /lams_central/web/css/_authoring_base.scss
    • -0
    • +80
    /lams_central/web/css/authoring-svg.css
LDEV-5016 Add CSS style to SVG file so LD thumbnail displays correctly

    • -0
    • +1
    /lams_central/web/authoring/authoring.jsp
    • -84
    • +0
    /lams_central/web/css/_authoring_base.scss
    • -0
    • +80
    /lams_central/web/css/authoring-svg.css
LDEV-5016 Add CSS style to SVG file so LD thumbnail displays correctly

    • -0
    • +1
    /lams_central/web/authoring/authoring.jsp
    • -84
    • +0
    /lams_central/web/css/_authoring_base.scss
    • -0
    • +80
    /lams_central/web/css/authoring-svg.css
LDEV-5096 Labels for closing gates

LDEV-5096 Move "Close" button to gate status page instead of monitoring

Allow closing all types of gates.

If a schedule gate gets opened, we do not clear its schedule anymore.

The user may have made a mistake when opening the gate and will

immediately close it again. We want the old schedule to remain.

When scheduled open gate job fires, it now checks if the gate is

actually closed. If it is already open, it does nothing.

    • -0
    • +11
    /lams_monitoring/web/gate/gateStatus.jsp
LDEV-4989 Missing password labels

LDEV-5097 Add missing library import

LDEV-5091 Use Etherpad tag in Doku monitoring, initialised on demand

LDEV-5091 Etherpad.tag to accept predefined pad ID

    • -29
    • +45
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -29
    • +45
    /lams_gradebook/web/WEB-INF/tags/Etherpad.tag
    • -29
    • +45
    /lams_learning/web/WEB-INF/tags/Etherpad.tag
    • -29
    • +45
    /lams_monitoring/web/WEB-INF/tags/Etherpad.tag
    • -29
    • +45
    /lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
    • -29
    • +45
    /lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
    • -29
    • +45
    /lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
    • -29
    • +45
    /lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
    • -29
    • +45
    /lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
    • -29
    • +45
    /lams_tool_images/web/WEB-INF/tags/Etherpad.tag
    • -29
    • +45
    /lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag
    • -29
    • +45
    /lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag
    • -29
    • +45
    /lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag
  1. … 17 more files in changeset.
Merge branch 'LDEV-5097' into v4.0

LDEV-5097 Add buttons to open results view in Assessment monitoring

LKC-216 Remove obsolete test code

LDEV-5097 Prepare a teacher's view of Assessment result

LDEV-5097 Allow fetching rating data without specified user

Merge branch 'LDEV-5096' into v4.0

LDEV-5096 Add "Close" button to an opened permission gate.

Merge branch 'LDEV-5094' into v4.0

LDEV-5095 change labels

LDEV-5095 Initial implementation of learner complection chart

LDEV-5095 Add latest chart.js to the project

We already use an old version of this library in other places in LAMS.

LDEV-5095 Prepare data for activity completion chart

LDEV-4769 Updating Greek

    • -15
    • +15
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
LDEV-5083 Add functional, redesigned version of Required Tasks

    • -29
    • +18
    /lams_monitoring/web/css/components-monitoring.css
    • -23
    • +182
    /lams_monitoring/web/monitor5.jsp