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. … 90 more files in changeset.
LDEV-4746 Migrate Assessment to QB

  1. … 70 more files in changeset.
LDEV-4762 Fix saving ordering type of questions that happens on autosave

  1. … 1 more file in changeset.
LDEV-4762 Fix saving ordering type of questions that happens on autosave

(cherry picked from commit d70c019fa4fcaff50a36c3c343e654a738751e86)

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

# Conflicts:

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

  1. … 1 more file in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 377 more files in changeset.
LDEV-4762 Add drag and drop for answers in ordering question type

(cherry picked from commit 21e3286385ca1c464997e9792460b7712d23dcdd)

  1. … 5 more files in changeset.
LDEV-4762 Add drag and drop for answers in ordering question type

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

  1. … 502 more files in changeset.
LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

  1. … 140 more files in changeset.
LDEV-4708 Fix a merge issue

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java

lams_central/web/forgotPassword.jsp

lams_central/web/forgotPasswordChange.jsp

lams_central/web/forgotPasswordProc.jsp

lams_tool_assessment/web/pages/learning/results.jsp

  1. … 10 more files in changeset.
LDEV-4708 update marks more skillfully after edit in monitor

  1. … 33 more files in changeset.
LDEV-4706 Display assessment instructions in case display summary is ON

LDEV-4706 Display assessment instructions in case display summary is ON

LDEV-4440 Clean up shared files

  1. … 204 more files in changeset.
LDEV-4440 Full path is not required in these cases

  1. … 9 more files in changeset.
LDEV-4440 Resetting essay assessment vaildation and escaping

LDEV-4440 Reintroduce custom textarea tags

  1. … 7 more files in changeset.
LDEV-4440 Assessment essay type non CKEditor works again

LDEV-4440 Assessment noStruts

  1. … 64 more files in changeset.
LDEV-4586 Letter prefixes shown on results page

LDEV-4582 Able to add letter prefix to Assessment MCQ Answers

  1. … 11 more files in changeset.
LDEV-4540 Fix variable name clash when iterating over options

LDEV-4540 Change layout of other groups' answers for MC questions

  1. … 1 more file in changeset.
LDEV-4540 Show correct answers and user's answers separately

LDEV-4540 Move groups' answers under each question

  1. … 1 more file in changeset.
LDEV-4540 Do not show correct answers until they are disclosed

Till now other groups' answers were marked as correct no matter if

correct answers were disclosed by a monitor.

LDEV-4540 Refresh learners' results page when monitor discloses answers

  1. … 5 more files in changeset.
LDEV-4540 Disclose answers in TBL monitor and reflect it in learner

  1. … 11 more files in changeset.