Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5124 Add i18n labels instead of hardcoded ones

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5101 Adding labels from lokalise (English and Español)

    • -4
    • +4
    ./lams/ApplicationResources.properties
    • -0
    • +4
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    ./lams/ApplicationResources_es_ES.properties
  1. … 6 more files in changeset.
Merge branch 'LDEV-5101' into v4.0

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -1
    • +3
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +3
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +3
    ./lams/ApplicationResources_no_NO.properties
  1. … 15 more files in changeset.
LDEV-5111 Change chart title if it displays groups and not students

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-5101 Allow question version change in Assessment tool

    • -0
    • +4
    ./lams/ApplicationResources.properties
  1. … 4 more files in changeset.
LDEV-5111 Display groups instead of students in chart when needed

If Assessment activity uses a leader, then only he gets his answers auto

saved. He counts as one student. But when he finishes the activity, his

answers get copied to other group members. Suddenly instead of 1 student

we get, say, 5 with same answers. This makes the answered questions

chart go crazy.

Now when leader selection is in use, group count is displayed instead of

student count in the chart.

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

    • -2
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +2
    ./lams/ApplicationResources_de_DE.properties
    • -1
    • +2
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +2
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +2
    ./lams/ApplicationResources_fr_FR.properties
    • -1
    • +2
    ./lams/ApplicationResources_no_NO.properties
  1. … 13 more files in changeset.
LDEV-5107: adding MS word imports to Assessment authoring

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

    • -2
    • +0
    ./lams/ApplicationResources.properties
    • -0
    • +7
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +0
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +7
    ./lams/ApplicationResources_no_NO.properties
  1. … 8 more files in changeset.
LDEV-4769 Updating English, Spanish, Norwegian

    • -8
    • +9
    ./lams/ApplicationResources.properties
    • -0
    • +9
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +7
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +2
    ./lams/ApplicationResources_no_NO.properties
  1. … 3 more files in changeset.
LDEV-5095 Add Answered Questions chart and periodic refresh

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 7 more files in changeset.
Merge branch 'v4.0' into LDEV-5095

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-5097 Add buttons to open results view in Assessment monitoring

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 5 more files in changeset.
LDEV-5095 change labels

    • -2
    • +2
    ./lams/ApplicationResources.properties
LDEV-5095 Initial implementation of learner complection chart

    • -0
    • +4
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-4769 Updating Greek

    • -8
    • +8
    ./lams/ApplicationResources_el_GR.properties
  1. … 6 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

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