Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5080 Allow Spring form tags in LAMS component tags

  1. … 2 more files in changeset.
LDEV-5080 Fix right column padding on a narrow screen

LDEV-5080 Fix CSS calc formulas after reformat

LDEV-5080 Make Panel tag customisable

  1. … 2 more files in changeset.
LDEV-5080 Use redesigned dummy tool authoring template in Assessment

    • -0
    • +7
    ./css/bootstrap4.min.css
    • -0
    • +55
    ./css/components-responsive.css
    • -0
    • +482
    ./css/components.css
    • -0
    • +184
    ./css/jquery.tablesorter.custom.css
    • -0
    • +1
    ./images/components/arrow.svg
    • -0
    • +3
    ./images/components/arrow2.svg
    • -0
    • +6
    ./images/components/assess-icon.svg
    • -0
    • +10
    ./images/components/assess-icon1.svg
    • -0
    • +3
    ./images/components/assess-icon2.svg
    • -0
    • +3
    ./images/components/assess-icon3.svg
    • -0
    • +3
    ./images/components/assess-icon4.svg
    • -0
    • +3
    ./images/components/assess-icon5.svg
    • -0
    • +3
    ./images/components/assess-icon6.svg
    • -0
    • +4
    ./images/components/assess-icon7.svg
    • -0
    • +1
    ./images/components/icon1.svg
  1. … 12 more files in changeset.
LKC-216 Open TBL monitor instead of regular one from lesson container

Merge remote-tracking branch 'origin/v4.0' into LDEV-5080

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

    • -27
    • +44
    ./includes/javascript/authoring/authoringActivity.js
  1. … 7 more files in changeset.
LDEV-5078 Fix i18n labels in Arrow tag

    • -2
    • +2
    ./authoring/template/tool/assessoption.jsp
    • -2
    • +2
    ./authoring/template/tool/mcoption.jsp
  1. … 50 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

    • -24
    • +29
    ./authoring/template/tbl/tbl.jsp
LDEV-5074 Prevent double submit of TBL template

    • -24
    • +29
    ./authoring/template/tbl/tbl.jsp
Merge remote-tracking branch 'origin/master' into v4.0

LDEV-5071 Fix race condition when opening activity authoring

Merge remote-tracking branch 'origin/master' into v4.0

    • -28
    • +33
    ./includes/javascript/authoring/authoringActivity.js
LDEV-5071 Fix race condition when generating tool content ID

    • -28
    • +33
    ./includes/javascript/authoring/authoringActivity.js
LDEV-5016 Adjust branching shape and colour

An icon inside a circle is still needed.

LDEV-5200 Adjust branching shape and colour

An icon inside a circle is still needed.

LDEV-5016 Reintroduce and improve branch transitions labels

LDEV-5200 Reintroduce and improve branch transitions labels

LDEV-5016 Improve selection of start and end points of transitions

LDEV-5200 Improve selection of start and end points of transitions

LDEV-5200 Improve snapping activities to grid

    • -14
    • +14
    ./includes/javascript/authoring/authoringActivity.js
LDEV-5016 Improve snapping activities to grid

    • -14
    • +14
    ./includes/javascript/authoring/authoringActivity.js
LDEV-5016 Always rotate transition arrow correctly

    • -29
    • +16
    ./includes/javascript/authoring/authoringActivity.js
LDEV-5200 Always rotate transition arrow correctly

    • -29
    • +16
    ./includes/javascript/authoring/authoringActivity.js
LDEV-5200 Adjust transition start dot position

LDEV-5016 Adjust transition start dot position

LDEV-5200 Make transitions to/from branching edges always non-bezier

LDEV-5016 Make transitions to/from branching edges always non-bezier

LDEV-5200 Move authoring colours from JavaScript to CSS

    • -54
    • +22
    ./includes/javascript/authoring/authoringActivity.js
    • -27
    • +14
    ./includes/javascript/authoring/authoringGeneral.js
LDEV-5016 Move authoring colours from JavaScript to CSS

    • -54
    • +22
    ./includes/javascript/authoring/authoringActivity.js
    • -27
    • +14
    ./includes/javascript/authoring/authoringGeneral.js