Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5338 Allow modifications to all kinds of groupings

  1. … 1 more file in changeset.
LDEV-5338 Rename file to reflect its purpose better

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

  1. … 4 more files in changeset.
LDEV-5343 adding boundaries to CKEditor tabs widget

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

    • -0
    • +50
    ./css/orgGrouping.css
    • -67
    • +54
    ./includes/javascript/orgGrouping.js
  1. … 1 more file 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. … 34 more files in changeset.
LDEV-5342 Add last modified date at bottom of Open dialog in Authoring

  1. … 1 more file 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.

    • -5
    • +6
    ./includes/javascript/ckconfig_custom.js
LDEV-5340 Allow video embedding from custom sites

    • -1
    • +17
    ./includes/javascript/ckconfig_custom.js
  1. … 1 more file in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

    • -0
    • +82
    ./WEB-INF/tags/FileUpload5.tag
    • -78
    • +49
    ./includes/javascript/orgGroup.js
  1. … 10 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-5178 Skip password expiration check on login via integrations

  1. … 2 more files in changeset.
LDEV-5333 Move HTML templates from WWW to Central folder

    • -0
    • +887
    ./templates/gradebookReleaseLessonMarksEmailTemplate.html
    • -0
    • +643
    ./templates/userImportPasswordChangeEmailTemplate.html
  1. … 5 more files in changeset.
LDEV-5334 Make shared collections available to authors

  1. … 4 more files in changeset.
LDEV-5329 Remove obsolete configuration items

  1. … 3 more files in changeset.
LDEV-5273 Do not show non-existent QB option on VSA allocate screen

    • -32
    • +35
    ./qb/vsa/vsaQuestionAllocate.jsp
LDEV-5330 Improve accessibility by adding labels to buttons and inputs

  1. … 32 more files in changeset.
LDEV-5330 Merge changes made for tags

    • -0
    • +43
    ./WEB-INF/tags/Alert5.tag
  1. … 200 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.

    • -0
    • +534
    ./WEB-INF/tags/Page5.tag
    • -0
    • +53
    ./WEB-INF/tags/TSTable5.tag
    • -0
    • +105
    ./WEB-INF/tags/Widget.tag
    • -0
    • +17
    ./css/inlineeditor.css
    • -1
    • +35
    ./css/jquery.tablesorter.pager5.css
    • -1
    • +193
    ./css/jquery.tablesorter.theme.bootstrap.css
    • -0
    • +204
    ./css/jquery.tablesorter.theme.bootstrap4.css
    • -0
    • +1
    ./css/jquery.tablesorter.theme.bootstrap5.css
    • binary
    ./includes/fonts/FontsFree-Net-Mont-Bold.ttf
    • binary
    ./includes/fonts/FontsFree-Net-Mont1.ttf
  1. … 177 more files in changeset.
LDEV-5324 Fix question new version detection for VSAs

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