Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5076 Align TBL terminology

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -2
    • +2
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    ./lams/ApplicationResources_no_NO.properties
  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
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 36 more files in changeset.
Updating labels Spanish, English, French, Norwegian

    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 41 more files in changeset.
LDEV-4769 Updating Spanish

Also removing a deprecated label

    • -3
    • +3
    ./lams/ApplicationResources_es_ES.properties
  1. … 22 more files in changeset.
LDEV-4769 Updating Spanish, Greek, French, Norwegian

    • -0
    • +1
    ./lams/ApplicationResources.properties
    • -9
    • +14
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +6
    ./lams/ApplicationResources_no_NO.properties
  1. … 17 more files in changeset.
LDEV-4769 Updating labels

Adding missing labels in Spanish, English

Adding translations for Zoom (Norwegian, Spanish)

    • -2
    • +5
    ./lams/ApplicationResources.properties
    • -1
    • +0
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +5
    ./lams/ApplicationResources_en_AU.properties
    • -13
    • +22
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./lams/ApplicationResources_no_NO.properties
  1. … 9 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!!

    • -275
    • +262
    ./lams/ApplicationResources.properties
    • -271
    • +262
    ./lams/ApplicationResources_el_GR.properties
    • -270
    • +262
    ./lams/ApplicationResources_en_AU.properties
    • -242
    • +256
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +7
    ./lams/ApplicationResources_fr_FR.properties
    • -271
    • +262
    ./lams/ApplicationResources_no_NO.properties
  1. … 166 more files in changeset.
LDEV-5050 Move "is required" attribute from QB question to tools

    • -1
    • +0
    ./lams/ApplicationResources.properties
    • -1
    • +0
    ./lams/ApplicationResources_en_AU.properties
  1. … 28 more files in changeset.
LDEV-5032 Add anonymous confidence levels in Scratchie

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/includes/javascript/openUrls.js

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql

lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

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

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

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

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

lams_tool_assessment/web/pages/learning/learning.jsp

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

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql

lams_tool_lamc/web/tblmonitoring/mcq.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

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

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

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

lams_tool_scratchie/web/pages/learning/scratchies.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

lams_www/web/news.html

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

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-5020 Show question options in burning question in TBL monitor

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5002 changes in labels

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5002 changes in labels

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5002 Add question Etherpads in Scratchie

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag

lams_tool_scratchie/web/pages/learning/scratchies.jsp

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 12 more files in changeset.
LDEV-5002 Add question Etherpads in Scratchie

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 12 more files in changeset.
LDEV-4992 Display all learners in group in Scratchie monitoring summary

Mark ones who reached the activity.

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-4992 Show all learners in Scratchie monitoring summary

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 4 more files in changeset.
LDEV-4993 Redesign Scratchie monitoring summary tab

    • -1
    • +0
    ./lams/ApplicationResources.properties
  1. … 8 more files in changeset.
LDEV-4987 Show score by each Scratchie in results. Show negative percent

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 7 more files in changeset.
LDEV-4986 Updating labels

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -3
    • +3
    ./lams/ApplicationResources_en_AU.properties
LDEV-4769 Updating Greek and Norwegian

    • -2
    • +18
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +37
    ./lams/ApplicationResources_no_NO.properties
LDEV-4739 Updating Greek and Norwegian

    • -2
    • +18
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +37
    ./lams/ApplicationResources_no_NO.properties
LDEV-4986 Updating labels

    • -6
    • +22
    ./lams/ApplicationResources.properties
    • -6
    • +22
    ./lams/ApplicationResources_en_AU.properties
LDEV-4986 Lowest score (not zero) is default for unravelled question

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-4745 LDEV-4875 Adding/updating labels

Adding and updating labels for QB and VSAs for LAMS v4.0

    • -4
    • +20
    ./lams/ApplicationResources.properties
    • -4
    • +20
    ./lams/ApplicationResources_en_AU.properties
  1. … 4 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
    • +15
    ./lams/ApplicationResources.properties
  1. … 17 more files in changeset.
LDEV-4745 adding new labels

    • -15
    • +17
    ./lams/ApplicationResources.properties
    • -3
    • +21
    ./lams/ApplicationResources_el_GR.properties
    • -12
    • +17
    ./lams/ApplicationResources_en_AU.properties
LDEV-4769 updating labels

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

    • -2
    • +15
    ./lams/ApplicationResources.properties
    • -2
    • +21
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +15
    ./lams/ApplicationResources_en_AU.properties
  1. … 63 more files in changeset.
LDEV-4745 adding missing labels to tools

Scratchie, QA, MC and assessment

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