Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

    • -20
    • +21
    ./includes/javascript/monitorLesson.js
  1. … 4 more files in changeset.
LDEV-5091 Etherpad.tag to accept predefined pad ID

  1. … 31 more files in changeset.
LDEV-5096 Add "Close" button to an opened permission gate.

    • -4
    • +26
    ./includes/javascript/monitorLesson.js
  1. … 3 more files in changeset.
LDEV-5083 Add functional, redesigned version of Required Tasks

    • -0
    • +149
    ./includes/javascript/monitorLesson5.js
LDEV-5083 Add functional, redesigned version of Required Tasks

    • -0
    • +149
    ./includes/javascript/monitorLesson5.js
LDEV-5083 Add latest version of chart.js

Existing version used in other places in LAMS stays unchanged for now.

  1. … 1 more file in changeset.
LDEV-5083 Add latest version of chart.js

Existing version used in other places in LAMS stays unchanged for now.

LDEV-5083 Adjustments to insights and tasks panels

    • -109
    • +97
    ./css/components-monitoring.css
LDEV-5083 Adjustments to insights and tasks panels

    • -109
    • +97
    ./css/components-monitoring.css
LDEV-5083 Adjustments to graph, grades and sequence layout

    • -31
    • +28
    ./css/components-monitoring-responsive.css
  1. … 1 more file in changeset.
LDEV-5083 Adjustments to graph, grades and sequence layout

    • -31
    • +28
    ./css/components-monitoring-responsive.css
  1. … 1 more file in changeset.
LDEV-5083 Remove unnecessary nested wrapper

    • -101
    • +25
    ./css/components-monitoring.css
  1. … 1 more file in changeset.
LDEV-5083 Remove unnecessary nested wrapper

    • -101
    • +25
    ./css/components-monitoring.css
  1. … 1 more file in changeset.
LDEV-5091 Initialise Etherpads on Discussion panel expand

  1. … 36 more files in changeset.
LDEV-5083 Refactor sidebar and top menu. Add custom tags.

Conflicts:

lams_central/web/css/components.css

lams_monitoring/web/WEB-INF/tlds/lams/lams.tld

    • -0
    • +40
    ./WEB-INF/tags/Dropdown.tag
    • -0
    • +41
    ./WEB-INF/tags/Input.tag
    • -0
    • +29
    ./WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    ./WEB-INF/tags/Panel.tag
    • -0
    • +40
    ./WEB-INF/tags/Switch.tag
    • -197
    • +36
    ./css/components-monitoring.css
  1. … 1 more file in changeset.
LDEV-5083 Refactor sidebar and top menu. Add custom tags.

    • -0
    • +40
    ./WEB-INF/tags/Dropdown.tag
    • -0
    • +41
    ./WEB-INF/tags/Input.tag
    • -0
    • +29
    ./WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    ./WEB-INF/tags/Panel.tag
    • -0
    • +40
    ./WEB-INF/tags/Switch.tag
    • -197
    • +36
    ./css/components-monitoring.css
  1. … 1 more file in changeset.
LDEV-5083 Add non-standard fonts

  1. … 3 more files in changeset.
LDEV-5083 Add non-standard fonts

  1. … 3 more files in changeset.
LDEV-5083 Add redesign CSS files otherwise ignored by git

    • -0
    • +107
    ./css/components-monitoring-responsive.css
    • -0
    • +1078
    ./css/components-monitoring.css
  1. … 1 more file in changeset.
LDEV-5083 Add redesign CSS files otherwise ignored by git

    • -0
    • +107
    ./css/components-monitoring-responsive.css
    • -0
    • +1078
    ./css/components-monitoring.css
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

  1. … 31 more files in changeset.
LDEV-5085 Run CKEditor initialisation immediately

If CKEditor.tag is loaded dynamically, binding it to page load event

does not work.

  1. … 31 more files in changeset.
LDEV-4425 Do not escape user names. Add padding to portrait.

  1. … 31 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

  1. … 31 more files in changeset.
LDEV-5085 Make editor init method parametrized

It seems that multiple instances of CKEditor tag were interacting with

each other, probably with request attributes. Now initialisation method

is parametrised so CKEditor starts with own set of attributes.

  1. … 31 more files in changeset.
LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

    • -0
    • +1564
    ./monitor-sequence-tab.jsp
  1. … 14 more files in changeset.
LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

    • -0
    • +1564
    ./monitor-sequence-tab.jsp
  1. … 14 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into LDEV-5080

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

  1. … 7 more files in changeset.
LDEV-5078 Fix i18n labels in Arrow tag

  1. … 52 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

    • -2
    • +6
    ./includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.