Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5101 Allow applying new question version to other activities in LD

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 13 more files in changeset.
LDEV-4949 LDEV-5106 LDEV-5107 LDEV-5108 Adding/updating labels

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_de_DE.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +2
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./lams/ApplicationResources_fr_FR.properties
    • -1
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 14 more files in changeset.
LDEV-4769 Updating Greek

    • -4
    • +6
    ./lams/ApplicationResources_el_GR.properties
  1. … 4 more files in changeset.
LDEV-5106 Adding MS Word question import to TBL Template

    • -0
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 2 more files in changeset.
LDEV-4949 Updating labels for Greek and Norwegian

    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    ./lams/ApplicationResources_no_NO.properties
LDEV-4769 Updating Greek, Norwegian

    • -0
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
LDEV-4949 Updating labels

    • -3
    • +6
    ./lams/ApplicationResources.properties
    • -3
    • +6
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +5
    ./lams/ApplicationResources_es_ES.properties
LDEV-4769 Updating English, Spanish, Norwegian

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -4
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 9 more files in changeset.
LDEV-4769 Updating Greek

    • -6
    • +6
    ./lams/ApplicationResources_el_GR.properties
  1. … 2 more files in changeset.
LDEV-4769 Updating Greek

    • -2
    • +2
    ./lams/ApplicationResources_el_GR.properties
  1. … 6 more files in changeset.
LDEV-4769 Updating labels Green, Norwegian, English

    • -5
    • +5
    ./lams/ApplicationResources_el_GR.properties
  1. … 8 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into LDEV-5080

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

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

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 7 more files in changeset.
LDEV-5076 Align TBL terminology

  1. … 12 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.

    • -20
    • +0
    ./lams/ApplicationResources.properties
    • -313
    • +235
    ./lams/ApplicationResources_de_DE.properties
    • -1
    • +2
    ./lams/ApplicationResources_el_GR.properties
  1. … 38 more files in changeset.
LKC-213 Reintroduce labels for Workflow Automation in Question Bank

    • -0
    • +20
    ./lams/ApplicationResources.properties
LDEV-4769 Updating English, Spanish, Greek and Norwegian labels

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +14
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 10 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

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_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

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

lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

    • -1066
    • +1076
    ./lams/ApplicationResources_en_AU.properties
  1. … 25 more files in changeset.
LDEV-4917 Add error pop up on attempt of uploading incorrect file

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 10 more files in changeset.
LDEV-4769 Updating English , Spanish, Norwegian

    • -1
    • +14
    ./lams/ApplicationResources_no_NO.properties
  1. … 5 more files in changeset.
LDEV-4769 Updating Spanish

    • -2
    • +2
    ./lams/ApplicationResources_es_ES.properties
LDEV-4769 Updating Spanish, Greek, French, Norwegian

    • -2
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +0
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -11
    • +10
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./lams/ApplicationResources_no_NO.properties
  1. … 40 more files in changeset.
LDEV-4769 Updating Spanish, Norwegian

    • -14
    • +14
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +14
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +14
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 6 more files in changeset.
LDEV-5059 Add missing labels for Question Bank

    • -0
    • +13
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
Updating labels Spanish, English, French, Norwegian

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

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

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./lams/ApplicationResources_no_NO.properties
LDEV-4769 Updating Spanish

Also removing a deprecated label

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +6
    ./lams/ApplicationResources_es_ES.properties
  1. … 20 more files in changeset.
LDEV-4769 Updating Spanish, Greek, French, Norwegian

    • -38
    • +38
    ./lams/ApplicationResources_es_ES.properties
  1. … 21 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!!

    • -1089
    • +1062
    ./lams/ApplicationResources.properties
    • -1066
    • +1063
    ./lams/ApplicationResources_el_GR.properties
    • -1066
    • +1063
    ./lams/ApplicationResources_en_AU.properties
    • -835
    • +1005
    ./lams/ApplicationResources_es_ES.properties
    • -313
    • +320
    ./lams/ApplicationResources_fr_FR.properties
    • -1070
    • +1063
    ./lams/ApplicationResources_no_NO.properties
  1. … 166 more files in changeset.
LDEV-4769 Updating labels

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