Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5397 Updating all i18n labels

    • -4
    • +4
    ./language/lams/ApplicationResources.properties
    • -1
    • +6
    ./language/lams/ApplicationResources_de_DE.properties
    • -4
    • +4
    ./language/lams/ApplicationResources_el_GR.properties
    • -4
    • +4
    ./language/lams/ApplicationResources_en_AU.properties
    • -5
    • +5
    ./language/lams/ApplicationResources_es_ES.properties
    • -2
    • +5
    ./language/lams/ApplicationResources_fr_FR.properties
    • -3
    • +3
    ./language/lams/ApplicationResources_it_IT.properties
    • -4
    • +4
    ./language/lams/ApplicationResources_no_NO.properties
    • -0
    • +137
    ./language/lams/ApplicationResources_pt_PT.properties
  1. … 303 more files in changeset.
LDEV-5345 Updating translations

    • -0
    • +1
    ./language/lams/ApplicationResources_it_IT.properties
  1. … 7 more files in changeset.
LDEV-5345 Adding and updating latest translations

    • -0
    • +2
    ./language/lams/ApplicationResources_it_IT.properties
  1. … 125 more files in changeset.
LDEV-5345 Adding and updating latest translations

    • -1
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_fr_FR.properties
    • -0
    • +129
    ./language/lams/ApplicationResources_it_IT.properties
  1. … 197 more files in changeset.
LDEV-5345 Adding and updating latest translations

    • -2
    • +2
    ./language/lams/ApplicationResources.properties
    • -1
    • +2
    ./language/lams/ApplicationResources_el_GR.properties
    • -1
    • +2
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +2
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_zh_CN.properties
  1. … 171 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

    • -1
    • +2
    ./language/lams/ApplicationResources.properties
  1. … 12 more files in changeset.
LDEV-5363 Add TBL course gradebook export

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 8 more files in changeset.
LDEV-5363 Give better label to export selected lessons button

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

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 4 more files in changeset.
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian

    • -1
    • +0
    ./language/lams/ApplicationResources.properties
  1. … 24 more files in changeset.
LDEV-4769 Updating Greek

    • -0
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
  1. … 3 more files in changeset.
Merge 4.6 into 4.7

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 7 more files in changeset.
LDEV-4769 Update translations English, Spanish

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 7 more files in changeset.
LDEV-5083 Add Expand All buttons to Gradebook jqGrid views

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-4897 Properly align lesson names in course gradebook export

Also add subcourse information

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

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

    • -0
    • +134
    ./language/lams/ApplicationResources_zh_CN.properties
  1. … 37 more files in changeset.
LDEV-4769 Updating English, Norwegian, Greek, Spanish, Chinese Traditional

    • -0
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 44 more files in changeset.
LDEV-4769 Updating English, Norwegian, Greek

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 8 more files in changeset.
LDEV-5140 Rename Release Marks button

Teachers may think that the button releases marks immediately instead of

showing a panel to release/schedule marks.

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

    • -0
    • +5
    ./language/lams/ApplicationResources_fr_FR.properties
  1. … 8 more files in changeset.
LDEV-4769 Update English and Spanish

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

    • -0
    • +23
    ./language/lams/ApplicationResources_el_GR.properties
  1. … 26 more files in changeset.
LDEV-5143 and LDEV-5140 labels updates

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

    • -23
    • +23
    ./language/lams/ApplicationResources.properties
    • -5
    • +2
    ./language/lams/ApplicationResources_de_DE.properties
    • -5
    • +2
    ./language/lams/ApplicationResources_el_GR.properties
    • -23
    • +23
    ./language/lams/ApplicationResources_en_AU.properties
    • -5
    • +25
    ./language/lams/ApplicationResources_es_ES.properties
    • -5
    • +2
    ./language/lams/ApplicationResources_fr_FR.properties
    • -5
    • +25
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 16 more files in changeset.
LDEV-5140 minor cosmetic adjustments and label changes

Changed grades to marks as that's consistent with what we have already. But we've got to address this as in Learner we called marks scores as well.

    • -5
    • +5
    ./language/lams/ApplicationResources.properties
    • -5
    • +5
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 1 more file in changeset.
LDEV-5140 Add learner filtering for sending emails

    • -1
    • +2
    ./language/lams/ApplicationResources.properties
    • -1
    • +2
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 3 more files in changeset.
LDEV-5140 changes to labels

    • -5
    • +12
    ./language/lams/ApplicationResources_en_AU.properties
LDEV-5140 changes to labels

    • -5
    • +4
    ./language/lams/ApplicationResources.properties
LDEV-5140 Use a rich HTML email template

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