lams-github

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

    • -1
    • +30
    /lams_build/conf/slim/standalone.xml
LDEV-5304 Silence chatty CSRF logs

LDEV-5083 Reduce empty spaces on TBL pages

    • -1
    • +1
    /lams_monitoring/web/tblmonitor/aes5.jsp
LDEV-5083 Add missing custom JSP tags

    • -0
    • +45
    /lams_admin/web/WEB-INF/tags/Input.tag
    • -0
    • +46
    /lams_admin/web/WEB-INF/tags/Switch.tag
    • -0
    • +45
    /lams_central/web/WEB-INF/tags/Input.tag
    • -0
    • +46
    /lams_central/web/WEB-INF/tags/Switch.tag
    • -0
    • +45
    /lams_gradebook/web/WEB-INF/tags/Input.tag
    • -0
    • +46
    /lams_gradebook/web/WEB-INF/tags/Switch.tag
    • -0
    • +45
    /lams_learning/web/WEB-INF/tags/Input.tag
    • -0
    • +46
    /lams_learning/web/WEB-INF/tags/Switch.tag
    • -0
    • +45
    /lams_tool_assessment/web/WEB-INF/tags/Input.tag
    • -0
    • +46
    /lams_tool_assessment/web/WEB-INF/tags/Switch.tag
    • -0
    • +45
    /lams_tool_chat/web/WEB-INF/tags/Input.tag
    • -0
    • +46
    /lams_tool_chat/web/WEB-INF/tags/Switch.tag
    • -0
    • +45
    /lams_tool_daco/web/WEB-INF/tags/Input.tag
    • -0
    • +46
    /lams_tool_daco/web/WEB-INF/tags/Switch.tag
    • -0
    • +45
    /lams_tool_doku/web/WEB-INF/tags/Input.tag
  1. … 49 more files in changeset.
LDEV-5320 Add audit logs on role check failure

LDEV-5083 Add missing custom JSP tags to TLD

    • -0
    • +8
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +8
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +8
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +8
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +8
    /lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +8
    /lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +8
    /lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +8
    /lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +8
    /lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +8
    /lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
  1. … 18 more files in changeset.
LDEV-4995 Add missing course manager role info at course edit screen

    • -3
    • +10
    /lams_admin/web/organisation/list.jsp
Merge remote-tracking branch 'origin/v4.6' into v4.7

    • -1
    • +22
    /lams_build/conf/slim/standalone.xml
Merge branch 'LDEV-5083' into v4.7

LDEV-5083 Fix popovers and rewrite tRAT tooltips to popovers

    • -2
    • +2
    /lams_admin/web/WEB-INF/tags/Popover.tag
  1. … 22 more files in changeset.
LDEV-5083 Hide student search widget on tabs where it can not be used

LDEV-5083 Remember last opened tab when refreshing

LDEV-5083 Fix gates buttons on Sequence tab

    • -207
    • +1264
    /lams_monitoring/web/css/components-monitoring.css
LDEV-5083 Update all data on tRAT student choices using Flux

    • -0
    • +16
    /lams_tool_scratchie/web/WEB-INF/web.xml
LDEV-5083 Update all data on AE Assessment student choices using Flux

LDEV-5083 Update all data on iRAT student choices using Flux

LDEV-5083 Hide tour button for now

    • -0
    • +2
    /lams_gradebook/web/gradebookMonitorContent5.jsp
LDEV-5083 Fix authoring embedded CSS

    • -6
    • +7
    /lams_central/web/css/authoring-svg.css
LDEV-5083 Prevent WF from freezing on shutdown because of unclosed Flux

Open Fluxes prevent WF from shutting down as they are threads not

managed by the server lifecycle.

Now we force complete Sinks on Spring context destroy. It closes

underlying Flux threads.

The problem is that it occurs when most Spring beans are already

destroyed. Fluxes on close want to emit a signal to front end

subscribers. Spring tries to reinitialise controllers which should send

those signals. It fails as context basically does not exist anymore.

All in all we get some harmless errors on server shutdown.

The way to avoid would be to have more control over Spring bean destroy

order which does not seem easily achievable.

LDEV-5083 Prevent WF from freezing on shutdown because of c:import use

LDEV-5083 Rewrite TBL Peer Review tab to new UI

    • -1265
    • +207
    /lams_monitoring/web/css/components-monitoring.css
    • -0
    • +207
    /lams_tool_preview/web/pages/monitoring/summary5.jsp
LDEV-5083 Rewrite TBL Burnign Questions tab to new UI

LDEV-5083 Rewrite TBL RAT tabs' modals to new UI

LDEV-5083 Rewrite TBL tRAT & student choices tab to new UI

    • -0
    • +386
    /lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp
LDEV-5083 Rewrite TBL Doku AES tab to new UI

    • -0
    • +19
    /lams_central/web/css/jquery.tablesorter.pager5.css
    • -0
    • +587
    /lams_tool_doku/web/pages/monitoring/summary5.jsp
LDEV-5083 Rewrite TBL Assessment AES disclose and discussion element

    • -0
    • +297
    /lams_learning/web/discussion/monitor5.jsp
    • -0
    • +4
    /lams_monitoring/web/css/components-monitoring.css
LDEV-5083 Rewrite TBL Assessment AES tab to new UI

    • -0
    • +87
    /lams_monitoring/web/tblmonitor/aes5.jsp
LDEV-5320 rename output file

LDEV-5083 Add iRAT student choices button to main navigation bar

LDEV-5083 Rewrite TBL iRAT student choices and time limit tab to new UI

    • -1
    • +1
    /lams_monitoring/web/css/components-monitoring.css
    • -0
    • +709
    /lams_monitoring/web/timeLimit5.jsp
    • -0
    • +462
    /lams_tool_assessment/web/includes/javascript/chart5.js
    • -0
    • +122
    /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices5.jsp