Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian, Chinese

    • -0
    • +3
    ./lams/ApplicationResources_el_GR.properties
  1. … 10 more files in changeset.
LDEV-5346 General UI improvements TBL monitoring

Alignments, layout and labels

    • -5
    • +4
    ./lams/ApplicationResources.properties
    • -3
    • +4
    ./lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    ./lams/ApplicationResources_es_ES.properties
  1. … 9 more files in changeset.
Merge branch 'LDEV-5336' into v4.7

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

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java

lams_central/conf/language/lams/ApplicationResources.properties

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

lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java

lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java

lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

    • -0
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 34 more files in changeset.
LDEV-4769 Updating English (AU), Spanish, Greek, Norwegian, Chinese and French

    • -1
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 8 more files in changeset.
LDEV-3265 Allow to skip required questions in Preview mode

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-5336 Add table with all learners' results

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

Conflicts:

lams_monitoring/conf/language/lams/ApplicationResources.properties

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -3
    • +3
    ./lams/ApplicationResources_en_AU.properties
  1. … 2 more files in changeset.
LDEV-4769 Updating English (AU) and Spanish

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -3
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 28 more files in changeset.
LDEV-5083 Change name and icon of "Hide Student Choices" button

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 5 more files in changeset.
LDEV-5083 Fix various layout issues

This patch covers most of issues raised the UX designer.

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

    • -20
    • +0
    ./lams/ApplicationResources_el_GR.properties
    • -20
    • +0
    ./lams/ApplicationResources_es_ES.properties
    • -20
    • +0
    ./lams/ApplicationResources_no_NO.properties
    • -20
    • +0
    ./lams/ApplicationResources_zh_CN.properties
  1. … 28 more files in changeset.
LDEV-5317 Move time limit panel to single source in monitoring

Each tool using time limits (Assessment, Scratchie, Doku, Whiteboard)

had it own code to display and operate time limits.

In preparations for time limit widget in monitoring the code was

refactored so there is single source of time limit feature.

    • -20
    • +0
    ./lams/ApplicationResources.properties
    • -20
    • +0
    ./lams/ApplicationResources_en_AU.properties
  1. … 28 more files in changeset.
LDEV-5081 Merge changes made for monitor in LDEV-5083

    • -26
    • +57
    ./lams/ApplicationResources_en_AU.properties
  1. … 36 more files in changeset.
LDEV-4769 Updating Chinese Traditional

    • -29
    • +29
    ./lams/ApplicationResources_zh_CN.properties
  1. … 28 more files in changeset.
LDEV-4769 Updating English, Norwegian, Greek, Spanish, Chinese Traditional, French, German

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_de_DE.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_fr_FR.properties
    • -1
    • +1
    ./lams/ApplicationResources_no_NO.properties
    • -0
    • +451
    ./lams/ApplicationResources_zh_CN.properties
  1. … 30 more files in changeset.
LDEV-4769 Updating English, Norwegian, Greek, Spanish, Chinese Traditional

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

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 13 more files in changeset.
LDEV-5290 Prevent multiple tabs from being open on autosave

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

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +2
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 1 more file in changeset.
LDEV-4271 Inform students that their answers may be disclosed

Also move information about meaning of Complete activity button to the

top.

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

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

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -0
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +4
    ./lams/ApplicationResources_es_ES.properties
  1. … 8 more files in changeset.
LDEV-4271 Make meaning of Submit All more obvious

Some students think that they need to click Submit after each answer to

save it. We need to explain to them that Submit All (now Complete

Activity) prevents them from answering any other questions.

    • -1
    • +2
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 1 more file in changeset.
LDEV-4385 List possible and chosen matching pairs answers

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

    • -3
    • +10
    ./lams/ApplicationResources_no_NO.properties
  1. … 6 more files in changeset.
LDEV-4769 Updating Norwegian, Spanish, Greek, Chinese Simplified and English

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 12 more files in changeset.
LDEV-5273 Move VSA allocation code to Central

    • -4
    • +1
    ./lams/ApplicationResources.properties
  1. … 21 more files in changeset.
LDEV-5272 Add confirmation on removing VS answer from correct option

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 4 more files in changeset.
LDEV-5272 Allow deallocating answers from VSA options

Also fix a bug: when a teacher allocates an answer, the learner's

question result UID was used. If the learner changed his/her answer

before teacher allocated it or refreshed the page, the new answer got

allocated while the teacher thought the old one was getting allocated.

Now all allocation happens based on real answer value.

Also recalculate scores on allocation even if a learner has not finished

the activity yet.

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