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

    • -9
    • +24
    ./ApplicationResources_de_DE.properties
    • -5
    • +6
    ./ApplicationResources_el_GR.properties
    • -5
    • +6
    ./ApplicationResources_en_AU.properties
    • -9
    • +10
    ./ApplicationResources_es_ES.properties
    • -7
    • +15
    ./ApplicationResources_fr_FR.properties
    • -0
    • +33
    ./ApplicationResources_ja_JP.properties
    • -9
    • +16
    ./ApplicationResources_no_NO.properties
    • -6
    • +19
    ./ApplicationResources_zh_CN.properties
  1. … 303 more files in changeset.
LDEV-5397 Updating labels Greek, Japanese, German, English

    • -266
    • +23
    ./ApplicationResources_ja_JP.properties
  1. … 11 more files in changeset.
LDEV-5397 Updating labels Greek, Japanese, German, English

    • -276
    • +177
    ./ApplicationResources_de_DE.properties
    • -0
    • +14
    ./ApplicationResources_el_GR.properties
    • -265
    • +249
    ./ApplicationResources_zh_CN.properties
  1. … 29 more files in changeset.
LDEV-5397 Updating labels MCQ

    • -36
    • +52
    ./ApplicationResources.properties
    • -16
    • +19
    ./ApplicationResources_el_GR.properties
    • -35
    • +52
    ./ApplicationResources_en_AU.properties
    • -24
    • +41
    ./ApplicationResources_es_ES.properties
    • -10
    • +64
    ./ApplicationResources_fr_FR.properties
    • -21
    • +31
    ./ApplicationResources_no_NO.properties
LDEV-2975 Fix placeholders in i18n labels

    • -1
    • +1
    ./ApplicationResources_tr_TR.properties
  1. … 1 more file in changeset.
LDEV-5290 Prevent multiple tabs from being open on autosave

  1. … 40 more files in changeset.
LDEV-5138 Set leader only on his activity entry, not on any user entry

    • -1
    • +1
    ./ApplicationResources_en_AU.properties
  1. … 25 more files in changeset.
LDEV-4769 Updating English, Spanish, French, Greek and Norwegian for all active projects

From this commit onwards, we no longer will use the LAMS Community i18n to manage and handle translations.

Instead, we have now migrated to Lokalise (https://lokalise.com/) for managing all i18n projects and translations.

Many thanks Lokalise for your support!!

    • -257
    • +246
    ./ApplicationResources.properties
    • -257
    • +246
    ./ApplicationResources_el_GR.properties
    • -257
    • +246
    ./ApplicationResources_en_AU.properties
    • -257
    • +246
    ./ApplicationResources_es_ES.properties
    • -289
    • +185
    ./ApplicationResources_fr_FR.properties
    • -241
    • +246
    ./ApplicationResources_no_NO.properties
  1. … 166 more files in changeset.
LDEV-4951 Remove traces of MCQ tool from other modules

    • -257
    • +0
    ./ApplicationResources.properties
    • -213
    • +0
    ./ApplicationResources_ar_JO.properties
    • -237
    • +0
    ./ApplicationResources_bg_BG.properties
    • -246
    • +0
    ./ApplicationResources_cy_GB.properties
    • -248
    • +0
    ./ApplicationResources_da_DK.properties
    • -276
    • +0
    ./ApplicationResources_de_DE.properties
    • -257
    • +0
    ./ApplicationResources_el_GR.properties
    • -257
    • +0
    ./ApplicationResources_en_AU.properties
    • -257
    • +0
    ./ApplicationResources_es_ES.properties
    • -275
    • +0
    ./ApplicationResources_es_MX.properties
    • -289
    • +0
    ./ApplicationResources_fr_FR.properties
    • -275
    • +0
    ./ApplicationResources_it_IT.properties
    • -266
    • +0
    ./ApplicationResources_ja_JP.properties
    • -265
    • +0
    ./ApplicationResources_ko_KR.properties
    • -276
    • +0
    ./ApplicationResources_mi_NZ.properties
  1. … 178 more files in changeset.
Merge branch 'master' into develop

# Conflicts:

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

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

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

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    • -2
    • +18
    ./ApplicationResources_en_AU.properties
  1. … 16 more files in changeset.
LDEV-4745 Updating labels

    • -14
    • +16
    ./ApplicationResources.properties
    • -2
    • +18
    ./ApplicationResources_el_GR.properties
    • -13
    • +16
    ./ApplicationResources_en_AU.properties
    • -2
    • +18
    ./ApplicationResources_es_ES.properties
LDEV-4769 updating labels

Updating labels across all modules. Mainly Greek, Norwegian, Español and English

    • -2
    • +18
    ./ApplicationResources_el_GR.properties
    • -2
    • +18
    ./ApplicationResources_en_AU.properties
    • -2
    • +18
    ./ApplicationResources_es_ES.properties
  1. … 62 more files in changeset.
LDEV-4745 adding missing labels to tools

Scratchie, QA, MC and assessment

  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

lams_tool_laqa/web/learning/Notebook.jsp

lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

    • -2
    • +7
    ./ApplicationResources_en_AU.properties
  1. … 10 more files in changeset.
LDEV-4786 Add missing labels

  1. … 2 more files in changeset.
LDEV-4921 Fix a label

LDEV-4921 Introduce MCQ admin page. Allow hiding question titles.

    • -247
    • +253
    ./ApplicationResources.properties
  1. … 10 more files in changeset.
Merge branch 'master' into develop

# Conflicts:

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

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

# 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_laqa/conf/language/lams/ApplicationResources.properties

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    • -2
    • +3
    ./ApplicationResources_en_AU.properties
  1. … 34 more files in changeset.
LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

    • -2
    • +10
    ./ApplicationResources_el_GR.properties
    • -3
    • +5
    ./ApplicationResources_en_AU.properties
    • -3
    • +5
    ./ApplicationResources_es_ES.properties
    • -2
    • +10
    ./ApplicationResources_no_NO.properties
  1. … 118 more files in changeset.
LDEV-4839 Refine import QB questions feature

    • -0
    • +2
    ./ApplicationResources_en_AU.properties
  1. … 9 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

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

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

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

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

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

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

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

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

    • -3
    • +10
    ./ApplicationResources_en_AU.properties
  1. … 53 more files in changeset.
LDEV-4825 Display QB stats in MCQ tool monitoring

    • -241
    • +245
    ./ApplicationResources.properties
  1. … 4 more files in changeset.
LDEV-4818 Add title property to MCQ questions

    • -0
    • +1
    ./ApplicationResources_en_AU.properties
  1. … 35 more files in changeset.
LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

    • -0
    • +1
    ./ApplicationResources_en_AU.properties
  1. … 86 more files in changeset.
LDEV-4739 Updating translations

    • -2
    • +3
    ./ApplicationResources_el_GR.properties
    • -3
    • +4
    ./ApplicationResources_en_AU.properties
    • -3
    • +4
    ./ApplicationResources_es_ES.properties
  1. … 8 more files in changeset.
LDEV-4786 Allow creating learning outcomes on the fly

  1. … 63 more files in changeset.
LDEV-4775 update marks more skillfully after edit in monitor

    • -1
    • +1
    ./ApplicationResources_en_AU.properties
  1. … 13 more files in changeset.
LDEV-4775 update marks more skillfully after edit in monitor

(cherry picked from commit c5920711a0c7a8b4da40893f4d30d2dc26a0fba1)

    • -1
    • +1
    ./ApplicationResources_en_AU.properties
  1. … 13 more files in changeset.
LDEV-4769 Updating Greeek

    • -2
    • +8
    ./ApplicationResources_el_GR.properties
LDEV-4746 Inform author of detected question changes

In MC authoring if a new question or version gets added, the author gets

a pop up displayed.

Further steps are detection of minor changes (update and not create a

new version) and allowing author to choose whether changes are minor or

should lead to new version.

  1. … 6 more files in changeset.