Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5144 Extract AE tab management to TBL monitoring

Not every AE tab will be an Assessment, so we need tabs to be

independent on their content.

    • -0
    • +69
    ./tblmonitor/aes.jsp
  1. … 9 more files in changeset.
LDEV-5166 No need to display the intro as there's a button already that displays it.

Reverted the change and removed the label from Lokalise.

  1. … 1 more file in changeset.
LDEV-5166 Add Learning Design description to monitoring

Lesson description is called "intro" and learning design description is

just "description"

    • -1
    • +2
    ./includes/javascript/monitorLesson.js
  1. … 3 more files in changeset.
LDEV-5153 Remove obsolete GradebookServlet.

It was introduced for LDEV-2711.

Unnecessary optional layout modification has also been removed.

    • -1
    • +1
    ./includes/javascript/monitorLesson.js
  1. … 4 more files in changeset.
LDEV-5140 Add learner filtering for sending emails

    • -1
    • +1
    ./emailnotifications/lessonNotifications.jsp
  1. … 4 more files in changeset.
LDEV-5140 Switch off autocomplete for date pickers

    • -1
    • +1
    ./emailnotifications/additionalSettings.jsp
LDEV-5143 Extract TBL monitoring Change Leader feature

It will be used in other tools afterwards.

  1. … 9 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into LDEV-5016

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/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/model/McUsrAttempt.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/WEB-INF/tags/CKEditor.tag

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

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

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

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

  1. … 29 more files in changeset.
LDEV-5134 Add "Move all" button to force complete learners in monitoring

    • -37
    • +61
    ./includes/javascript/monitorLesson.js
  1. … 2 more files in changeset.
LDEV-5120 Allow hiding criteria titles in Rating.tag

  1. … 31 more files in changeset.
LDEV-5127 Adjust reported pad height when toolbar is not displayed

  1. … 32 more files in changeset.
LDEV-5127 Fix pad resizing

  1. … 32 more files in changeset.
LDEV-5096 Allow closing gate from TBL monitor

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.