Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LKC-216 Remove obsolete test code

LDEV-5095 Add latest chart.js to the project

We already use an old version of this library in other places in LAMS.

LDEV-5083 Add latest version of chart.js

Existing version used in other places in LAMS stays unchanged for now.

  1. … 1 more file in changeset.
LDEV-5080 Upgrade Boostrap Select to the latest version 1.13.14

    • -0
    • +9
    ./bootstrap-select.min5.js
  1. … 1 more file in changeset.
LDEV-5016 Update bootstrap to the latest version 4.5.2

  1. … 1 more file in changeset.
LDEV-5016 Update bootstrap to the latest version 4.5.2

Conflicts:

lams_central/web/css/bootstrap4.min.css

lams_central/web/includes/javascript/bootstrap4.bundle.min.js

    • -0
    • +7
    ./bootstrap4.bundle.min.js
  1. … 1 more file in changeset.
LDEV-5080 Use redesigned dummy tool authoring template in Assessment

    • -0
    • +7
    ./bootstrap4.bundle.min.js
  1. … 26 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
    ./authoring/authoringActivity.js
  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

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

    • -28
    • +33
    ./authoring/authoringActivity.js
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

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

LDEV-5200 Improve snapping activities to grid

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

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

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

    • -29
    • +16
    ./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
    ./authoring/authoringActivity.js
  1. … 1 more file in changeset.
LDEV-5016 Move authoring colours from JavaScript to CSS

    • -54
    • +22
    ./authoring/authoringActivity.js
  1. … 1 more file in changeset.
LDEV-5016 Adjust activity size. Add banner.

    • -10
    • +30
    ./authoring/authoringActivity.js