Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5101 Add stats button to each question in Scratchie

Also align icons better.

LDEV-5101 Avoid name clash between bootstrap and jQuery UI

LDEV-5101 Ui changes

LDEV-5101 Add labels

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

LDEV-5101 Check if other activities require question version upgrade

LDEV-5101 Allow easy change of question version in Scratchie

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

  1. … 13 more files in changeset.
LDEV-5108 Adding MS Word to scratchie

LDEV-4880 Do not show debug information on missing confidence level

    • -1
    • +2
    ./learning/parts/confidenceLevelPortrait.jsp
LDEV-5020 Prevent "Show options" link from going to top of page

    • -6
    • +13
    ./tblmonitoring/burningQuestions.jsp
LDEV-5091 Initialise Etherpads on Discussion panel expand

  1. … 35 more files in changeset.
LDEV-5089 Prevent scratching until Ajax response is received

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/master' into v4.0

  1. … 1 more file in changeset.
LDEV-5022 Fix line breaks when multiple editing Burning Questions

LDEV-5066 Do not show unconfigured Etherpad option in Scratchie

  1. … 1 more file 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. … 24 more files in changeset.
LDEV-4917 Add Uppy file uploads to QTI question import

  1. … 6 more files in changeset.
LDEV-5061 remove duplicate shuffle items option 4a9a06a

LDEV-5061 remove duplicate shuffle items option

LDEV-5050 Move "is required" attribute from QB question to tools

  1. … 27 more files in changeset.
LDEV-5032 Make a checkbox depend on a another checkbox being checked

LDEV-4886 Automated tests for v4.0

  1. … 19 more files in changeset.
LDEV-5032 Add anonymous confidence levels in Scratchie

    • -2
    • +2
    ./learning/parts/confidenceLevelPortrait.jsp
  1. … 3 more files in changeset.
LDEV-5020 Adding spacing between question and answers

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

Conflicts:

lams_tool_scratchie/web/pages/learning/results.jsp

  1. … 1 more file in changeset.
LDEV-5022 Make burning questions paragraphs work with jqGrid editing

  1. … 1 more file in changeset.