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

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./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.

    • -4
    • +4
    ./lams/ApplicationResources.properties
    • -277
    • +242
    ./lams/ApplicationResources_de_DE.properties
    • -1
    • +5
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +4
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +4
    ./lams/ApplicationResources_no_NO.properties
  1. … 35 more files in changeset.
LDEV-5065 Confirm before disclosing answers in Assessment monitoring

    • -0
    • +4
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-4769 Updating English, Spanish, Greek and Norwegian labels

    • -0
    • +12
    ./lams/ApplicationResources_el_GR.properties
  1. … 14 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

    • -385
    • +408
    ./lams/ApplicationResources_en_AU.properties
  1. … 25 more files in changeset.
LDEV-4769 Updating Spanish, Greek, French, Norwegian

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

    • -0
    • +12
    ./lams/ApplicationResources_no_NO.properties
  1. … 10 more files in changeset.
Updating labels Spanish, English, French, Norwegian

    • -1
    • +12
    ./lams/ApplicationResources.properties
    • -1
    • +0
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +12
    ./lams/ApplicationResources_en_AU.properties
    • -16
    • +27
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./lams/ApplicationResources_no_NO.properties
  1. … 36 more files in changeset.
LDEV-4769 Updating Spanish, Norwegian

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

Also removing a deprecated label

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

    • -0
    • +3
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    ./lams/ApplicationResources_no_NO.properties
  1. … 20 more files in changeset.
LDEV-4769 Updating labels

Adding missing labels in Spanish, English

Adding translations for Zoom (Norwegian, Spanish)

    • -0
    • +3
    ./lams/ApplicationResources.properties
    • -0
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +5
    ./lams/ApplicationResources_es_ES.properties
  1. … 11 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!!

    • -399
    • +373
    ./lams/ApplicationResources.properties
    • -382
    • +393
    ./lams/ApplicationResources_el_GR.properties
    • -383
    • +393
    ./lams/ApplicationResources_en_AU.properties
    • -362
    • +389
    ./lams/ApplicationResources_es_ES.properties
    • -277
    • +253
    ./lams/ApplicationResources_fr_FR.properties
    • -382
    • +393
    ./lams/ApplicationResources_no_NO.properties
  1. … 166 more files in changeset.
LDEV-5033 Add answer justification to Assessment

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 13 more files in changeset.
LDEV-5041 add/fix labels and modify the monitor UI stlightly

    • -5
    • +8
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5041 Remove block UI on learner entry with time limit

    • -1
    • +0
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-5041 Add individual time limits

    • -2
    • +1
    ./lams/ApplicationResources.properties
  1. … 12 more files in changeset.
LDEV-5041 Add "Finish now" feature

    • -1
    • +4
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-5041 Add absolute time limit feature to Assessment

    • -2
    • +0
    ./lams/ApplicationResources.properties
  1. … 10 more files in changeset.
LDEV-5041 Control relative time limit in Assessment monitor

    • -1
    • +20
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
LDEV-5052 Adjust rating layout in Assessment monitoring

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-5025 Put proper text information when answers not yet disclosed

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5025 Highlight own group when displaying Assessment answer rating

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5025 Show detailed answer ratings in Assessment monitoring

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-5025 Show rating for the given team's own answer

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5025 Allow Assessment other groups' answer rating and commenting

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

Conflicts:

lams_build/3rdParty.userlibraries

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

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

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

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

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

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

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

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

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

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

    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 30 more files 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 Cosmetic and label changes

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