Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian, Chinese

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -0
    • +2
    ./language/lams/ApplicationResources_el_GR.properties
    • -0
    • +2
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    ./language/lams/ApplicationResources_es_ES.properties
    • -0
    • +2
    ./language/lams/ApplicationResources_no_NO.properties
    • -0
    • +2
    ./language/lams/ApplicationResources_zh_CN.properties
  1. … 5 more files in changeset.
LDEV-5200 Use consistent background colour in learner and monitor UIs

  1. … 3 more files in changeset.
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian

And fixing previously changed labels in admin

    • -1
    • +1
    ./language/lams/ApplicationResources_de_DE.properties
    • -3
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
    • -3
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -3
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_fr_FR.properties
    • -3
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
    • -3
    • +1
    ./language/lams/ApplicationResources_zh_CN.properties
  1. … 5 more files in changeset.
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian

    • -1
    • +2
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_de_DE.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_fr_FR.properties
    • -2
    • +2
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 18 more files in changeset.
LDEV-5338 Rename paths to reflect grouping flow better

  1. … 7 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/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

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_de_DE.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_el_GR.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_es_ES.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_fr_FR.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 29 more files in changeset.
LDEV-4769 Updating English (AU), Spanish, Greek, Norwegian, Chinese and French

    • -0
    • +6
    ./language/lams/ApplicationResources.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_de_DE.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_el_GR.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_es_ES.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_fr_FR.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_no_NO.properties
    • -0
    • +6
    ./language/lams/ApplicationResources_zh_CN.properties
  1. … 3 more files in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

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

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

Conflicts:

lams_admin/web/policies/policyTable.jsp

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

    • -0
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
  1. … 3 more files in changeset.
LDEV-5326, LDEV-5327 Secure requests to sysadmin clean up functions

  1. … 2 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

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 55 more files in changeset.
LDEV-4769 Updating Norwegian

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

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 29 more files in changeset.
LDEV-4617 Add missing label for email verification

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
LDEV-5081 Merge changes made for monitor in LDEV-5083

    • -3
    • +19
    ./security/Owasp.CsrfGuard.properties
  1. … 36 more files in changeset.
LDEV-4769 Updating English, Chinese Simplified

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -10
    • +14
    ./language/lams/ApplicationResources_zh_CN.properties
  1. … 6 more files in changeset.
Merge branch 'LDEV-5307' into v4.6

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

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

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -275
    • +284
    ./language/lams/ApplicationResources_zh_CN.properties
  1. … 35 more files in changeset.
LDEV-4769 Updating English, Norwegian, Greek, Spanish, Chinese Traditional

    • -2
    • +2
    ./language/lams/ApplicationResources.properties
    • -0
    • +2
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    ./language/lams/ApplicationResources_es_ES.properties
    • -0
    • +2
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 42 more files in changeset.
LDEV-5307 Allow exact matching of VSAs

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 16 more files in changeset.
LDEV-5304 Secure login page from CSRF attack

Check for CSRF attack only for regular logins.

For LoginAs feature and integrations existing HTTP session gets

invalidated and so is the CSRF token.

  1. … 4 more files in changeset.
LDEV-5304 Update CSRF Guard to version 4.1.3

  1. … 6 more files in changeset.
LDEV-5302 Rename sysadmin role to appadmin

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_ar_JO.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_cs_CZ.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_cy_GB.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_da_DK.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_de_DE.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_es_MX.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_id_ID.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_it_IT.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_ko_KR.properties
  1. … 167 more files in changeset.
LDEV-5291 Allow filtering question in QB search by presence in LD

    • -0
    • +2
    ./language/lams/ApplicationResources.properties
  1. … 11 more files in changeset.
LDEV-4769 Updating English, Norwegian, Greek

    • -2
    • +2
    ./language/lams/ApplicationResources.properties
    • -0
    • +2
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 8 more files in changeset.
LDEV-5283 Add Remove button on properties box in authoring

    • -0
    • +2
    ./language/lams/ApplicationResources.properties
  1. … 5 more files in changeset.
LDEV-4769 Updating Norwegian

    • -1
    • +28
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 4 more files in changeset.