lams-github

lams_monitoring

Clone Tools

Stats

Commits this week: 0
Total Committers: 30
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 27 Dec 2023
10:09 pm

Andrey Balan

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

Options
    • -29
    • +24
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 34 more files in changeset.
10:09 pm

Andrey Balan

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

Options
    • -29
    • +24
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 34 more files in changeset.
9:14 pm

Andrey Balan

LDEV-5425 copy-tags

Options
    • -107
    • +0
    ./web/WEB-INF/tags/Notebook.tag
    • -67
    • +0
    ./web/WEB-INF/tags/NotebookReedit.tag
    • -4
    • +1
    ./web/WEB-INF/tags/PageLearner.tag
    • -71
    • +10
    ./web/WEB-INF/tags/SubmissionDeadline.tag
    • -8
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
  6. … 154 more files in changeset.
9:04 pm

Andrey Balan

LDEV-5425 Remove "End of activity" notebook from *all* tools

Options
    • -29
    • +24
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 519 more files in changeset.
Thursday 21 Dec 2023
2:02 pm

Marcin Cieslak

LDEV-5431 Do not remove from groups and leaders on "Keep content"

Options
    • -21
    • +24
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 2 more files in changeset.
11:46 am

Marcin Cieslak

LDEV-5401 Display individual extensions in time limit widget

Options
    • -0
    • +31
    ./web/timeLimit.jsp
    • -2
    • +32
    ./web/timeLimit5.jsp
  3. … 4 more files in changeset.
9:42 am

Marcin Cieslak

LDEV-5431 Reset activity completion on force uncomplete in Monitor

Options
    • -542
    • +542
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +9
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  4. … 36 more files in changeset.
Monday 18 Dec 2023
8:15 am

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.7' into LDEV-5397

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_admin/web/timezoneManagement.jsp

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_doku/conf/language/lams/ApplicationResources.properties

# lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_de_DE.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_de_DE.properties

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_survey/conf/language/lams/ApplicationResources_de_DE.properties

# lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties

# lams_tool_whiteboard/conf/language/lams/ApplicationResources_en_AU.properties

Options
    • -1
    • +1
    ./web/css/components-monitoring.css
  2. … 9 more files in changeset.
Friday 15 Dec 2023
5:31 pm

Andrey Balan

LDEV-5397 copy-tags

Options
    • -2
    • +1
    ./web/WEB-INF/tags/Comments.tag
    • -11
    • +10
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -1
    • +1
    ./web/WEB-INF/tags/Notebook.tag
    • -133
    • +163
    ./web/WEB-INF/tags/PageLearner.tag
    • -2
    • +2
    ./web/WEB-INF/tags/Rating5.tag
  6. … 154 more files in changeset.
12:05 pm

Marcin Cieslak

LDEV-5426 Switch from custom time zones to built-in Java ones

Options
    • -0
    • +7
    ./lkc_monitoring.eml
    • -0
    • +2
    ./lkc_monitoring.iml
    • -0
    • +111
    ./web/allQuestionsList.jsp
    • -0
    • +72
    ./web/assessmentAnswers.jsp
  5. … 37 more files in changeset.
Wednesday 13 Dec 2023
3:36 pm

Marcin Cieslak

LDEV-5402 Fix LD path building on Monitoring page

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
2:54 pm

Marcin Cieslak

LDEV-5402 Fix LD path building on Monitoring page

Options
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
Friday 01 Dec 2023
2:01 pm

Marcin Cieslak

LDEV-5083 Fix scrolling of wide LDs in monitoring

Options
    • -12
    • +12
    ./web/css/components-monitoring.css
Thursday 23 Nov 2023
1:09 pm

Marcin Cieslak

LDEV-5423 Complete Flux on all subscriptions terminated

Also:

* use separate and configurable task executor for async requests

* introduce backlog pressure strategy for Fluxes

* synchronise access to Flux mapping

* add logs

Options
    • -4
    • +12
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 3 more files in changeset.
Wednesday 22 Nov 2023
12:26 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -7
    • +3
    ./web/WEB-INF/tags/PageLearner.tag
    • -3
    • +3
    ./web/WEB-INF/tags/StyledRating5.tag
  3. … 62 more files in changeset.
Tuesday 21 Nov 2023
9:44 pm

Andrey Balan

LDEV-5397 import bootstrap5.scss into components.scss

* Subsequently import components.scss into components-learner.scss

* It will allow using bootstrap5 CSS rules in components CSS classes

Options
    • -1
    • +1
    ./web/emailnotifications/archivedEmailList5.jsp
    • -1
    • +1
    ./web/emailnotifications/lessonNotifications5.jsp
    • -1
    • +1
    ./web/emailnotifications/scheduledEmailList5.jsp
    • -1
    • +1
    ./web/gate/permissionGateContent.jsp
    • -3
    • +2
    ./web/grouping/viewGroups.jsp
    • -4
    • +3
    ./web/monitor.jsp
  7. … 44 more files in changeset.
Thursday 16 Nov 2023
12:31 am

Marcin Cieslak

LDEV-5397 Reintroduce websocket library to Page tag

Options
    • -0
    • +3
    ./web/WEB-INF/tags/PageLearner.tag
  2. … 36 more files in changeset.
12:28 am

Marcin Cieslak

Merge v4.7 into LDEV-5397

Options
    • -97
    • +45
    ./web/WEB-INF/tags/Page5.tag
    • -1
    • +1
    ./web/css/components-monitoring.css
    • -2693
    • +2706
    ./web/includes/javascript/monitorLesson.js
    • -5
    • +3
    ./web/monitor.jsp
  5. … 76 more files in changeset.
Tuesday 07 Nov 2023
11:42 pm

Andrey Balan

LDEV-5397 copy-tags

Options
    • -2
    • +2
    ./web/WEB-INF/tags/Alert5.tag
    • -15
    • +12
    ./web/WEB-INF/tags/NotebookReedit.tag
    • -12
    • +6
    ./web/WEB-INF/tags/Rating5.tag
    • -4
    • +4
    ./web/WEB-INF/tags/StyledRating5.tag
  5. … 123 more files in changeset.
Monday 06 Nov 2023
2:59 pm

Marcin Cieslak

LDEV-5404 Fix a typo in expired time limit

Options
    • -1
    • +1
    ./web/timeLimit.jsp
Saturday 28 Oct 2023
9:04 pm

Marcin Cieslak

LDEV-5260 Do not eagerly close canvas refresh Flux

Do timer Flux clean up instead

Options
    • -6
    • +26
    ./web/includes/javascript/monitorLesson.js
Friday 27 Oct 2023
1:17 pm

Marcin Cieslak

LDEV-5260 Fix multiple timers Flux

Options
    • -6
    • +44
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -0
    • +3
    ./web/includes/javascript/monitorLesson.js
  3. … 1 more file in changeset.
Thursday 26 Oct 2023
6:18 pm

Andrey Balan

LDEV-5397 copy-tags

Options
    • -7
    • +17
    ./web/WEB-INF/tags/Alert5.tag
    • -36
    • +60
    ./web/WEB-INF/tags/PageLearner.tag
    • -1
    • +1
    ./web/WEB-INF/tags/WaitForLeader.tag
  4. … 87 more files in changeset.
Tuesday 24 Oct 2023
12:30 pm

Marcin Cieslak

LDEV-5200 Send AEs possibly long data as POST and not GET

Options
    • -40
    • +42
    ./web/includes/javascript/monitorLesson.js
Wednesday 18 Oct 2023
6:13 pm

Marcin Cieslak

LDEV-5341 Skip privileges when starting lesson via Quartz Job

Links to

https://lamssupport.atlassian.net/browse/LKC-154

Options
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/monitoring/quartz/job/StartScheduleLessonJob.java
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  3. … 1 more file in changeset.
Monday 16 Oct 2023
5:31 pm

Andrey Balan

LDEV-5397 free.ui.jqgrid.min.css is now included in free.ui.jqgrid.custom.css

Therefore pages need to reference only one .css file (free.ui.jqgrid.custom.css) instead of two as it used to be.

Options
    • -2
    • +1
    ./web/emailnotifications/archivedEmailList5.jsp
    • -2
    • +1
    ./web/emailnotifications/lessonNotifications5.jsp
    • -1
    • +0
    ./web/monitor.jsp
  4. … 4 more files in changeset.
Wednesday 11 Oct 2023
1:37 pm

Marcin Cieslak

LDEV-5407 Show "return to index" link only for non-integrated courses

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -2
    • +2
    ./web/monitor.jsp
Tuesday 10 Oct 2023
11:21 pm

Andrey Balan

LDEV-5397 copy-tags

Options
    • -8
    • +14
    ./web/WEB-INF/tags/CKEditor.tag
    • -29
    • +28
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +1
    ./web/WEB-INF/tags/DefineLater.tag
    • -28
    • +30
    ./web/WEB-INF/tags/Notebook.tag
    • -2
    • +2
    ./web/WEB-INF/tags/NotebookReedit.tag
    • -7
    • +8
    ./web/WEB-INF/tags/PageLearner.tag
    • -2
    • +2
    ./web/WEB-INF/tags/Rating5.tag
    • -1
    • +1
    ./web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +2
    ./web/WEB-INF/tags/WaitForLeader.tag
  10. … 275 more files in changeset.
Thursday 05 Oct 2023
1:28 am

Andrey Balan

LDEV-5397 some interim UI changes to monitor and jqGrid

Options
    • -0
    • +8
    ./web/css/components-monitoring.css
    • -1
    • +1
    ./web/monitor-learners-tab.jsp
    • -12
    • +12
    ./web/monitor.jsp
  4. … 3 more files in changeset.
Wednesday 04 Oct 2023
1:29 pm

Marcin Cieslak

LDEV-4602 Add Close button on timer screen

Options
    • -220
    • +221
    ./web/timer.jsp