Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5101 Allow global question change initiation from Assessment

  1. … 1 more file in changeset.
LDEV-5101 Allow applying new question version to other activities in LD

  1. … 13 more files in changeset.
LDEV-5095 Support all question types in Answered Questions chart

LDEV-5095 Add Answered Questions chart and periodic refresh

  1. … 3 more files in changeset.
Merge branch 'v4.0' into LDEV-5095

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

  1. … 3 more files in changeset.
LDEV-5097 Embed teacher's view of Assessment result in TBL monitoring

  1. … 4 more files in changeset.
LKC-221 Move TBL template Assessment methods to Authoring service

Workflow Automation needs to have access to them to create Application

Exercise activities.

  1. … 4 more files in changeset.
LDEV-5097 Add buttons to open results view in Assessment monitoring

  1. … 5 more files in changeset.
LDEV-5097 Prepare a teacher's view of Assessment result

  1. … 9 more files in changeset.
LDEV-5095 Initial implementation of learner complection chart

  1. … 3 more files in changeset.
LDEV-5095 Prepare data for activity completion chart

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java

LDEV-5090 Use "-" char when displaying blank Essay answer

LDEV-5087 Do not show question title on Assessment results screen

  1. … 1 more file in changeset.
LDEV-5081 Rename file prototypes to real names used in Assessment

  1. … 23 more files in changeset.
LDEV-5081 Rewrite questions table to bootstrap 4.5

  1. … 4 more files in changeset.
LDEV-5081 Allow proper saving of redesigned Assessment authoring

  1. … 2 more files in changeset.
LKC-89 Calculate correct answer correctly when max mark is 0

LDEV-5080 Use redesigned dummy tool authoring template in Assessment

  1. … 26 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-4745 Sort QB questions using display order when fetching from DB

  1. … 2 more files in changeset.
LKC-236 Return questions replaced in tool for further processing

  1. … 3 more files in changeset.
LDEV-5066 Do not show uncofigured Etherpad option in Assessment

  1. … 1 more file 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. … 22 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_gradebook/conf/language/lams/ApplicationResources.properties

  1. … 3 more files in changeset.
LDEV-5062 Do not allow multiple disclose answers requests

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

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

  1. … 33 more files in changeset.
LDEV-4921 Hide question titles in Assessment

  1. … 1 more file in changeset.
LDEV-5015 Allow answer justification for AE question for TBL template

  1. … 2 more files in changeset.