Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
LDEV-4762 Add drag and drop for answers in ordering question type

    • -29
    • +9
    ./pages/learning/parts/ordering.jsp
  1. … 4 more files in changeset.
LDEV-4759 Tour and portrait pop ups appear correctly.

  1. … 43 more files in changeset.
LDEV-4765 Fixed essay's slider CSS and validation

    • -5
    • +13
    ./pages/authoring/parts/addessay.jsp
LDEV-4765 Experimental switch and radio button for Mark hedging question

Also several other CSS and JS fixes.

    • -65
    • +65
    ./pages/authoring/parts/addessay.jsp
    • -52
    • +127
    ./pages/authoring/parts/addmarkhedging.jsp
    • -43
    • +43
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -61
    • +61
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./pages/authoring/parts/addnumerical.jsp
    • -1
    • +0
    ./pages/authoring/parts/addordering.jsp
    • -6
    • +12
    ./pages/authoring/parts/optionhedgingmark.jsp
LDEV-4759 Main page functional

  1. … 35 more files in changeset.
LDEV-4765 Apply new UI to other question types

    • -0
    • +18
    ./common/authoringQuestionHeader.jsp
    • -59
    • +0
    ./includes/javascript/assessmentoption.js
    • -0
    • +136
    ./includes/javascript/authoring-options.js
    • -0
    • +48
    ./includes/javascript/authoring-question.js
    • -96
    • +96
    ./pages/authoring/parts/addessay.jsp
    • -141
    • +105
    ./pages/authoring/parts/addmarkhedging.jsp
    • -116
    • +91
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -497
    • +154
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -144
    • +109
    ./pages/authoring/parts/addnumerical.jsp
    • -126
    • +93
    ./pages/authoring/parts/addordering.jsp
    • -116
    • +93
    ./pages/authoring/parts/addshortanswer.jsp
    • -104
    • +88
    ./pages/authoring/parts/addtruefalse.jsp
    • -48
    • +9
    ./pages/authoring/parts/gradeselector.jsp
  1. … 9 more files in changeset.
LDEV-4759 Panels are now cards.

    • -3
    • +3
    ./pages/authoring/parts/addmarkhedging.jsp
    • -3
    • +3
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -3
    • +3
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -3
    • +3
    ./pages/authoring/parts/addnumerical.jsp
  1. … 492 more files in changeset.
LDEV-4759 Authoring and monitoring tabs working

  1. … 309 more files in changeset.
LDEV-4765 Add sorting of the question answers

Also some other improvements.

    • -55
    • +1
    ./includes/javascript/assessmentoption.js
    • -62
    • +96
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -52
    • +36
    ./pages/authoring/parts/optionlist.jsp
  1. … 3 more files in changeset.
LDEV-4760 Fixed spacing in authoring criteria entry panel

    • -2
    • +4
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
  1. … 32 more files in changeset.
LDEv-4759 Material Kit for Bootstrap 4 files installed into lams_central

  1. … 262 more files in changeset.
LDEV-4765 introducing new question authoring UI

    • -26
    • +38
    ./includes/javascript/assessmentoption.js
    • -68
    • +349
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -20
    • +22
    ./pages/authoring/parts/option.jsp
    • -4
    • +22
    ./pages/authoring/parts/optionlist.jsp
  1. … 8 more files in changeset.
QB_UI introducing new question authoring UI

    • -26
    • +38
    ./includes/javascript/assessmentoption.js
    • -68
    • +350
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -20
    • +22
    ./pages/authoring/parts/option.jsp
    • -4
    • +30
    ./pages/authoring/parts/optionlist.jsp
  1. … 8 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
    • +1
    ./pages/learning/submissionDeadline.jsp
  1. … 140 more files in changeset.
LDEV-4735 Fix an URL in learning outcomes in authoring

  1. … 31 more files in changeset.
Merge remote-tracking branch 'origin/master' into lams31

  1. … 12 more files in changeset.
LDEV-4569: simple TBL UI adjustments

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

LDEV-4705 Remove references to Group Admin role from web.xml

  1. … 30 more files in changeset.
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.