Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/v4.6' into v4.7

LDEV-5342 Show LD last modified date also in Save As dialog

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

Conflicts:

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

lams_central/web/includes/javascript/orgGrouping.js

  1. … 2 more files in changeset.
LDEV-3120 Use only subcourse learners when applying course grouping

  1. … 2 more files in changeset.
LDEV-5337 Fix grouping panel layout

  1. … 1 more file in changeset.
LDEV-5338 Rename JS and CSS files to reflect changes in classes

  1. … 5 more files in changeset.
LDEV-5338 Rename paths to reflect grouping flow better

  1. … 5 more files in changeset.
LDEV-5337 Rewrite Org Groupings view to Bootstrap 5 and LAMS palette

  1. … 4 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. … 35 more files in changeset.
LDEV-5342 Add last modified date at bottom of Open dialog in Authoring

  1. … 2 more files in changeset.
LDEV-5340 Do additional escaping for commented out properties

Controller does not understand that an example property is commented out

in JavaScript and still parses it.

LDEV-5340 Allow video embedding from custom sites

  1. … 1 more file in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

  1. … 15 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_monitoring/conf/language/lams/ApplicationResources.properties

  1. … 3 more files in changeset.
LDEV-3115 Make sure that activity selection box is not in LD SVG

LDEV-5329 Remove obsolete configuration items

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

  1. … 191 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. … 58 more files in changeset.
LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

  1. … 54 more files in changeset.
LDEV-5324 Show Save As New Version on any form data change

LDEV-5324 Properly toggle Save/Save As New Version buttons

  1. … 3 more files in changeset.
LDEV-5324 Make grade slider trigger new version check.

Also highlight primary save button.

  1. … 2 more files in changeset.
LDEV-5324 Detect new question version as author changes its details

  1. … 13 more files in changeset.
LDEV-5083 Fix various layout issues

This patch covers most of issues raised the UX designer.

  1. … 10 more files in changeset.
LDEV-5083 Fix popovers and rewrite tRAT tooltips to popovers

  1. … 36 more files in changeset.
LDEV-5083 Remember last opened tab when refreshing

  1. … 1 more file in changeset.
LDEV-5083 Rewrite Notifications dialog to new design

  1. … 5 more files in changeset.
LDEV-5083 Apply LAMS colour palette to monitoring 5 UI

From Boostrap we keep gray colour.

Yellow does not have good contrast with white, but darker yellow looks

ugly. We need to make sure to use borders whenever we use yellow on

white background.

For Learning Design SVGs standard paletter is used with some opacity.

  1. … 13 more files in changeset.
LDEV-4792 Fix optional activity and branching min/max spinners

    • -19
    • +27
    ./authoring/authoringProperty.js
LDEV-4020 Use prop() instead of attr() in authoring JS code

Newer jQuery version operate with prop(). Using attr() allowed for

example multiple branches to be marked as the default one.

    • -19
    • +17
    ./authoring/authoringProperty.js