Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/v4.6' into v4.7

    • -1
    • +2
    ./lams/ApplicationResources.properties
LDEV-5378 Add max mark setting to dokumaran

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

    • -3
    • +3
    ./lams/ApplicationResources_es_ES.properties
  1. … 22 more files in changeset.
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian, Chinese

    • -11
    • +0
    ./lams/ApplicationResources.properties
  1. … 10 more files in changeset.
LDEV-5331 Add submission deadline to Doku and Whiteboard

    • -0
    • +11
    ./lams/ApplicationResources.properties
  1. … 19 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-4769 Updating English, Chinese Simplified

    • -0
    • +24
    ./lams/ApplicationResources_zh_CN.properties
  1. … 8 more files in changeset.
LDEV-4769 Updating Chinese Traditional

    • -10
    • +10
    ./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_en_AU.properties
    • -0
    • +127
    ./lams/ApplicationResources_zh_CN.properties
  1. … 35 more files in changeset.
LDEV-4769 Updating Norwegian

    • -5
    • +11
    ./lams/ApplicationResources_no_NO.properties
  1. … 4 more files in changeset.
LDEV-4769 Updating Simplified Chinese, English, Spanish, Greek, Norwegian

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

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

    • -6
    • +6
    ./lams/ApplicationResources.properties
    • -6
    • +6
    ./lams/ApplicationResources_en_AU.properties
    • -5
    • +11
    ./lams/ApplicationResources_es_ES.properties
  1. … 15 more files in changeset.
LDEV-5225 Improve doKu Gallery Walk monitoring layout.

    • -2
    • +6
    ./lams/ApplicationResources.properties
    • -2
    • +8
    ./lams/ApplicationResources_en_AU.properties
  1. … 1 more file in changeset.
LDEV-5222 Allow reediting answers within Gallery Walk in doKu

    • -2
    • +2
    ./lams/ApplicationResources.properties
  1. … 7 more files in changeset.
LDEV-5222 Change i18n labels for learner reedit

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5222 In Doku allow learner reedit after Gallery Walks has started

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

    • -6
    • +6
    ./lams/ApplicationResources_el_GR.properties
  1. … 7 more files in changeset.
LDEV-4769 Updating English, Greek

    • -1
    • +1
    ./lams/ApplicationResources.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_no_NO.properties
  1. … 1 more file in changeset.
LDEV-4769 Update Norwegian, Spanish, English, Greek

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

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

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

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./lams/ApplicationResources_fr_FR.properties
  1. … 7 more files in changeset.
LDEV-5172 LDEV-5173 Adding contextual help and merge names in monitor

    • -2
    • +4
    ./lams/ApplicationResources.properties
    • -0
    • +5
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +4
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +4
    ./lams/ApplicationResources_no_NO.properties
  1. … 2 more files in changeset.
LDEV-5172 better contextual help

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

    • -26
    • +28
    ./lams/ApplicationResources.properties
    • -1
    • +19
    ./lams/ApplicationResources_el_GR.properties
    • -6
    • +28
    ./lams/ApplicationResources_en_AU.properties
    • -3
    • +27
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +19
    ./lams/ApplicationResources_no_NO.properties
  1. … 78 more files in changeset.
LDEV-5142 Introduce advanced time limits for Doku

    • -1
    • +19
    ./lams/ApplicationResources.properties
    • -1
    • +0
    ./lams/ApplicationResources_en_AU.properties
  1. … 23 more files in changeset.
LDEV-5144 Introduce doKu as AE in TBL monitoring

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 8 more files in changeset.