Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4832 Add ability to create/edit questions from the central QB pages

    • -0
    • +1
    ./pages/authoring/parts/addmarkhedging.jsp
    • -0
    • +1
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -0
    • +1
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -0
    • +1
    ./pages/authoring/parts/addnumerical.jsp
    • -0
    • +1
    ./pages/authoring/parts/addordering.jsp
    • -0
    • +1
    ./pages/authoring/parts/addshortanswer.jsp
    • -0
    • +1
    ./pages/authoring/parts/addtruefalse.jsp
  1. … 21 more files in changeset.
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
    • +1
    ./pages/learning/parts/markhedging.jsp
    • -1
    • +1
    ./pages/learning/parts/matchingpairs.jsp
    • -2
    • +2
    ./pages/learning/parts/multiplechoice.jsp
    • -18
    • +9
    ./pages/monitoring/parts/questionsummary.jsp
    • -20
    • +8
    ./pages/monitoring/parts/usersummary.jsp
  1. … 85 more files in changeset.
LDEV-4826 Remove import/export QTI questions feature from tools

    • -9
    • +0
    ./pages/authoring/parts/questionlist.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.

  1. … 9 more files in changeset.
LDEV-4825 Display QB stats in Assessment tool monitoring

    • -167
    • +231
    ./pages/monitoring/statisticpart.jsp
  1. … 2 more files in changeset.
LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

  1. … 35 more files in changeset.
LDEV-4777 Show question details for all question types

    • -1
    • +1
    ./pages/authoring/parts/questionlist.jsp
  1. … 4 more files in changeset.
LDEV-4777 Search QB interface is now available in Assessment tool

    • -1
    • +1
    ./pages/authoring/parts/addmarkhedging.jsp
    • -1
    • +1
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -1
    • +1
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./pages/authoring/parts/addnumerical.jsp
    • -1
    • +1
    ./pages/authoring/parts/addordering.jsp
    • -1
    • +1
    ./pages/authoring/parts/addshortanswer.jsp
    • -1
    • +1
    ./pages/authoring/parts/addtruefalse.jsp
    • -4
    • +4
    ./pages/authoring/parts/questionlist.jsp
  1. … 4 more files in changeset.
LDEV-4746 Migrate Assessment to QB

    • -4
    • +4
    ./includes/javascript/authoring-options.js
    • -8
    • +8
    ./pages/authoring/parts/addmarkhedging.jsp
    • -8
    • +8
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -15
    • +15
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -16
    • +16
    ./pages/authoring/parts/addnumerical.jsp
    • -8
    • +8
    ./pages/authoring/parts/addordering.jsp
    • -15
    • +15
    ./pages/authoring/parts/addshortanswer.jsp
    • -7
    • +7
    ./pages/authoring/parts/addtruefalse.jsp
    • -1
    • +1
    ./pages/authoring/parts/gradeselector.jsp
    • -4
    • +4
    ./pages/authoring/parts/matchingpairoption.jsp
  1. … 66 more files in changeset.
LDEV-4765 Further UI improvements

* True/False type of questions now use bootstrap-toggle widget

* Update jqeuryvalidate plugin. And make it show bootstrap-like warnings

* Disable autocomplete for all form inputs

* A few other minor fixes

    • -17
    • +17
    ./common/authoringQuestionHeader.jsp
    • -6
    • +10
    ./pages/authoring/parts/addessay.jsp
    • -13
    • +14
    ./pages/authoring/parts/addmarkhedging.jsp
    • -8
    • +14
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -8
    • +16
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -9
    • +19
    ./pages/authoring/parts/addnumerical.jsp
    • -7
    • +13
    ./pages/authoring/parts/addordering.jsp
    • -8
    • +16
    ./pages/authoring/parts/addshortanswer.jsp
    • -12
    • +19
    ./pages/authoring/parts/addtruefalse.jsp
    • -1
    • +3
    ./pages/authoring/parts/optionlist.jsp
  1. … 1 more file in changeset.
LDEV-4814 Wrap text properly in jqGrid

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

jqGrid instances.

    • -1
    • +0
    ./pages/monitoring/parts/questionsummary.jsp
    • -1
    • +0
    ./pages/monitoring/parts/usersummary.jsp
  1. … 4 more files in changeset.
LDEV-4805 Finally switch to using free-jqGrid

    • -1
    • +1
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -17
    • +9
    ./pages/monitoring/parts/questionsummary.jsp
    • -19
    • +8
    ./pages/monitoring/parts/usersummary.jsp
  1. … 23 more files in changeset.
LDEV-4765 UI improvements

* Use switches instead of checkboxes

* Properly use toggle in Mark hedging question type

    • -0
    • +28
    ./includes/css/bootstrap-toggle.scss
    • -0
    • +9
    ./includes/javascript/bootstrap-toggle.js
    • -6
    • +12
    ./pages/authoring/parts/addessay.jsp
    • -66
    • +13
    ./pages/authoring/parts/addmarkhedging.jsp
    • -4
    • +10
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -12
    • +24
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -2
    • +5
    ./pages/authoring/parts/addnumerical.jsp
    • -2
    • +5
    ./pages/authoring/parts/addordering.jsp
    • -3
    • +6
    ./pages/authoring/parts/addshortanswer.jsp
    • -3
    • +6
    ./pages/authoring/parts/addtruefalse.jsp
    • -1
    • +2
    ./pages/authoring/parts/optionhedgingmark.jsp
    • -74
    • +4
    ./pages/authoring/parts/optionlist.jsp
  1. … 1 more file in changeset.
LDEV-4765 UI improvements

* Show CKEditor placeholder properly in cases when it's initially not

blank

* Proper transition on expanding/collapsing options

    • -1
    • +1
    ./pages/authoring/parts/optionhedgingmark.jsp
    • -6
    • +18
    ./pages/authoring/parts/optionlist.jsp
  1. … 1 more file in changeset.
LDEV-4765 Further work on this feature

* shrinking and expanding question options on selecting them

* improved placeholder for CKEditor

* arranged questions' Settings tab items

    • -6
    • +5
    ./includes/javascript/authoring-options.js
    • -14
    • +23
    ./pages/authoring/parts/addessay.jsp
    • -5
    • +8
    ./pages/authoring/parts/addmarkhedging.jsp
    • -12
    • +20
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -45
    • +50
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -12
    • +20
    ./pages/authoring/parts/addnumerical.jsp
    • -12
    • +20
    ./pages/authoring/parts/addordering.jsp
    • -20
    • +31
    ./pages/authoring/parts/addshortanswer.jsp
    • -12
    • +20
    ./pages/authoring/parts/addtruefalse.jsp
    • -2
    • +2
    ./pages/authoring/parts/optionhedgingmark.jsp
  1. … 4 more files in changeset.
LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

  1. … 87 more files in changeset.
LDEV-4794 TBLmonitor display question numbering only if setting is ON

LDEV-4762 Fix saving ordering type of questions that happens on autosave

    • -1
    • +1
    ./pages/learning/parts/markhedging.jsp
    • -1
    • +1
    ./pages/learning/parts/matchingpairs.jsp
    • -2
    • +2
    ./pages/learning/parts/multiplechoice.jsp
  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
    ./pages/learning/parts/markhedging.jsp
    • -1
    • +1
    ./pages/learning/parts/matchingpairs.jsp
    • -2
    • +2
    ./pages/learning/parts/multiplechoice.jsp
  1. … 1 more file in changeset.
LDEV-4777 Further development of QB search feature

* Search QB interface is now available in Q&A tool, but questions of

this type (Essay) can only be added via DB for now

    • -0
    • +17
    ./pages/authoring/parts/questionlist.jsp
  1. … 14 more files in changeset.
LDEV-4786 Allow creating learning outcomes on the fly

  1. … 63 more files in changeset.
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
    • +1
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 35 more files in changeset.
LDEV-4759 Fixing responsive behaviour on front page and tabs.

  1. … 43 more files in changeset.
LDEV-4759 Tablesorter, Learner Progress Bar tweaked

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

  1. … 50 more files in changeset.
LDEV-4759 Togglebutton and checkbox css functional

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

# Conflicts:

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

    • -29
    • +9
    ./pages/learning/parts/ordering.jsp
  1. … 1 more file in changeset.
LDEV-4759 DateTimePicker and Accordians updated

    • -9
    • +9
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -8
    • +6
    ./WEB-INF/tags/RestrictedUsageAccordian.tag
    • -1
    • +1
    ./pages/authoring/parts/optionlist.jsp
    • -1
    • +1
    ./pages/authoring/parts/overallfeedbacklist.jsp
    • -2
    • +2
    ./pages/authoring/parts/questionlist.jsp
    • -1
    • +1
    ./pages/learning/parts/markhedging.jsp
    • -1
    • +1
    ./pages/learning/parts/matchingpairs.jsp
    • -1
    • +1
    ./pages/learning/parts/multiplechoice.jsp
  1. … 377 more files in changeset.
LDEV-4762 Add drag and drop for answers in ordering question type

(cherry picked from commit 21e3286385ca1c464997e9792460b7712d23dcdd)

    • -29
    • +9
    ./pages/learning/parts/ordering.jsp
  1. … 4 more files in changeset.