Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5331 Add missing title and autocomplete attr to submission deadline

    • -0
    • +1
    ./pages/learning/submissionDeadline.jsp
    • -1
    • +1
    ./pages/monitoring/parts/dateRestriction.jsp
  1. … 17 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-5317 Fix time limit widget in TBL monitoring tRAT

LDEV-5337 Add new FileUpload tag to all projects

    • -0
    • +82
    ./WEB-INF/tags/FileUpload5.tag
  1. … 62 more files in changeset.
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
  1. … 188 more files in changeset.
LDEV-5083 Refresh burning questions count badges along with answers

    • -58
    • +1
    ./pages/monitoring/studentChoices5.jsp
    • -122
    • +179
    ./pages/monitoring/studentChoicesTable.jsp
  1. … 1 more file 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 Add burning questions count badges next to question in tRAT

    • -0
    • +15
    ./pages/monitoring/studentChoices.jsp
    • -0
    • +11
    ./pages/monitoring/studentChoices5.jsp
  1. … 1 more file in changeset.
LDEV-5083 Change name and icon of "Hide Student Choices" button

    • -1
    • +1
    ./pages/monitoring/studentChoices5.jsp
  1. … 6 more files in changeset.
LDEV-5083 Improve table and icons colouring

    • -4
    • +0
    ./pages/monitoring/parts/burningQuestions5.jsp
  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.

    • -100
    • +92
    ./pages/tblmonitoring/tra.jsp
  1. … 56 more files in changeset.
LDEV-5324 Do not call missing function on validation success

  1. … 3 more files in changeset.
LDEV-4604 Hide "Burning Questions" header if there are none

  1. … 1 more file in changeset.
LDEV-5019 Add "session finished" icon in Scratchie Student Choices table

  1. … 1 more file 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 Improve accessibility by allowing focus with TAB button

    • -1
    • +1
    ./pages/monitoring/parts/burningQuestions5.jsp
  1. … 4 more files in changeset.
LDEV-5083 Reduce empty spaces on TBL pages

  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.
LDEV-5083 Fix popovers and rewrite tRAT tooltips to popovers

    • -2
    • +3
    ./pages/monitoring/studentChoices5.jsp
    • -6
    • +10
    ./pages/monitoring/studentChoicesTable.jsp
  1. … 34 more files in changeset.
LDEV-5083 Update all data on tRAT student choices using Flux

    • -176
    • +35
    ./pages/monitoring/studentChoices5.jsp
    • -0
    • +138
    ./pages/monitoring/studentChoicesTable.jsp
  1. … 3 more files in changeset.
LDEV-5083 Rewrite TBL Peer Review tab to new UI

    • -3
    • +3
    ./pages/monitoring/parts/burningQuestions5.jsp
  1. … 5 more files in changeset.
LDEV-5083 Rewrite TBL Burnign Questions tab to new UI

    • -0
    • +229
    ./pages/monitoring/parts/burningQuestions5.jsp
  1. … 3 more files in changeset.
LDEV-5083 Rewrite TBL RAT tabs' modals to new UI

    • -56
    • +51
    ./pages/monitoring/studentChoices5.jsp
  1. … 2 more files in changeset.
LDEV-5083 Rewrite TBL tRAT & student choices tab to new UI

    • -0
    • +386
    ./pages/monitoring/studentChoices5.jsp
    • -0
    • +155
    ./pages/tblmonitoring/tra5.jsp
  1. … 5 more files in changeset.
LDEV-5083 Rewrite TBL Teams tab modals to new UI

    • -0
    • +44
    ./pages/tblmonitoring/teams5.jsp
  1. … 8 more files in changeset.
LDEV-5317 Fix thread preventing server from shutting down

Using <c:import> in cross-module context prevents WildFly from shutting

down properly. The mechanism was replaced with an Ajax call.

    • -7
    • +14
    ./pages/monitoring/studentChoices.jsp
  1. … 8 more files in changeset.
LDEV-5317 Move timeLimit.jsp from its own directory

  1. … 5 more files in changeset.