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

    • -1
    • +1
    ./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-5083 Refresh burning questions count badges along with answers

    • -122
    • +179
    ./monitoring/studentChoicesTable.jsp
  1. … 1 more file in changeset.
LDEV-5083 Add burning questions count badges next to question in tRAT

  1. … 1 more file in changeset.
LDEV-5083 Change name and icon of "Hide Student Choices" button

  1. … 6 more files in changeset.
LDEV-5083 Improve table and icons colouring

    • -4
    • +0
    ./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.

  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 Improve accessibility by allowing focus with TAB button

    • -1
    • +1
    ./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 Fix popovers and rewrite tRAT tooltips to popovers

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

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

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

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

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

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

    • -0
    • +44
    ./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.

  1. … 9 more files in changeset.
LDEV-5317 Move timeLimit.jsp from its own directory

  1. … 5 more files in changeset.
LDEV-5317 Move time limit panel to single source in monitoring

Each tool using time limits (Assessment, Scratchie, Doku, Whiteboard)

had it own code to display and operate time limits.

In preparations for time limit widget in monitoring the code was

refactored so there is single source of time limit feature.

    • -560
    • +0
    ./monitoring/parts/timeLimit.jsp
  1. … 26 more files in changeset.
LDEV-5307 Allow exact matching of VSAs

  1. … 16 more files in changeset.
LDEV-5302 Rename sysadmin role to appadmin

  1. … 181 more files in changeset.
LDEV-5291 Allow filtering question in QB search by presence in LD

  1. … 11 more files in changeset.
LDEV-5290 Prevent multiple tabs from being open on autosave

  1. … 40 more files in changeset.
LDEV-5273 Add VSA allocate button to tRAT TBL monitoring

  1. … 2 more files in changeset.
LDEV-5273 Add VSA allocation to Scratchie

  1. … 17 more files in changeset.
LDEV-4875 Fix hash code generation in Scratchie