Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5095 Move chart code to separate JS file for reuse in another spot

  1. … 1 more file in changeset.
LDEV-5095 Make charts more responsive and add some padding

LDEV-5095 Add Answered Questions chart and periodic refresh

  1. … 6 more files in changeset.
LDEV-5095 Calculate Possible Learners correctly

Merge branch 'v4.0' into LDEV-5095

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

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

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

  1. … 2 more files in changeset.
LDEV-5091 Initialise Etherpads on Discussion panel expand

  1. … 36 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-5067 Do not show disclose group answers if activity is not grouped

LDEV-5065 Confirm before disclosing answers in Assessment monitoring

  1. … 2 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-5033 Add answer justification to Assessment

  1. … 13 more files in changeset.
LDEV-5041 Use CSS instead of deprecated HTML attributes

LDEV-5041 add/fix labels and modify the monitor UI stlightly

  1. … 1 more file in changeset.
LDEV-5041 Allow adding a whole group to individual time limit table

  1. … 3 more files in changeset.
LDEV-5041 Allow time limit for learners who did not reach Assessment yet

  1. … 11 more files in changeset.
LDEV-5041 Expand panel if absolute time limit is set and not expired

LDEV-5041 Add individual time limits

  1. … 10 more files in changeset.
LDEV-5041 Add "Finish now" feature

  1. … 1 more file in changeset.
LDEV-5041 Add absolute time limit feature to Assessment

  1. … 8 more files in changeset.
LDEV-5041 Control relative time limit in Assessment monitor

    • -0
    • +70
    ./parts/timeLimit.jsp
  1. … 5 more files in changeset.
LDEV-5052 Adjust rating layout in Assessment monitoring

  1. … 3 more files in changeset.
LDEV-5052 Adjust rating layout in Assessment monitoring

  1. … 1 more file in changeset.
LDEV-5052 Add group name when displaying rating in monitor

  1. … 1 more file in changeset.
LDEV-5025 Show detailed answer ratings in Assessment monitoring

  1. … 3 more files in changeset.
LDEV-5025 Show average answer rating in Assessment monitoring

  1. … 3 more files in changeset.
LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

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

Conflicts:

lams_build/3rdParty.userlibraries

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

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

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

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

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

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

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

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

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

  1. … 30 more files in changeset.
LDEV-5009 Fix Assessment student's choices for Question Bank structure