AnswersContent.jsp

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

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

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

# lams_tool_lamc/web/learning/AnswersContent.jsp

# lams_tool_laqa/web/learning/AnswersContent.jsp

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

  1. … 138 more files in changeset.
LDEV-5290 Identify tabs better when checking for multiple open tabs

A minimised window can skip setInterval() ticks. This lead to incorrect detection of multiple tabs open - a single open tab could produce this message.

  1. … 69 more files in changeset.
LDEV-5397 divs not having any special roles can't have aria-labels

  1. … 11 more files in changeset.
LDEV-5397 show warnings and nofications before activity's instructions

  1. … 14 more files in changeset.
LDEV-5397 replace "container-lg" with custom "container-main" class

so it will be easier switching between container's classes in the future if needed

  1. … 23 more files in changeset.
LDEV-5397 Finalize bootstrap5'ing of Q&A

New label for Q&A tool:

label.other.learners.answers =Answers from other learners

  1. … 8 more files in changeset.
LDEV-5397 remove <hr> as long as .instructions class already has bottom border

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.7' into LDEV-5397

# Conflicts:

# lams_build/lams_build.eml

# lams_central/web/css/components.css

# lams_gradebook/lams_gradebook.eml

# lams_monitoring/lams_monitoring.eml

# lams_monitoring/web/monitor.jsp

# lams_tool_laqa/web/learning/AnswersContent.jsp

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

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

# lams_www/web/public/ckeditor-templates/bootsnippets.js

  1. … 8 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 338 more files in changeset.
LDEV-5397 Improvements and fixes to Submit Files and Q&A tools

  1. … 7 more files in changeset.
LDEV-5397 Redesign Q&A learner

Initial redesign of first pages. Still need to figure out the tablesorter components and other bits.

  1. … 8 more files in changeset.
LDEV-5294 minor UI improvements

  1. … 1 more file in changeset.
LDEV-5290 Prevent multiple tabs from being open on autosave

  1. … 40 more files in changeset.
LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

  1. … 33 more files in changeset.
LDEV-4948 Prevent adding enctype="multipart/form-data" to forms

  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

lams_tool_laqa/web/learning/Notebook.jsp

lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

  1. … 11 more files in changeset.
LDEV-4919 Don't focus on question answer

  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.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/learning.jsp

  1. … 21 more files in changeset.
LDEV-4900 Make other tools react to autosave command

  1. … 2 more files in changeset.
LDEV-4864 Show question body in Q&A learner

  1. … 6 more files in changeset.
LDEV-4841 Migrate Q&A tool to QB

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

  1. … 506 more files in changeset.
LDEV-4759 Authoring and monitoring tabs working

  1. … 315 more files in changeset.
LDEV-4720 Fix LAMS issues that prevented TestHarness to work correctly

  1. … 2 more files in changeset.
LDEV-4440 Error messages converted to new error tag

  1. … 129 more files in changeset.
LDEV-4440 Scribe fixes

  1. … 9 more files in changeset.
LDEV-4440 Q&A learning

  1. … 9 more files in changeset.
LDEV-4440 Q&A fixes

  1. … 18 more files in changeset.
LDEV-4440 Q&A authoring and learning fixes

  1. … 10 more files in changeset.
LDEV-4440 Sared resources - authoring - work in progress

  1. … 33 more files in changeset.