Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5002 Fix advanced options list in monitoring summary

LDEV-5185 Introduce time limits to Scratchie monitoring

    • -0
    • +192
    ./parts/timeLimit.jsp
  1. … 16 more files in changeset.
LDEV-5169 Add data for median and modes on Scratchie analysis screen

  1. … 6 more files in changeset.
LDEV-5171 Add averages to student choices in Scratchie

  1. … 1 more file in changeset.
LDEV-5171 Show bootstrap tooltips in student choices in Scratchie

LDEV-5171 tooltips

  1. … 2 more files in changeset.
LDEV-5171 Add question stats and colour indication to choices table

  1. … 4 more files in changeset.
LDEV-5182 Fix ordering in non-empty burning questions

  1. … 2 more files in changeset.
LDEV-5179 Add mark hedging question type support to Scratchie

  1. … 9 more files in changeset.
LDEV-5175 Remove unnecessary icon in Scratchie monitoring

LDEV-5175 Use TBL burning questions layout in monitoring in Scratchie

    • -0
    • +172
    ./parts/burningQuestions.jsp
  1. … 4 more files in changeset.
LDEV-5172 spacing burning questions and change label

LDEV-5173 Show which learner is leader in Doku monitoring

  1. … 2 more files in changeset.
LDEV-5169 Adding labels and frontend

  1. … 5 more files in changeset.
LDEV-5151 Adding extra contextual info for item analytics

LDEV-5143 Fix marking all learners with star when there is no leader

LDEV-5143 Refresh Scratchie monitoring after leader change

Tables in summary tab need to reflect the change.

LDEV-5143 Allow promoting to leader a learner who did not reach activity

  1. … 21 more files in changeset.
LDEV-5143 Allow changing leader in Scratchie monitoring

  1. … 6 more files in changeset.
LDEV-5019 Fix a typo when displaying students' choices in Scratchie

LDEV-5132 Improve indication of good/bad VSA answers in monitoring

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/includes/javascript/openUrls.js

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

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

lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

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

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql

lams_tool_lamc/web/tblmonitoring/mcq.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

lams_tool_scratchie/web/pages/learning/scratchies.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

lams_www/web/news.html

  1. … 8 more files in changeset.
LDEV-5022 Keep HTML paragraphs when displaying burning questions

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

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

  1. … 3 more files in changeset.
LDEV-5019 Link Scratchie learner view to student choices in monitoring

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

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

  1. … 7 more files in changeset.
LDEV-4992 Display all learners in group in Scratchie monitoring summary

Mark ones who reached the activity.

  1. … 3 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.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

  1. … 21 more files in changeset.
LDEV-4992 Add icon to a leader in Scratchie monitoring summary