Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5374 Add max mark information to Assessment questions and results

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

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

lams_tool_assessment/web/pages/monitoring/summary.jsp

    • -3
    • +15
    ./lams/ApplicationResources.properties
    • -2
    • +17
    ./lams/ApplicationResources_en_AU.properties
  1. … 7 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5360' into v4.6

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

Conflicts:

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

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 12 more files in changeset.
LDEV-5366 Make auto expand configurable in Tool settings in sysadmin

Disabled by default

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 7 more files in changeset.
LDEV-5360 Add marker's comment to question result

    • -1
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +16
    ./lams/ApplicationResources_en_AU.properties
  1. … 8 more files in changeset.
LDEV-5359 Use default section name for blank names

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5359 Add "all remaining questions" option for section

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-5359 Add Assessment section learning

    • -1
    • +4
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
LDEV-5359 Add Assessment section model and authoring

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

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-4271 Add Next/Previous Page buttons in paged Assessment learner

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5345 Updating English, Spanish, German, Greek

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

Conflicts:

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

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 12 more files in changeset.
LDEV-5351 Add marking teacher front end

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
LDEV-5345 Updating English, Spanish, Greek

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