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

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

LDEV-5071 Fix race condition when generating tool content ID

LDEV-5016 Adjust branching shape and colour

An icon inside a circle is still needed.

  1. … 1 more file in changeset.
LDEV-5200 Adjust branching shape and colour

An icon inside a circle is still needed.

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

    • -0
    • +1
    ./javascript/authoring/authoringGeneral.js
LDEV-5200 Improve selection of start and end points of transitions

    • -0
    • +1
    ./javascript/authoring/authoringGeneral.js
LDEV-5200 Improve snapping activities to grid

    • -5
    • +11
    ./javascript/authoring/authoringGeneral.js
    • -7
    • +3
    ./javascript/authoring/authoringHandler.js
LDEV-5016 Improve snapping activities to grid

    • -5
    • +11
    ./javascript/authoring/authoringGeneral.js
    • -7
    • +3
    ./javascript/authoring/authoringHandler.js
LDEV-5016 Always rotate transition arrow correctly

LDEV-5200 Always rotate transition arrow correctly

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

    • -27
    • +14
    ./javascript/authoring/authoringGeneral.js
    • -9
    • +5
    ./javascript/authoring/authoringHandler.js
  1. … 1 more file in changeset.
LDEV-5016 Move authoring colours from JavaScript to CSS

    • -27
    • +14
    ./javascript/authoring/authoringGeneral.js
    • -9
    • +5
    ./javascript/authoring/authoringHandler.js
  1. … 1 more file in changeset.
LDEV-5016 Adjust activity size. Add banner.

    • -2
    • +7
    ./javascript/authoring/authoringGeneral.js
LDEV-5200 Adjust activity size. Add banner.

    • -2
    • +7
    ./javascript/authoring/authoringGeneral.js
LDEV-5016 Draw arrows on transitions in authoring

    • -0
    • +2
    ./javascript/authoring/authoringGeneral.js
LDEV-5200 Draw arrows on transitions in authoring

    • -0
    • +2
    ./javascript/authoring/authoringGeneral.js
LDEV-5200 Fix transition drawing on drag and grouping effect adjustment

    • -1
    • +6
    ./javascript/authoring/authoringHandler.js
LDEV-5016 Fix transition drawing on drag and grouping effect adjustment

    • -1
    • +6
    ./javascript/authoring/authoringHandler.js
LDEV-5016 Draw lighter activity boxes in authoring

LDEV-5200 Draw lighter activity boxes in authoring