Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_scratchie/web/pages/authoring/authoring.jsp

  1. … 5 more files in changeset.
LDEV-5452 Allow changing question version in live Assessment and Scratchie

Also fix existing learners' answers rewiring.

  1. … 8 more files in changeset.
LDEV-5420 Add questions print button to Scratchie

  1. … 2 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 519 more files in changeset.
LDEV-5363 Make RAT questions sync optional

  1. … 11 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Scratchie

  1. … 7 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 338 more files in changeset.
LDEV-5401 Add learner-triggered absolute timer to other tools

  1. … 42 more files in changeset.
LDEV-5398 Allow adding QB collections on the fly in other parts of authoring

  1. … 10 more files in changeset.
LDEV-5361 Add "require all answers" setting to Scratchie

  1. … 4 more files in changeset.
LDEV-5257 Remove outdated jQuery UI slider widget

WEB-008

It is a part of jQuery UI bundle anyway.

  1. … 2 more files in changeset.
LDEV-5324 Do not call missing function on validation success

  1. … 3 more files in changeset.
LDEV-5307 Allow exact matching of VSAs

  1. … 16 more files in changeset.
LDEV-5291 Allow filtering question in QB search by presence in LD

  1. … 11 more files in changeset.
LDEV-5250 Remove Pedagogical Planner integration with core LAMS

  1. … 67 more files in changeset.
LDEV-4950 Remove obsolete ordering arrows in Scratchie authoring

LDEV-5230 Remove obsolete "add extra point" option from Scratchie

  1. … 9 more files in changeset.
LDEV-5208: adding labels and tooltip in author

  1. … 5 more files in changeset.
LDEV-5208 Add Scratchie option to turn discussion widget on/off

  1. … 4 more files in changeset.
LDEV-5188 Remove obsolete attributes from TabBody tag

  1. … 83 more files in changeset.
LDEV-5185 Introduce absolute time limit and adjustments to Scratchie

  1. … 7 more files in changeset.
LDEV-5179 Add mark hedging question type support to Scratchie

  1. … 8 more files in changeset.
LDEV-5176 Adding contextual help and small layout changes

  1. … 5 more files in changeset.
LDEV-5101 Fix stats link.

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

  1. … 28 more files in changeset.
LDEV-5136 labels and tooltips

  1. … 2 more files in changeset.
LDEV-5136 Enable double click revealing in Scratchie

  1. … 5 more files in changeset.
Merge branch 'LDEV-5101' into v4.0

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

  1. … 8 more files in changeset.
LDEV-5108 Oopps.. forgot to remove old IMS QTI link

LDEV-5114 Add "Save as new version" button to Scratchie

  1. … 2 more files in changeset.