Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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-4820 Show user names as tooltips

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

  1. … 26 more files in changeset.
LDEV-4820 Show user names for confidence levels

  1. … 5 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-4682 Overlay of percentages is fixed

Besides, changed layout of portraits with confidence levels in case of a

long answer description.

  1. … 1 more file in changeset.
LDEV-4440 Scratchie NoStruts library

  1. … 27 more files in changeset.
LDEV-4440 Scribe nostruts library

  1. … 32 more files in changeset.
LDEV-4598 Questions must have a link to burning questions

  1. … 2 more files in changeset.
LDEV-4568 Change burning question's "+" icon to "-" on expanding

  1. … 2 more files in changeset.
LDEV-4566: add reference to questions in burning questions

Adding an anchor reference so when seeing burning question there's a link to the question.

  1. … 1 more file in changeset.
LDEV-4532 Opening collapsable panels no longer makes screen jump

  1. … 15 more files in changeset.
LDEV-4532 Burning Questions accessible on iPad

Redid change obscured by merge.

LDEV-4530 Display scratchie results in learner interface

Till now only monitor could view it.

  1. … 4 more files in changeset.