Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5174 Redesign TBL monitor team tab

Extract tRAT stats to the top. Add counters of correct answers both for

iRAT and tRAT.

  1. … 8 more files in changeset.
LDEV-5170 Add Instructions tab in lesson monitoring

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

  1. … 8 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.

  1. … 10 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. … 5 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-5143 Extract TBL monitoring Change Leader feature

It will be used in other tools afterwards.

  1. … 9 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. … 29 more files in changeset.
LDEV-5134 Add "Move all" button to force complete learners in monitoring

  1. … 3 more files in changeset.
LDEV-3021 Fix a bug if wrong Learner Progress page was provided

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.

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

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

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

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

Conflicts:

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/questions/questionFile.jsp

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

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

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

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

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

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

  1. … 25 more files in changeset.
LDEV-5057 Use UTF-8 as default encoding for message sources

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

  1. … 2 more files in changeset.
LDEV-5038 Add group to user name in lesson monitor sequence tab

  1. … 2 more files in changeset.
LDEV-5023 Allow single click gate open in monitoring

  1. … 4 more files in changeset.
LDEV-4995 fix exception thrown on trying to get activity's Id

LDEV-4995 Revert accidentally committed code

LDEV-4995 Improvements to the index page

* Fix offcanvas bar search and organisation tablesorter markup in case

of big amount of available organisations

* Optimise DB queries

* Introduce hasContributeActivities Lesson's flag

* Show "fa-spin" when loading an organisation

  1. … 14 more files in changeset.
LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

  1. … 198 more files in changeset.
LDEV-4989 Password Gate initial implementation

  1. … 31 more files in changeset.
LDEV-4951 Remove traces of MCQ tool from other modules

  1. … 191 more files in changeset.
LDEV-4932 Add CSRF to monitor and central

  1. … 41 more files in changeset.
LDEV-4932 Adding CSRF to add lesson

  1. … 2 more files in changeset.