language

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
# WARNING: head commit changed in the meantime

Merge remote-tracking branch 'origin/v4.6' into v4.7

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

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
Merge branch 'LDEV-5375' into LAI-2

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

Conflicts:

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

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

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

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
LDEV-5383 Allow adding user to all lessons in a course

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 8 more files in changeset.
LDEV-4501 Prevent exceptions on missing user references from LogEvents

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-5375 Add AI configuration page

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

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

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 8 more files in changeset.
LDEV-5354 Indicate that sysadmin setting also give course URL

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian, Chinese

    • -23
    • +27
    ./lams/ApplicationResources.properties
  1. … 10 more files in changeset.
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian

    • -11
    • +11
    ./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_no_NO.properties
    • -21
    • +21
    ./lams/ApplicationResources_zh_CN.properties
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian

And fixing previously changed labels in admin

    • -20
    • +20
    ./lams/ApplicationResources_el_GR.properties
    • -22
    • +26
    ./lams/ApplicationResources_en_AU.properties
    • -22
    • +22
    ./lams/ApplicationResources_es_ES.properties
    • -11
    • +11
    ./lams/ApplicationResources_fr_FR.properties
    • -20
    • +20
    ./lams/ApplicationResources_no_NO.properties
  1. … 7 more files in changeset.
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian

    • -27
    • +23
    ./lams/ApplicationResources.properties
    • -11
    • +11
    ./lams/ApplicationResources_de_DE.properties
    • -21
    • +21
    ./lams/ApplicationResources_el_GR.properties
    • -26
    • +23
    ./lams/ApplicationResources_en_AU.properties
    • -21
    • +21
    ./lams/ApplicationResources_es_ES.properties
    • -11
    • +11
    ./lams/ApplicationResources_fr_FR.properties
    • -21
    • +21
    ./lams/ApplicationResources_no_NO.properties
  1. … 18 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

    • -1
    • +34
    ./lams/ApplicationResources_el_GR.properties
  1. … 6 more files in changeset.
LDEV-5330 Improve accessibility by adding labels to buttons and inputs

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

Conflicts:

lams_admin/web/policies/policyTable.jsp

    • -1
    • +34
    ./lams/ApplicationResources_el_GR.properties
  1. … 4 more files in changeset.
LDEV-5330 Merge changes made for sysadmin

It included upgrading to Bootstrap 5 and using UI guidelines set for

Monitoring UI.

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -3
    • +6
    ./lams/ApplicationResources_en_AU.properties
  1. … 190 more files in changeset.
LDEV-4769 Updating Greek

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

    • -0
    • +6
    ./lams/ApplicationResources.properties
    • -0
    • +6
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +6
    ./lams/ApplicationResources_es_ES.properties
  1. … 5 more files in changeset.
LDEV-4769 Update translations English, Spanish

    • -6
    • +6
    ./lams/ApplicationResources.properties
    • -0
    • +6
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +6
    ./lams/ApplicationResources_es_ES.properties
  1. … 7 more files in changeset.
LDEV-5326, LDEV-5327 Move buttons to right

    • -1
    • +0
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5327 Add run Garbage Collector button

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-5327 Add Clear Cache button

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties

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

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

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

lams_admin/web/user.jsp

lams_central/conf/language/lams/ApplicationResources_zh_CN.properties

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

lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

    • -21
    • +24
    ./lams/ApplicationResources.properties
    • -21
    • +21
    ./lams/ApplicationResources_el_GR.properties
    • -21
    • +21
    ./lams/ApplicationResources_en_AU.properties
    • -21
    • +21
    ./lams/ApplicationResources_es_ES.properties
    • -21
    • +21
    ./lams/ApplicationResources_no_NO.properties
  1. … 54 more files in changeset.
LDEV-4769 Updating Norwegian

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

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +9
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +9
    ./lams/ApplicationResources_es_ES.properties
  1. … 29 more files in changeset.
LDEV-5311 Add server URL to change password email

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5311 Send emails with password change link on user import

    • -0
    • +8
    ./lams/ApplicationResources.properties
  1. … 9 more files in changeset.
LDEV-5311 Generate passwords for imported users with no passwd provided

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