Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5424 bootstrap5 Scratchie monitoring

  1. … 16 more files in changeset.
LDEV-5424 fix tooltips and switch to bootstrap5 versions of .js and .css files

  1. … 30 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Scratchie

  1. … 11 more files in changeset.
LDEV-4928 Update monitoring, TBL monitoring and Excel export to fully support VSA question type

  1. … 9 more files in changeset.
LDEV-4875 Take care about answers containing XML escaped characters

  1. … 5 more files in changeset.
LDEV-4875 Fixes for VSA feature

  1. … 22 more files in changeset.
LDEV-4875 Item summary page to display options correctly

Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

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

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

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# 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/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

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

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

  1. … 54 more files in changeset.
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

  1. … 94 more files in changeset.
LDEV-4746 Rename ScratchieAnswer to QbOptionDTO to reduce ambiguity

  1. … 26 more files in changeset.
LDEV-4746 Fix issues that arose after migration to QB questions

  1. … 6 more files in changeset.
LDEV-4805 Finally switch to using free-jqGrid

  1. … 27 more files in changeset.
LDEV-4746 Migrate Scratchie to QB

  1. … 31 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 506 more files in changeset.
LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

  1. … 97 more files in changeset.
LDEV-4440 Clean up shared files

  1. … 206 more files in changeset.
LDEV-4322 Fix report by question layout issues

  1. … 1 more file in changeset.
LDEV-4036 Readjust thickbox so it doesn't have extra scrolls * Also made Thickbox to always use default values for width:90% and height:100%. In case when these values should be different, one can provide width and height values as parameters

  1. … 41 more files in changeset.
LDEV-3822: Bootstrapping Admin, Author, Monitor. Tweaked learner to match the colours of the jqgrids

  1. … 39 more files in changeset.
LDEV-2917: Change DOCTYPE tag of files which have not been picked up by previous runs as they had this tag broken into 2 lines and regex had not detected them.

  1. … 340 more files in changeset.
LDEV-3421 jqGrid should all all available entries by default

  1. … 12 more files in changeset.
LDEV-3421 jqGrid should all all available entries by default

  1. … 13 more files in changeset.
LDEV-2463: escape HTML to prevent possible XSS attacks

  1. … 1 more file in changeset.
LDEV-2463: escape HTML to prevent possible XSS attacks

  1. … 16 more files in changeset.
LDEV-2895 * Monitoring: showing the order in which students selected answers. * updating jquery libraries names * fixing a few bugs

  1. … 20 more files in changeset.
LDEV-2895 implemented requested changes to monitoring

  1. … 17 more files in changeset.
LDEV-2895 introducing new scratchie tool

    • -0
    • +133
    ./itemSummary.jsp
  1. … 164 more files in changeset.