lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

LDEV-4813 Add a missing foreign key in Assessment tool

Merge branch 'LDEV-4782' into LDEV-4745

SP-2 Allow only first and last name editing on back end

    • -0
    • +1
    /lams_central/web/profile/editprofile.jsp
Merge branch 'master' into develop

LDEV-4808 Fix .css file name

Merge branch 'master' into develop

Merge branch 'LDEV-4810'

LDEV-4810 Sharpen latex characters by switching to SVG images

LDEV-4810 Reintroduce Batik lib, required for producing Jlatexmath's SVG

    • binary
    /lams_build/lib/batik/batik-all-1.7.jar
    • -0
    • +40
    /lams_build/lib/batik/batik.module.xml
LDEV-4810 Update Jlatexmath library to 1.0.8 version

    • binary
    /lams_build/lib/jlatexmath/jlatexmath-1.0.8.jar
LDEV-4810 Update source code of Jlatexmath library to 1.0.8 version

  1. … 137 more files in changeset.
LDEV-4809 Don't display number prior to general burning question

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

Merge branch 'LDEV-4765' into LDEV-4745