Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

    • -11
    • +11
    ./includes/javascript/openUrls.js
  1. … 56 more files in changeset.
LDEV-5083 Load latest version of LAMS JS scripts on main page

LDEV-5083 Improve table and icons colouring

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

    • -3
    • +3
    ./includes/javascript/bootstrap-select.js
  1. … 50 more files in changeset.
LDEV-5324 Do not call missing function on validation success

  1. … 3 more files in changeset.
LDEV-5083 Refactor new UI CSS files

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

    • -2
    • +24
    ./includes/javascript/qb-question.js
LDEV-5324 Make grade slider trigger new version check.

Also highlight primary save button.

    • -3
    • +11
    ./includes/javascript/qb-question.js
LDEV-5324 Get latest JS scripts when adding QB questions

LDEV-5324 Detect new question version as author changes its details

    • -6
    • +20
    ./includes/javascript/qb-question.js
    • -0
    • +10
    ./qb/authoring/addQuestionHeader.jsp
  1. … 2 more files in changeset.
LDEV-5083 Add custom JSP tags than will be used in next version

    • -0
    • +40
    ./WEB-INF/tags/Dropdown.tag
    • -0
    • +29
    ./WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    ./WEB-INF/tags/Panel.tag
  1. … 93 more files in changeset.
LDEV-5083 Remove nav buttons labels on smaller screens

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

This patch covers most of issues raised the UX designer.

  1. … 8 more files in changeset.
LDEV-5323 Resize only main SVG in learner, not embedded activity SVGs

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

  1. … 4 more files in changeset.
LDEV-5083 Add missing custom JSP tags

    • -0
    • +45
    ./WEB-INF/tags/Input.tag
    • -0
    • +46
    ./WEB-INF/tags/Switch.tag
  1. … 62 more files in changeset.
LDEV-5083 Add missing custom JSP tags to TLD

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

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

    • -38
    • +40
    ./includes/javascript/popover-tag.js
  1. … 35 more files in changeset.
LDEV-5083 Remember last opened tab when refreshing

  1. … 1 more file in changeset.
LDEV-5083 Fix authoring embedded CSS

LDEV-5083 Rewrite TBL Doku AES tab to new UI

    • -0
    • +19
    ./css/jquery.tablesorter.pager5.css
  1. … 2 more files in changeset.
LDEV-5320 Audit Login As feature

LDEV-5319 Replace invalid XML characters instead of throwing error

    • -0
    • +1
    ./META-INF/services/javax.xml.stream.XMLOutputFactory
  1. … 4 more files in changeset.
LDEV-5083 Rewrite Notifications dialog to new design

  1. … 5 more files in changeset.
LDEV-5083 Update to Bootstrap v5.2.0 (beta)

It has quite a few useful CSS variables.

    • -10
    • +24
    ./css/bootstrap/_breadcrumb.scss
    • -27
    • +44
    ./css/bootstrap/_list-group.scss
    • -0
    • +54
    ./css/bootstrap/_maps.scss
  1. … 42 more files in changeset.
LDEV-5083 Rewrite View/Email Learners popup to new design

  1. … 3 more files in changeset.
LDEV-5083 Allow 15px font for small buttons

LDEV-5218 Provide IDs and not UIDs when removing QB questions