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/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

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

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

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

    • -280
    • +281
    ./results/allquestions.jsp
  1. … 2 more files in changeset.
LDEV-5052 Prevent floating question description from hiding options

LDEV-5436 Project-wide user sorting by last then first name

  1. … 148 more files in changeset.
LDEV-5397 Enhanced mobile experience

  1. … 9 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 517 more files in changeset.
LDEV-5397 move CSS rule outside of <c:if> tag

Revert "LDEV-5397 cancel out opacity when revealing results in assessment"

This reverts commit 1298dedc3fa80a3c1c495d58d17caaeee8e81c7f.

Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

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

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

  1. … 3 more files in changeset.
LDEV-5397 cancel out opacity when revealing results in assessment

LDEV-5432 Confirm with learner whether he wants to submit answers

  1. … 1 more file in changeset.
LDEV-5397 remove opacity set for disabled input's labels (only for results page)

  1. … 1 more file in changeset.
LDEV-5397 make sure all buttons have proper "type" attribute

  1. … 24 more files in changeset.
LDEV-5397 make required item label more prominent

  1. … 5 more files in changeset.
LDEV-5397 solve the problem with additional scrollbar in Brave browser

LDEV-5397 minor CSS fixes

  1. … 1 more file in changeset.
LDEV-5397 fix initialization of buttons when Assessment is shown in TBL's iRAT tab

  1. … 2 more files in changeset.
LDEV-5397 fix assessment monitoring by feeding it old bootstrap3 learning jsps

    • -0
    • +340
    ./resultsbootstrap3/allquestions.jsp
    • -0
    • +35
    ./resultsbootstrap3/confidencelevel.jsp
    • -0
    • +114
    ./resultsbootstrap3/essay.jsp
    • -0
    • +109
    ./resultsbootstrap3/historyresponses.jsp
    • -0
    • +21
    ./resultsbootstrap3/markandpenaltyarea.jsp
    • -0
    • +90
    ./resultsbootstrap3/markhedging.jsp
    • -0
    • +50
    ./resultsbootstrap3/matchingpairs.jsp
    • -0
    • +131
    ./resultsbootstrap3/multiplechoice.jsp
    • -0
    • +34
    ./resultsbootstrap3/numerical.jsp
    • -0
    • +41
    ./resultsbootstrap3/ordering.jsp
    • -0
    • +89
    ./resultsbootstrap3/truefalse.jsp
    • -0
    • +36
    ./resultsbootstrap3/vsa.jsp
  1. … 2 more files in changeset.
LDEV-5397 show warnings and nofications before activity's instructions

  1. … 14 more files in changeset.
LDEV-5397 switch from lams:errors to lams:errors5

  1. … 14 more files in changeset.
Merge v4.7 into LDEV-5397

  1. … 79 more files in changeset.
LDEV-5397 bootstrap5 related improvements and fixes

  1. … 27 more files in changeset.
LDEV-5397 miscellaneous minor UI fixes

  1. … 5 more files in changeset.
LDEV-5397 show question descriptions inside card-body instead of card-header

  1. … 12 more files in changeset.
LDEV-5397 show confidence levels' labels horizontally

  1. … 4 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. … 21 more files in changeset.
LDEV-5397 make CKEditor ARIA compliant

A new rule should be observed when CKEditor tag is used: either "ariaLabel" or "ariaLabelledby" attribute is required

  1. … 4 more files in changeset.
LDEV-5414 Reattach message handlers to websocket after reconnect

  1. … 77 more files in changeset.
LDEV-5414 Refactor and improve resilience of websockets thorough LAMS

  1. … 132 more files in changeset.
LDEV-5397 make formActionUrl attribute non required

  1. … 6 more files in changeset.
LDEV-5397 switch to portrait5.js

  1. … 4 more files in changeset.