lams_tool_scratchie

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4769 Updating Greek

  1. … 2 more files in changeset.
LDEV-4769 Updating Greek

  1. … 6 more files in changeset.
LDEV-5091 Initialise Etherpads on Discussion panel expand

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

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

  1. … 31 more files in changeset.
LDEV-5085 Run CKEditor initialisation immediately

If CKEditor.tag is loaded dynamically, binding it to page load event

does not work.

  1. … 31 more files in changeset.
LDEV-4425 Do not escape user names. Add padding to portrait.

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

  1. … 31 more files in changeset.
LDEV-5085 Make editor init method parametrized

It seems that multiple instances of CKEditor tag were interacting with

each other, probably with request attributes. Now initialisation method

is parametrised so CKEditor starts with own set of attributes.

  1. … 31 more files in changeset.
LDEV-4769 Updating labels Green, Norwegian, English

  1. … 4 more files in changeset.
LDEV-4745 Use correct Set class in Scratchie on TBL sequence create

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
    • +1
    ./web/pages/authoring/parts/itemlist.jsp
  1. … 6 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

    • -2
    • +2
    ./web/pages/authoring/parts/itemlist.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/optionlist.jsp
  1. … 2 more files in changeset.
LDEV-5078 Fix i18n labels in Arrow tag

    • -2
    • +2
    ./web/pages/authoring/parts/answerlist.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/itemlist.jsp
  1. … 50 more files in changeset.
LDEV-4745 Sort QB questions using display order when fetching from DB

  1. … 2 more files in changeset.
LKC-236 Return questions replaced in tool for further processing

  1. … 3 more files in changeset.
LDEV-5076 Align TBL terminology

  1. … 9 more files in changeset.
Updating translations English, Greek, German and Norwegian

Added German to Lokalise. All labels are the same but the output file format is slightly different.

  1. … 36 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

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
    • +1
    ./web/pages/authoring/parts/itemlist.jsp
  1. … 23 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-5058 Allow tool adding both on fresh build and afterwards

As a column got removed from a LAMS core table, we need to make sure

that all scenarios work well: an upgrade from previous version, a fresh

build and adding extra tools afterwards.

  1. … 41 more files in changeset.
Updating labels Spanish, English, French, Norwegian

  1. … 41 more files in changeset.
LDEV-4769 Updating Spanish

Also removing a deprecated label

  1. … 22 more files in changeset.
LDEV-4769 Updating Spanish, Greek, French, Norwegian

  1. … 17 more files in changeset.
LDEV-4769 Updating labels

Adding missing labels in Spanish, English

Adding translations for Zoom (Norwegian, Spanish)

  1. … 9 more files in changeset.