Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5185 Introduce time limits to Scratchie monitoring

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

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -4
    • +0
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -3
    • +5
    ./lams/ApplicationResources_es_ES.properties
    • -4
    • +0
    ./lams/ApplicationResources_no_NO.properties
  1. … 5 more files in changeset.
LDEV-5144 Add missing label

    • -0
    • +1
    ./lams/ApplicationResources.properties
LDEV-5152 Fix labels to better reflect data source.

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -3
    • +3
    ./lams/ApplicationResources_en_AU.properties
LDEV-5152 Use correct data for charts and item analysis.

For mark charts and stats we submitted data. It corresponds to

teachers' desire to see stats as soon as it is available, even when

learners have not finished an activity yet.

For item analysis we have to use only data from

learners who finished (not only submitted) the activity. It is because

lesson marks are updated only on activity finish and we need lesson

marks to calculate item analysis factors. An explanation for teachers

has been added.

If we want it to work the same as mark charts, we need to have lesson

marks to be updated on activity submit.

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 4 more files in changeset.
LDEV-4769 Update Norwegian, Spanish, English, Greek

    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
  1. … 10 more files in changeset.
LDEV-4769 Update Norwegian, Spanish, English, Greek

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -1
    • +0
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./lams/ApplicationResources_no_NO.properties
  1. … 78 more files in changeset.
Merge branch 'v4.0' into LDEV-5142

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 1 more file in changeset.
LDEV-5144 Extract AE tab management to TBL monitoring

Not every AE tab will be an Assessment, so we need tabs to be

independent on their content.

    • -1
    • +0
    ./lams/ApplicationResources.properties
    • -1
    • +0
    ./lams/ApplicationResources_en_AU.properties
  1. … 9 more files in changeset.
LDEV-4769 Update English and Spanish

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 5 more files in changeset.
LDEV-4769 Updating English, Norwegian and Greek

    • -0
    • +12
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    ./lams/ApplicationResources_no_NO.properties
  1. … 25 more files in changeset.
LDEV-5143 labels

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -0
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    ./lams/ApplicationResources_es_ES.properties
  1. … 19 more files in changeset.
Merge branch 'LDEV-5143' into v4.0

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java

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

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 11 more files in changeset.
LDEV-5143 and LDEV-5140 labels updates

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 19 more files in changeset.
LDEV-5148 Include average, median, mode into export summary sheet

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
LDEV-4769 Update Norwegian, Spanish, English, Greek, German, French

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +6
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +7
    ./lams/ApplicationResources_no_NO.properties
  1. … 19 more files in changeset.
LDEV-5143 Improve layout of wait for leader and change leader screens.

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 15 more files in changeset.
LDEV-4769 Update Norwegian

    • -0
    • +3
    ./lams/ApplicationResources_no_NO.properties
  1. … 1 more file in changeset.
LDEV-5151 adding and adjusting labels

    • -7
    • +11
    ./lams/ApplicationResources.properties
    • -2
    • +11
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    ./lams/ApplicationResources_es_ES.properties
LDEV-5147 Add median and modes to Assessment stats tab in monitoring

Rewrite DTO entities to be more universal and to accommodate manual

calculation of stats.

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 9 more files in changeset.
LDEV-5146 Add activity stats on top of group stats in Assessment monitor

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
LDEV-5143 Change Leader in Assessment

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 7 more files in changeset.
LDEV-4769 Updating English, Norwegian and Greek

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

Conflicts:

lams_build/3rdParty.userlibraries

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/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

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

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

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/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.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/WEB-INF/tags/CKEditor.tag

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

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

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

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

    • -5
    • +25
    ./lams/ApplicationResources_en_AU.properties
  1. … 29 more files in changeset.
LDEV-4769 Updating Greek

    • -5
    • +5
    ./lams/ApplicationResources_el_GR.properties
  1. … 9 more files in changeset.
LDEV-5120 Updating labels Spanish, English

    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 5 more files in changeset.
LDEV-5138 Set leader only on his activity entry, not on any user entry

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

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

    • -0
    • +6
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +6
    ./lams/ApplicationResources_no_NO.properties
  1. … 6 more files in changeset.
LDEV-5124 Adding labels from Lokalise

    • -2
    • +4
    ./lams/ApplicationResources.properties