Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4759 Fixing responsive behaviour on front page and tabs.

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

    • -0
    • +107
    ./includes/javascript/jquery.highlight.js
    • -0
    • +75
    ./qb/qbQuestionDetails.jsp
  1. … 8 more files in changeset.
LDEV-4759 Tablesorter, Learner Progress Bar tweaked

    • -1
    • +188
    ./css/jquery.tablesorter.theme.bootstrap.css
  1. … 114 more files in changeset.
LDEV-4759 Improved styling for accordians

  1. … 4 more files in changeset.
LDEV-4782 Add initial implementation of QB statistics

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

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

LDEV-4780 Properly detect if authoring is in a frame

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

LDEV-4780 Use callbak to resize iframe instead of load detection

When iframe with LD for importing activities gets loaded, the SVG is not

ready yet and reports false height. Instead of detecting when it is

ready, authoring JS code in the iframe reports height when it loads

completely to its parent frame.

LDEV-4759 Main page restyled.

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

    • -17
    • +17
    ./css/material-kit-blue-primary.css
    • -14043
    • +8462
    ./css/material-kit.css
  1. … 77 more files in changeset.
LDEV-4771 Remove close activity authoring confirmation screen

The JSP that controls the close action stays as it works differently in

various environments (authoring, monitoring, IE). It is just run

immediately instead of waiting for button click.

    • -10
    • +14
    ./includes/javascript/authoring/authoringActivity.js
  1. … 24 more files in changeset.
LDEV-4771 Remove close activity authoring confirmation screen

The JSP that controls the close action stays as it works differently in

various environments (authoring, monitoring, IE). It is just run

immediately instead of waiting for button click.

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

# Conflicts:

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

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

    • -9
    • +9
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -8
    • +6
    ./WEB-INF/tags/RestrictedUsageAccordian.tag
    • -1
    • +1
    ./authoring/template/tool/assessmcq.jsp
    • -1
    • +1
    ./authoring/template/tool/assessoption.jsp
    • -1
    • +1
    ./authoring/template/tool/mcoption.jsp
    • -1
    • +1
    ./authoring/template/tool/mcquestion.jsp
  1. … 377 more files in changeset.
LDEV-4770 CKEditor's content use display:block instead of inline-block

Content in CKEditor is by default displayed using display: inline-block,

however, this CSS property doesn't get applied in real life. Which

creates a discrepancy between the way content displayed inside the

editor and later on outside of it.

LDEV-4772 Fix properties dialog position in authoring after first drag

LDEV-4762 Add drag and drop for answers in ordering question type

(cherry picked from commit 21e3286385ca1c464997e9792460b7712d23dcdd)

    • -0
    • +3
    ./includes/javascript/Sortable.js
  1. … 7 more files in changeset.
LDEV-4762 Add drag and drop for answers in ordering question type

    • -0
    • +3
    ./includes/javascript/Sortable.js
  1. … 7 more files in changeset.
LDEV-4759 Tour and portrait pop ups appear correctly.

  1. … 35 more files in changeset.
LDEV-4759 Main page functional

  1. … 33 more files in changeset.
LDEV-4759 Choice of colour schemes blue or purple

    • -0
    • +12490
    ./css/material-kit-blue-primary.css
  1. … 6 more files in changeset.
LDEV-4765 Apply new UI to other question types

    • -0
    • +6
    ./includes/javascript/jquery-ui.slider.js
  1. … 23 more files in changeset.
LDEV-4759 Panels are now cards.

    • -4
    • +4
    ./authoring/template/tool/assessmcq.jsp
    • -4
    • +4
    ./authoring/template/tool/assessment.jsp
    • -4
    • +4
    ./authoring/template/tool/mcquestion.jsp
  1. … 492 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-4731' into LDEV-4731

LDEV-4759 Authoring and monitoring tabs working

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

Also some other improvements.

    • -1
    • +1
    ./ckeditor/plugins/confighelper/plugin.js
    • -0
    • +3
    ./includes/javascript/Sortable.js
  1. … 6 more files in changeset.
LDEV-4759 Upgraded bootstrap-tour, dialogs opening at appropriate size

    • -0
    • +188
    ./css/theme.bootstrap_4.css
    • -7
    • +1
    ./includes/javascript/bootstrap.min.js
  1. … 7 more files in changeset.
LDEV-4764 Labels use standard font-weight overriding Bootstrap change