Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5242 Merge changes from 4.5

    • -0
    • +4
    ./lams/ApplicationResources.properties
  1. … 4 more files in changeset.
LDEV-5273 Move VSA allocation code to Central

    • -0
    • +4
    ./lams/ApplicationResources.properties
  1. … 21 more files in changeset.
LDEV-4769 Updating Simplified Chinese and English

    • -1
    • +1
    ./lams/ApplicationResources_zh_CN.properties
  1. … 3 more files in changeset.
LDEV-5263 Rename peer evaluation tool

Rename peer review to peer evaluation instead.

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 4 more files in changeset.
LDEV-4769 Updating Simplified Chinese and Greek

    • -0
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +93
    ./lams/ApplicationResources_zh_CN.properties
  1. … 2 more files in changeset.
LDEV-4769 Updating Simplified Chinese, English, Spanish, Norwegian

    • -0
    • +187
    ./lams/ApplicationResources_zh_CN.properties
  1. … 31 more files in changeset.
LDEV-4769 Updating Simplified Chinese

    • -0
    • +259
    ./lams/ApplicationResources_zh_CN.properties
LDEV-4769 Updating Simplified Chinese, English, Spanish

    • -0
    • +71
    ./lams/ApplicationResources_zh_CN.properties
  1. … 3 more files in changeset.
LDEV-4769 Updating Simplified Chinese, English and Español

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +153
    ./lams/ApplicationResources_zh_CN.properties
LDEV-4875 Add help information how to structure VSAs in authoring

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-4769 Updating Simplified Chinese

    • -0
    • +78
    ./lams/ApplicationResources_zh_CN.properties
LDEV-4769 Updating Simplified Chinese, English, Spanish, Greek, Norwegian

    • -28
    • +28
    ./lams/ApplicationResources.properties
    • -28
    • +28
    ./lams/ApplicationResources_en_AU.properties
    • -25
    • +25
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +81
    ./lams/ApplicationResources_zh_CN.properties
  1. … 27 more files in changeset.
LDEV-4769 Updating Simplified Chinese, English, Spanish

    • -0
    • +7
    ./lams/ApplicationResources_zh_CN.properties
  1. … 3 more files in changeset.
LDEV-4769 Updating Simplified Chinese

    • -225
    • +189
    ./lams/ApplicationResources_zh_CN.properties
LDEV-4769 Updating English, Spanish, Greek

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -1
    • +12
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    ./lams/ApplicationResources_es_ES.properties
  1. … 4 more files in changeset.
LDEV-5218 Reintroduce missing labels for batch QB question removal

    • -0
    • +3
    ./lams/ApplicationResources.properties
LDEV-4769 Updating English, Spanish

    • -8
    • +8
    ./lams/ApplicationResources.properties
    • -8
    • +8
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +8
    ./lams/ApplicationResources_es_ES.properties
  1. … 3 more files in changeset.
LDEV-5200 Reintroduce missing authoring labels

    • -0
    • +8
    ./lams/ApplicationResources.properties
    • -0
    • +8
    ./lams/ApplicationResources_en_AU.properties
LDEV-4769 Updating Greek, English, Spanish, Norwegian

    • -9
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 13 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5223' into v4.5

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

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 12 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into v4.5

Conflicts:

lams_central/web/authoring/authoring.jsp

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 8 more files in changeset.
LDEV-5219 Introduce stop-at-preceding-activity flag for some gates

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

    • -3
    • +4
    ./lams/ApplicationResources.properties
    • -0
    • +4
    ./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
LDEV-4769 Updating Greek, English, Spanish, Norwegian

    • -7
    • +4
    ./lams/ApplicationResources.properties
    • -0
    • +4
    ./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. … 8 more files in changeset.
LDEV-4825 Introduce item analysis tooltips in QB

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

    • -0
    • +3
    ./lams/ApplicationResources.properties
LDEV-5218 Allow removing multiple questions on Edit Collection screen

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

    • -1
    • +9
    ./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. … 7 more files in changeset.
LDEV-5200 Move grouping activity from top menu to activity toolbar

    • -1
    • +1
    ./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. … 6 more files in changeset.