Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LKC-203 Fix location of the first column

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

    • -0
    • +52
    ./includes/css/scratchie-learning.scss
    • -5
    • +14
    ./pages/monitoring/parts/itemSummary.jsp
    • -31
    • +86
    ./pages/tblmonitoring/burningQuestions.jsp
  1. … 83 more files in changeset.
LDEV-4826 Remove import/export QTI questions feature from tools

    • -18
    • +7
    ./pages/authoring/parts/itemlist.jsp
  1. … 11 more files in changeset.
LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

    • -3
    • +2
    ./pages/monitoring/parts/statisticpart.jsp
  1. … 9 more files in changeset.
LDEV-4825 Display QB stats in Scratchie tool monitoring

    • -69
    • +124
    ./pages/monitoring/parts/statisticpart.jsp
  1. … 2 more files in changeset.
LDEV-4820 Show user names as tooltips

    • -0
    • +52
    ./includes/css/scratchie-learning.scss
LDEV-4746 Rename ScratchieAnswer to QbOptionDTO to reduce ambiguity

    • -25
    • +25
    ./pages/authoring/parts/additem.jsp
    • -37
    • +0
    ./pages/authoring/parts/answerlist.jsp
    • -0
    • +37
    ./pages/authoring/parts/optionlist.jsp
    • -7
    • +7
    ./pages/monitoring/parts/itemSummary.jsp
  1. … 17 more files in changeset.
LDEV-4820 Show user names for confidence levels

  1. … 4 more files in changeset.
LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

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

    • -5
    • +6
    ./pages/monitoring/parts/itemSummary.jsp
    • -3
    • +3
    ./pages/tblmonitoring/burningQuestions.jsp
  1. … 2 more files in changeset.
LDEV-4746 Ignore CKEditor during validation

There is no rule for Scratchie description anyway. And validate plugin

tries to validate a CKEditor div with contenteditable="true" but with no

id or name. There is no point in doing it as contents get moved to a

named textarea before submit.

LDEV-4814 Wrap text properly in jqGrid

Move responsible CSS rules to the _learner_base.scss, so it affects all

jqGrid instances.

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

    • -5
    • +14
    ./pages/monitoring/parts/itemSummary.jsp
  1. … 25 more files in changeset.
LDEV-4809 Don't display number prior to general burning question

    • -6
    • +18
    ./pages/tblmonitoring/burningQuestions.jsp
LDEV-4793 Show horizontal scrollbar on iPads

LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

  1. … 87 more files in changeset.
LDEV-4796 Fix refresh button issue after clicking "Expand all" one

    • -2
    • +2
    ./pages/tblmonitoring/burningQuestions.jsp
  1. … 1 more file in changeset.
LDEV-4793 Fixing TBLmonitor's issues with iPad

  1. … 1 more file in changeset.
LDEV-4786 Allow creating learning outcomes on the fly

  1. … 63 more files in changeset.
LDEV-4785 Fix a reference to incorrect form when displaying description

LDEV-4759 Restyle File Upload widget, cleaned up comments in CSS files

  1. … 34 more files in changeset.
LDEV-4759 Autocomplete restyling, started Assessment updates

  1. … 43 more files in changeset.
LDEV-4759 Fixing responsive behaviour on front page and tabs.

  1. … 43 more files in changeset.
LDEV-4777 Initial implementation of question bank search feature

    • -2
    • +16
    ./pages/authoring/parts/itemlist.jsp
  1. … 10 more files in changeset.
LDEV-4759 Tablesorter, Learner Progress Bar tweaked

  1. … 120 more files in changeset.
LDEV-4759 Improved styling for accordians

  1. … 5 more files in changeset.
LDEV-4759 Gradebook and jqGrid restyled.

  1. … 49 more files in changeset.
LDEV-4766 Add expand all toggle for burning questions in TBL Monitor UI

    • -25
    • +68
    ./pages/tblmonitoring/burningQuestions.jsp
LDEV-4766 Add expand all toggle for burning questions in TBL Monitor UI

(cherry picked from commit 7a82139f8dd4ce906c0b733f764055197c694898)

    • -25
    • +68
    ./pages/tblmonitoring/burningQuestions.jsp
LDEV-4759 Togglebutton and checkbox css functional

  1. … 81 more files in changeset.