Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-5420' into v4.8

# Conflicts:

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

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

    • -3
    • +3
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5397 Updating labels Greek, Japanese, German, English

    • -4
    • +3
    ./lams/ApplicationResources.properties
    • -0
    • +23
    ./lams/ApplicationResources_el_GR.properties
  1. … 30 more files in changeset.
LDEV-5420 Add print questions page

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

# Conflicts:

# lams_common/db/sql/insert_lams_config_data.sql

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

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Merge remote-tracking branch 'origin/LDEV-5397' into v4.8

    • -3
    • +4
    ./lams/ApplicationResources.properties
  1. … 9 more files in changeset.
LDEV-5397 Updating labels

    • -6
    • +7
    ./lams/ApplicationResources.properties
    • -0
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +4
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +2
    ./lams/ApplicationResources_fr_FR.properties
    • -0
    • +2
    ./lams/ApplicationResources_it_IT.properties
    • -0
    • +2
    ./lams/ApplicationResources_ja_JP.properties
    • -0
    • +2
    ./lams/ApplicationResources_no_NO.properties
  1. … 9 more files in changeset.
LDEV-5363 Make RAT questions sync optional

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

# Conflicts:

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

# lams_tool_assessment/web/pages/learning/learning.jsp

    • -4
    • +6
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-5432 Confirm with learner whether he wants to submit answers

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5430 Allow shuffling all questions' answers in Assessment

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
LDEV-5397 Updating labels

    • -0
    • +5
    ./lams/ApplicationResources.properties
    • -0
    • +5
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +5
    ./lams/ApplicationResources_es_ES.properties
  1. … 84 more files in changeset.
LDEV-5345 Adding and modifying labels based on changes for bootstrap 5

    • -2
    • +21
    ./lams/ApplicationResources.properties
    • -0
    • +17
    ./lams/ApplicationResources_de_DE.properties
    • -4
    • +8
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +21
    ./lams/ApplicationResources_en_AU.properties
    • -3
    • +22
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +19
    ./lams/ApplicationResources_fr_FR.properties
    • -3
    • +19
    ./lams/ApplicationResources_it_IT.properties
    • -0
    • +6
    ./lams/ApplicationResources_ja_JP.properties
    • -2
    • +18
    ./lams/ApplicationResources_no_NO.properties
    • -2
    • +6
    ./lams/ApplicationResources_zh_CN.properties
  1. … 238 more files in changeset.
LDEV-5345 Adding and updating latest translations

    • -0
    • +2
    ./lams/ApplicationResources_de_DE.properties
  1. … 42 more files in changeset.
LDEV-5345 Updating Italian

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

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_de_DE.properties
    • -0
    • +3
    ./lams/ApplicationResources_el_GR.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
  1. … 32 more files in changeset.
LDEV-5408 Arranging button and labels

    • -2
    • +2
    ./lams/ApplicationResources.properties
  1. … 4 more files in changeset.
Merge branch 'LDEV-5408' into v4.7

# Conflicts:

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

    • -1
    • +2
    ./lams/ApplicationResources.properties
LDEV-5408 Add Extra Information buttons on RAT and AE tabs in monitoring

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

    • -0
    • +3
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_de_DE.properties
    • -2
    • +2
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./lams/ApplicationResources_fr_FR.properties
    • -6
    • +9
    ./lams/ApplicationResources_it_IT.properties
    • -0
    • +1
    ./lams/ApplicationResources_ja_JP.properties
    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
    • -0
    • +1
    ./lams/ApplicationResources_zh_CN.properties
  1. … 56 more files in changeset.
Merge branch 'LAI-5' into v4.7

# Conflicts:

# lams_central/web/authoring/authoring.jsp

# lams_central/web/qb/collection.jsp

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

    • -1
    • +17
    ./lams/ApplicationResources_de_DE.properties
    • -3
    • +3
    ./lams/ApplicationResources_el_GR.properties
    • -4
    • +20
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +15
    ./lams/ApplicationResources_fr_FR.properties
    • -3
    • +5
    ./lams/ApplicationResources_it_IT.properties
    • -1
    • +17
    ./lams/ApplicationResources_ja_JP.properties
    • -4
    • +5
    ./lams/ApplicationResources_no_NO.properties
    • -1
    • +2
    ./lams/ApplicationResources_zh_CN.properties
  1. … 118 more files in changeset.
LDEV-5345 Adding and updating latest translations

    • -0
    • +1
    ./lams/ApplicationResources_de_DE.properties
    • -0
    • +1
    ./lams/ApplicationResources_fr_FR.properties
    • -0
    • +1
    ./lams/ApplicationResources_it_IT.properties
    • -0
    • +1
    ./lams/ApplicationResources_ja_JP.properties
  1. … 29 more files in changeset.
LDEV-5345 Adding and updating latest translations

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +4
    ./lams/ApplicationResources_de_DE.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +5
    ./lams/ApplicationResources_fr_FR.properties
    • -3
    • +3
    ./lams/ApplicationResources_it_IT.properties
    • -0
    • +4
    ./lams/ApplicationResources_ja_JP.properties
  1. … 194 more files in changeset.
Merge branch 'v4.7' into LAI-5

# Conflicts:

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

    • -7
    • +29
    ./lams/ApplicationResources_el_GR.properties
  1. … 1 more file in changeset.
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

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -3
    • +4
    ./lams/ApplicationResources_de_DE.properties
    • -3
    • +3
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
    • -3
    • +2
    ./lams/ApplicationResources_es_ES.properties
    • -2
    • +3
    ./lams/ApplicationResources_fr_FR.properties
    • -0
    • +453
    ./lams/ApplicationResources_it_IT.properties
    • -4
    • +5
    ./lams/ApplicationResources_ja_JP.properties
    • -4
    • +3
    ./lams/ApplicationResources_no_NO.properties
    • -2
    • +1
    ./lams/ApplicationResources_zh_CN.properties
  1. … 220 more files in changeset.
LAI-5 Add more Greek i18n labels

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

    • -25
    • +21
    ./lams/ApplicationResources.properties
    • -3
    • +25
    ./lams/ApplicationResources_el_GR.properties
    • -25
    • +21
    ./lams/ApplicationResources_en_AU.properties
    • -4
    • +9
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +7
    ./lams/ApplicationResources_fr_FR.properties
    • -3
    • +0
    ./lams/ApplicationResources_ja_JP.properties
    • -1
    • +1
    ./lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    ./lams/ApplicationResources_zh_CN.properties
  1. … 170 more files in changeset.
LDEV-5401 Add learner-triggered absolute time limit authoring and learning

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

    • -2
    • +2
    ./lams/ApplicationResources.properties
LAI-3 Updating label

    • -2
    • +2
    ./lams/ApplicationResources.properties
LDEV-5373 Display groups' choices always for grouped Assessments

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.