lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'master' into develop

LDEV-4816 use jquery toggle instead of bootstrap collapse

By some reason bootstrap collapse doesn't work properly. Involved

links got assigned double amount of click handlers which makes

them appear and then instantaneously disappear again.

    • -1
    • +11
    /lams_monitoring/web/tblmonitor/teams.jsp
LDEV-4746 Fix issues arose after migrating Assessment to QB

LDEV-4746 Fix adding of several items at once and import QTI questions

LDEV-4746 Fixes and tuning for QB migration SQL script

LDEV-4746 Migrate Assessment to QB

  1. … 66 more files in changeset.
Merge branch 'LDEV-4745' into LDEV-4746

Merge branch 'LDEV-4765' into LDEV-4745

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
    /lams_tool_assessment/web/common/authoringQuestionHeader.jsp
Merge remote-tracking branch 'origin/master' into develop

LDEV-4813 Speed up event log processing with an extra index

Merge branch 'LDEV-4811'

LDEV-4811 Solve the problem of working with several open monitor dialogs

    • -48
    • +49
    /lams_monitoring/web/monitor.jsp
LDEV-4746 Set default mark when QB'ing MCQ questions

A default mark of 1 was set during question creation in authoring. Since

now we import instead of create, it is better to also do it during

migration.

Merge branch 'master' into develop

Merge branch 'LDEV-4814'

LDEV-4814 Wrap text properly in jqGrid

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

jqGrid instances.

    • -0
    • +12
    /lams_central/web/css/_learner_base.scss
LDEV-4814 Update free-jqGrid to the latest 4.15.5 version

    • -3
    • +3
    /lams_central/web/css/free.ui.jqgrid.min.css
LDEV-4815 Fix URL that got broken after migrating to spring mvc

LDEV-4810 Create SVG with a transparent background

LDEV-4746 Fix a duplicate association in MCQ

LDEV-4782 Show burning questions with no likes in QB stats

LDEV-4746 Set tool content ID to Scratchie items on activity copy

Merge branch 'master' into develop

    • -10
    • +13
    /lams_build/3rdParty.userlibraries
LDEV-4810 Add batik lib to 3rdParty.userlibraries

Merge branch 'LDEV-4805'

LDEV-4805 Finally switch to using free-jqGrid

    • -151
    • +0
    /lams_central/web/css/jquery.jqGrid.css
    • -2
    • +0
    /lams_tool_lamc/web/common/monitoringheader.jsp
    • -12
    • +2
    /lams_tool_larsrc/web/css/monitor.scss
  1. … 13 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

Merge branch 'LDEV-4813'

LDEV-4813 Use tables only if a condition is provided

If tables are used and no condition which uses them is provided, a full

outer join is run. It takes ages to complete on a large instance.