Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-3115 Remove grouping/input references on activity remove

    • -10
    • +12
    ./authoring/authoringActivity.js
LDEV-4909 Allow grouping not being connected to support activity

LDEV-3115 Check range conditions correctly

  1. … 2 more files in changeset.
LDEV-5103 Make Authoring dialog wider to accommodate QB button

LDEV-5139 Fix parameter passing when opening Notifications dialog

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

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

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

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/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/model/McUsrAttempt.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/WEB-INF/tags/CKEditor.tag

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

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

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

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

    • -27
    • +44
    ./authoring/authoringActivity.js
  1. … 27 more files in changeset.
LDEV-5113 Introduce manual grading tool output

  1. … 4 more files in changeset.
LDEV-5101 Allow applying new question version to other activities in LD

  1. … 13 more files in changeset.
LDEV-5103 Add Question Bank button to authoring

  1. … 1 more file in changeset.
LDEV-5200 Add CSS style to SVG file so LD thumbnail displays correctly

  1. … 4 more files in changeset.
LDEV-5016 Add CSS style to SVG file so LD thumbnail displays correctly

  1. … 4 more files in changeset.
LDEV-5016 Add CSS style to SVG file so LD thumbnail displays correctly

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