Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LAI-8 Add Case Based Learning AI wizard

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into SP-9

# Conflicts:

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_monitoring/web/includes/javascript/monitorLesson.js

# lams_tool_assessment/web/pages/monitoring/summary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp

    • -10
    • +25
    ./lams/ApplicationResources.properties
  1. … 9 more files in changeset.
LDEV-5345 Updating translations

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./lams/ApplicationResources_fr_FR.properties
    • -0
    • +1
    ./lams/ApplicationResources_it_IT.properties
    • -0
    • +2
    ./lams/ApplicationResources_ja_JP.properties
  1. … 2 more files in changeset.
LAI-7 Send consistent question format back to AI

For LAMS needs we use Question class, but AI should be fed with existing RAT questions using the same format we expect from it.

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-5345 Updating translations

    • -3
    • +4
    ./lams/ApplicationResources.properties
    • -1
    • +3
    ./lams/ApplicationResources_de_DE.properties
    • -1
    • +3
    ./lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +3
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +3
    ./lams/ApplicationResources_fr_FR.properties
    • -2
    • +5
    ./lams/ApplicationResources_it_IT.properties
    • -1
    • +3
    ./lams/ApplicationResources_ja_JP.properties
    • -1
    • +3
    ./lams/ApplicationResources_no_NO.properties
    • -1
    • +3
    ./lams/ApplicationResources_zh_CN.properties
  1. … 29 more files in changeset.
LDEV-5337 Inform which learners were skipped during grouping upload

    • -2
    • +3
    ./lams/ApplicationResources.properties
    • -2
    • +4
    ./lams/ApplicationResources_en_AU.properties
  1. … 5 more files in changeset.
LDEV-5345 Adjust language labels

    • -3
    • +3
    ./lams/ApplicationResources_it_IT.properties
  1. … 1 more file in changeset.
LDEV-5345 Adding and updating latest translations

    • -10
    • +8
    ./lams/ApplicationResources.properties
    • -2
    • +0
    ./lams/ApplicationResources_de_DE.properties
    • -2
    • +8
    ./lams/ApplicationResources_el_GR.properties
    • -3
    • +14
    ./lams/ApplicationResources_en_AU.properties
    • -3
    • +14
    ./lams/ApplicationResources_es_ES.properties
    • -2
    • +0
    ./lams/ApplicationResources_fr_FR.properties
    • -29
    • +36
    ./lams/ApplicationResources_it_IT.properties
    • -2
    • +5
    ./lams/ApplicationResources_ja_JP.properties
    • -2
    • +0
    ./lams/ApplicationResources_no_NO.properties
    • -2
    • +5
    ./lams/ApplicationResources_zh_CN.properties
  1. … 56 more files in changeset.
LDEV-5337 Add "return to monitoring button" to Team Setup screen

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-5337 Add "return to monitoring button" to Team Setup screen

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
Merge branch 'LAI-5' into v4.7

# Conflicts:

# lams_central/web/authoring/authoring.jsp

# lams_central/web/qb/collection.jsp

    • -0
    • +13
    ./lams/ApplicationResources.properties
  1. … 4 more files in changeset.
LAI-5 Add OpenAI MCQ generation to Question Bank collection screen

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
SP-9 Add basic classes and entry point on index page

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 4 more files in changeset.
LDEV-5345 Adding and updating latest translations

    • -0
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +7
    ./lams/ApplicationResources_de_DE.properties
    • -1
    • +3
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
    • -4
    • +6
    ./lams/ApplicationResources_es_ES.properties
    • -2
    • +9
    ./lams/ApplicationResources_fr_FR.properties
    • -3
    • +9
    ./lams/ApplicationResources_it_IT.properties
    • -1
    • +8
    ./lams/ApplicationResources_ja_JP.properties
    • -2
    • +4
    ./lams/ApplicationResources_no_NO.properties
    • -1
    • +3
    ./lams/ApplicationResources_zh_CN.properties
  1. … 116 more files in changeset.
LDEV-5345 fixed CRs in translations (central)

    • -6
    • +4
    ./lams/ApplicationResources.properties
    • -3
    • +1
    ./lams/ApplicationResources_de_DE.properties
    • -4
    • +2
    ./lams/ApplicationResources_el_GR.properties
    • -6
    • +4
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +0
    ./lams/ApplicationResources_es_ES.properties
    • -4
    • +2
    ./lams/ApplicationResources_fr_FR.properties
    • -6
    • +4
    ./lams/ApplicationResources_it_IT.properties
    • -4
    • +2
    ./lams/ApplicationResources_ja_JP.properties
    • -4
    • +2
    ./lams/ApplicationResources_no_NO.properties
    • -6
    • +4
    ./lams/ApplicationResources_zh_CN.properties
LDEV-5345 Adding and updating latest translations

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -0
    • +790
    ./lams/ApplicationResources_de_DE.properties
    • -3
    • +22
    ./lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -6
    • +7
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +744
    ./lams/ApplicationResources_fr_FR.properties
    • -5
    • +731
    ./lams/ApplicationResources_it_IT.properties
    • -275
    • +840
    ./lams/ApplicationResources_ja_JP.properties
    • -4
    • +17
    ./lams/ApplicationResources_no_NO.properties
    • -5
    • +20
    ./lams/ApplicationResources_zh_CN.properties
  1. … 23 more files in changeset.
LDEV-5345 Adding and updating latest translations

    • -7
    • +6
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./lams/ApplicationResources_fr_FR.properties
    • -0
    • +141
    ./lams/ApplicationResources_it_IT.properties
    • -6
    • +6
    ./lams/ApplicationResources_no_NO.properties
    • -4
    • +4
    ./lams/ApplicationResources_zh_CN.properties
  1. … 194 more files in changeset.
LAI-5 Add Bloom's taxonomy level info in MCQ generate in Assessment

    • -0
    • +9
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
Merge branch 'v4.7' into LAI-5

# Conflicts:

# lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties

    • -7
    • +6
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LAI-5 Add more Greek i18n labels

    • -0
    • +2
    ./lams/ApplicationResources_el_GR.properties
LDEV-5345 Adding and updating latest translations

Big refactoring of labels in Lokalise. Redundant keys for tools are not all based out of lams_noticeboard to ensure that most reused labels have a single reference point.

Added Italian for a whole lot of tools -including monitor and assessment

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +15
    ./lams/ApplicationResources_it_IT.properties
  1. … 227 more files in changeset.
LDEV-5345 Adding and updating latest translations

    • -7
    • +6
    ./lams/ApplicationResources.properties
    • -2
    • +2
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +7
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +6
    ./lams/ApplicationResources_es_ES.properties
    • -313
    • +236
    ./lams/ApplicationResources_it_IT.properties
  1. … 173 more files in changeset.
Merge branch 'v4.7' into LAI-5

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 14 more files in changeset.
LAI-6 Allow generating more questions with same prompt as before

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LAI-5 Add menu item in authoring to open AI wizard

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

# Conflicts:

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_tool_assessment/lams_tool_assessment.eml

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

    • -1
    • +4
    ./lams/ApplicationResources.properties
  1. … 10 more files in changeset.
Merge branch 'LDEV-5398' into v4.6

    • -0
    • +2
    ./lams/ApplicationResources.properties
LDEV-5121 Allow choosing QB collection in TBL wizard

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 8 more files in changeset.
LDEV-5398 Allow creating new QB collections on the fly

    • -1
    • +3
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.