Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4814 Wrap text properly in jqGrid

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

jqGrid instances.

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

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

* Use switches instead of checkboxes

* Properly use toggle in Mark hedging question type

    • -66
    • +13
    ./authoring/parts/addmarkhedging.jsp
    • -4
    • +10
    ./authoring/parts/addmatchingpairs.jsp
    • -12
    • +24
    ./authoring/parts/addmultiplechoice.jsp
    • -1
    • +2
    ./authoring/parts/optionhedgingmark.jsp
  1. … 4 more files 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
    ./authoring/parts/optionhedgingmark.jsp
  1. … 2 more files 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

    • -12
    • +20
    ./authoring/parts/addmatchingpairs.jsp
    • -45
    • +50
    ./authoring/parts/addmultiplechoice.jsp
    • -12
    • +20
    ./authoring/parts/addnumerical.jsp
    • -12
    • +20
    ./authoring/parts/addordering.jsp
    • -20
    • +31
    ./authoring/parts/addshortanswer.jsp
    • -12
    • +20
    ./authoring/parts/addtruefalse.jsp
    • -2
    • +2
    ./authoring/parts/optionhedgingmark.jsp
    • -4
    • +138
    ./authoring/parts/optionlist.jsp
    • -1
    • +1
    ./authoring/parts/shortansweroption.jsp
  1. … 6 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 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.
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

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

    • -1
    • +1
    ./monitoring/parts/questionsummary.jsp
    • -3
    • +3
    ./tblmonitoring/assessmentStudentChoices.jsp
    • -3
    • +3
    ./tblmonitoring/iraAssessmentStudentChoices.jsp
  1. … 38 more files 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
    • +1
    ./authoring/parts/overallfeedbacklist.jsp
    • -1
    • +1
    ./authoring/parts/questionlistRestricted.jsp
  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-4765 Fixed essay's slider CSS and validation

  1. … 1 more file in changeset.
LDEV-4765 Experimental switch and radio button for Mark hedging question

Also several other CSS and JS fixes.

    • -52
    • +127
    ./authoring/parts/addmarkhedging.jsp
    • -43
    • +43
    ./authoring/parts/addmatchingpairs.jsp
    • -61
    • +61
    ./authoring/parts/addmultiplechoice.jsp
    • -6
    • +12
    ./authoring/parts/optionhedgingmark.jsp
  1. … 1 more file in changeset.
LDEV-4765 Apply new UI to other question types

    • -141
    • +105
    ./authoring/parts/addmarkhedging.jsp
    • -116
    • +91
    ./authoring/parts/addmatchingpairs.jsp
    • -497
    • +154
    ./authoring/parts/addmultiplechoice.jsp
    • -144
    • +109
    ./authoring/parts/addnumerical.jsp
    • -126
    • +93
    ./authoring/parts/addordering.jsp
    • -116
    • +93
    ./authoring/parts/addshortanswer.jsp
    • -104
    • +88
    ./authoring/parts/addtruefalse.jsp
    • -48
    • +9
    ./authoring/parts/gradeselector.jsp
    • -10
    • +7
    ./authoring/parts/matchingpairoption.jsp
    • -30
    • +16
    ./authoring/parts/numericaloption.jsp
    • -22
    • +20
    ./authoring/parts/optionhedgingmark.jsp
  1. … 9 more files in changeset.
LDEV-4759 Panels are now cards.

    • -3
    • +3
    ./authoring/parts/addmatchingpairs.jsp
    • -3
    • +3
    ./authoring/parts/addmultiplechoice.jsp
    • -2
    • +2
    ./authoring/parts/questionlistRestricted.jsp
  1. … 492 more files in changeset.
LDEV-4765 Add sorting of the question answers

Also some other improvements.

    • -62
    • +96
    ./authoring/parts/addmultiplechoice.jsp
    • -52
    • +36
    ./authoring/parts/optionlist.jsp
  1. … 5 more files in changeset.
LDEV-4765 introducing new question authoring UI

    • -68
    • +349
    ./authoring/parts/addmultiplechoice.jsp
  1. … 10 more files in changeset.
QB_UI introducing new question authoring UI

    • -68
    • +350
    ./authoring/parts/addmultiplechoice.jsp
  1. … 10 more files in changeset.
LDEV-4719 Remove incorrect warning for numerical question's units

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.
Merge remote-tracking branch 'origin/master' into lams31

    • -1
    • +1
    ./tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +1
    ./tblmonitoring/iraAssessmentStudentChoices.jsp
  1. … 12 more files in changeset.
LDEV-4569: simple TBL UI adjustments

    • -1
    • +1
    ./tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +1
    ./tblmonitoring/iraAssessmentStudentChoices.jsp
  1. … 5 more files in changeset.
LDEV-4708 Fix a merge issue

Merge branch 'LDEV-4391' into lams31

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

    • -11
    • +13
    ./authoring/parts/addmarkhedging.jsp
    • -7
    • +11
    ./authoring/parts/addmatchingpairs.jsp
    • -8
    • +11
    ./authoring/parts/addmultiplechoice.jsp
    • -6
    • +10
    ./authoring/parts/addshortanswer.jsp
    • -1
    • +2
    ./authoring/parts/matchingpairoption.jsp
    • -1
    • +2
    ./authoring/parts/optionhedgingmark.jsp
  1. … 20 more files in changeset.
LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

    • -1
    • +1
    ./monitoring/parts/questionsummary.jsp
  1. … 94 more files in changeset.