Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5397 Updating all i18n labels

    • -12
    • +43
    ./lams/ApplicationResources.properties
    • -8
    • +45
    ./lams/ApplicationResources_de_DE.properties
    • -15
    • +41
    ./lams/ApplicationResources_el_GR.properties
    • -11
    • +43
    ./lams/ApplicationResources_en_AU.properties
    • -21
    • +54
    ./lams/ApplicationResources_es_ES.properties
    • -8
    • +38
    ./lams/ApplicationResources_fr_FR.properties
    • -9
    • +30
    ./lams/ApplicationResources_it_IT.properties
    • -5
    • +58
    ./lams/ApplicationResources_ja_JP.properties
    • -9
    • +32
    ./lams/ApplicationResources_no_NO.properties
    • -0
    • +518
    ./lams/ApplicationResources_pt_PT.properties
    • -7
    • +34
    ./lams/ApplicationResources_zh_CN.properties
  1. … 301 more files in changeset.
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

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

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

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

# lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

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

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

    • -0
    • +4
    ./lams/ApplicationResources_en_AU.properties
  1. … 30 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

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

# lams_tool_scratchie/web/pages/authoring/authoring.jsp

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 5 more files in changeset.
LDEV-5397 Updating labels Greek, English

    • -0
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 3 more files in changeset.
LDEV-5453 Add section information to Assessment export

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5397 Updating labels Greek, Spanish

    • -0
    • +3
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    ./lams/ApplicationResources_es_ES.properties
  1. … 5 more files in changeset.
LDEV-5397 Updating labels Greek, Spanish, English

    • -2
    • +4
    ./lams/ApplicationResources.properties
    • -3
    • +4
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    ./lams/ApplicationResources_en_AU.properties
  1. … 17 more files in changeset.
LDEV-5449 Add "allow answer rating" option in authoring

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
LDEV-5424 bootstrap5 Assessment's monitoring

    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 27 more files in changeset.
LDEV-5397 Updating labels Greek, Japanese, German, English

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

# Conflicts:

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

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_lamc/web/learning/AnswersContent.jsp

# lams_tool_laqa/web/learning/AnswersContent.jsp

# lams_tool_scratchie/web/pages/learning/learning.jsp

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 138 more files in changeset.
LDEV-5360 Indicate auto-graded answers

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 5 more files in changeset.
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.