lams_monitoring

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5175 Use TBL burning questions layout in monitoring in Scratchie

  1. … 6 more files in changeset.
LDEV-4769 Update Norwegian, Spanish, English, Greek, French

  1. … 8 more files in changeset.
LDEV-5170 layout adjustments

LDEV-4769 Update Norwegian, Spanish, English, Greek

  1. … 77 more files in changeset.
Merge branch 'LDEV-5142' into v4.0

LDEV-5170 Add Instructions tab in lesson monitoring

    • -2
    • +1
    ./web/includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.
Merge branch 'v4.0' into LDEV-5142

  1. … 2 more files in changeset.
LDEV-5144 Introduce doKu as AE in TBL monitoring

  1. … 6 more files in changeset.
LDEV-5144 Make iRAT compatible with new AE tab flow

  1. … 5 more files in changeset.
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
    ./web/tblmonitor/aes.jsp
  1. … 7 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.

LDEV-4769 Update English and Spanish

  1. … 5 more files in changeset.
LDEV-4769 Updating English, Norwegian and Greek

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

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

just "description"

    • -1
    • +2
    ./web/includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.
LDEV-5143 labels

  1. … 21 more files in changeset.
LDEV-5154 Remove incorrectly committed test code

LDEV-5154 Add message on retrieving monitoring data error

An access forbidden 403 error is rendered as error.jsp page. There is no

way for Ajax call to understand what happened as it just receives HTML.

So on any error we display a message and close the monitoring window.

LDEV-5153 Remove obsolete GradebookServlet.

It was introduced for LDEV-2711.

Unnecessary optional layout modification has also been removed.

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

  1. … 4 more files in changeset.
LDEV-5140 Switch off autocomplete for date pickers

LDEV-5143 Extract TBL monitoring Change Leader feature

It will be used in other tools afterwards.

  1. … 7 more files in changeset.
LDEV-5140 Introduce Release Marks panel for sending emails to learners

  1. … 4 more files in changeset.
LDEV-5140 Introduce Release Marks panel for sending emails to learners

  1. … 4 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. … 28 more files in changeset.
LDEV-4769 Updating Greek

  1. … 2 more files in changeset.
LDEV-4769 Updating Greek

  1. … 9 more files in changeset.
LDEV-4769 Updating English, Spanish, Norwegian

  1. … 4 more files in changeset.
LDEV-5134 Inform teacher that force completing learners can take a while

LDEV-5134 Add "Move all" button to force complete learners in monitoring

    • -37
    • +61
    ./web/includes/javascript/monitorLesson.js
LDEV-5120 Allow hiding criteria titles in Rating.tag

  1. … 31 more files in changeset.