Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5363 Make RAT questions sync optional

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

- Scratchie

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

  1. … 338 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-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-4950 Remove obsolete ordering arrows in Scratchie authoring

LDEV-5179 Add mark hedging question type support to Scratchie

  1. … 9 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. … 29 more files in changeset.
Merge branch 'LDEV-5101' into v4.0

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

  1. … 9 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.
LDEV-5101 Enhacing tooltips

LDEV-5101 Add stats button to each question in Scratchie

Also align icons better.

  1. … 1 more file in changeset.
LDEV-5101 Avoid name clash between bootstrap and jQuery UI

  1. … 1 more file in changeset.
LDEV-5101 Ui changes

  1. … 1 more file in changeset.
LDEV-5101 Add labels

  1. … 1 more file in changeset.
LDEV-5101 Add links to question version stats page

  1. … 2 more files in changeset.
LDEV-5101 Check if other activities require question version upgrade

  1. … 1 more file in changeset.
LDEV-5101 Allow easy change of question version in Scratchie

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

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

Conflicts:

lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp

lams_tool_laqa/web/authoring/itemlist.jsp

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

  1. … 2 more files in changeset.
LDEV-5078 Fix i18n labels in Arrow tag

  1. … 51 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

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/questions/questionFile.jsp

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

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

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

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

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

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

  1. … 25 more files in changeset.
LDEV-5050 Move "is required" attribute from QB question to tools

  1. … 29 more files in changeset.
LDEV-4886 Automated tests for v4.0

  1. … 19 more files in changeset.
LDEV-4998, LDEV-4941 Fix public question editing for Q&A and Scratchie

  1. … 3 more files in changeset.