Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5398 Allow creating new QB collections on the fly

    • -1
    • +3
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
# WARNING: head commit changed in the meantime

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

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

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

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
# WARNING: head commit changed in the meantime

Merge branch 'LDEV-5381' into v4.7

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5382 Add "shuffle questions" in advanced RAT section of TBL wizard

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 4 more files in changeset.
LDEV-5375 Add OpenAI question import to Assessment

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

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

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 9 more files in changeset.
LDEV-5354 adding further details to title label

    • -1
    • +1
    ./lams/ApplicationResources.properties
LDEV-5354 Move course URL copy button to More Options menu

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 4 more files in changeset.
LDEV-5354 Add course URL on index page

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

Conflicts:

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

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 12 more files in changeset.
LDEV-5350 Detect grouping on LD choice in Add Lesson dialog

    • -3
    • +3
    ./lams/ApplicationResources.properties
  1. … 4 more files in changeset.
LDEV-5350 Add Course Grouping selection to Add Lesson dialog

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

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

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

And fixing previously changed labels in admin

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

    • -1
    • +2
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./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_fr_FR.properties
    • -2
    • +2
    ./lams/ApplicationResources_no_NO.properties
  1. … 18 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
    ./lams/ApplicationResources.properties
    • -0
    • +6
    ./lams/ApplicationResources_de_DE.properties
    • -0
    • +6
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +6
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +6
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +6
    ./lams/ApplicationResources_fr_FR.properties
    • -0
    • +6
    ./lams/ApplicationResources_no_NO.properties
  1. … 29 more files in changeset.
LDEV-4769 Updating English (AU), Spanish, Greek, Norwegian, Chinese and French

    • -0
    • +6
    ./lams/ApplicationResources.properties
    • -0
    • +6
    ./lams/ApplicationResources_de_DE.properties
    • -0
    • +6
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +6
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +6
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +6
    ./lams/ApplicationResources_fr_FR.properties
    • -0
    • +6
    ./lams/ApplicationResources_no_NO.properties
    • -0
    • +6
    ./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
    ./lams/ApplicationResources.properties
  1. … 19 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

    • -0
    • +1
    ./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
    ./lams/ApplicationResources_el_GR.properties
  1. … 4 more files in changeset.
LDEV-4769 Updating Greek

    • -0
    • +1
    ./lams/ApplicationResources_el_GR.properties
  1. … 3 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
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 55 more files in changeset.
LDEV-4769 Updating Norwegian

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

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

    • -0
    • +1
    ./lams/ApplicationResources.properties
LDEV-4769 Updating English, Chinese Simplified

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -10
    • +14
    ./lams/ApplicationResources_zh_CN.properties
  1. … 6 more files in changeset.