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
Tuesday 16 Jan 2024
1:50 am

Marcin Cieslak

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

# Conflicts:

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

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/learning/results/allquestions.jsp

# lams_tool_assessment/web/pages/learning/results/allquestions5.jsp

Options
    • -1
    • +1
    ./web/monitor.jsp
  2. … 3 more files in changeset.
Monday 15 Jan 2024
11:11 pm

Marcin Cieslak

LDEV-5440 Rewrite config files and library references

Options
    • -8
    • +8
    ./.classpath
    • -2
    • +2
    ./lams_monitoring.eml
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/dto/BranchDTO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/dto/BranchingDTO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/dto/EmailScheduleMessageJobDTO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/dto/TblGroupDTO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/quartz/job/CloseScheduleGateJob.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/quartz/job/EmailProgressMessageJob.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/quartz/job/EmailScheduleMessageJob.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/quartz/job/FinishScheduleLessonJob.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/quartz/job/OpenScheduleGateJob.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/quartz/job/StartScheduleLessonJob.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressController.java
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
  16. … 941 more files in changeset.
Sunday 14 Jan 2024
3:45 pm

Marcin Cieslak

LDEV-4014 Make "Delete" button in red when force completing backwards

Options
    • -1
    • +1
    ./web/monitor.jsp
3:00 am

Marcin Cieslak

LDEV-5401 Keep showing individual extensions after timer expires

Options
    • -1
    • +1
    ./web/timeLimit.jsp
    • -1
    • +1
    ./web/timeLimit5.jsp
Friday 12 Jan 2024
2:18 am

Andrey Balan

LDEV-5397 add placeholder to reduce blicking of the lesson name after transition page

Options
    • -4
    • +5
    ./web/WEB-INF/tags/PageLearner.tag
  2. … 33 more files in changeset.
1:37 am

Andrey Balan

LDEV-5397 Enhanced mobile experience

Options
    • -1
    • +1
    ./web/WEB-INF/tags/PageLearner.tag
  2. … 35 more files in changeset.
Thursday 11 Jan 2024
2:30 pm

Ernie Ghiglione

LDEV-5397 Enhanced mobile experience

Options
    • -1
    • +1
    ./web/WEB-INF/tags/PageLearner.tag
  2. … 31 more files in changeset.
Wednesday 10 Jan 2024
3:36 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -17
    • +23
    ./web/WEB-INF/tags/Errors5.tag
    • -6
    • +6
    ./web/WEB-INF/tags/PageLearner.tag
  3. … 62 more files in changeset.
Tuesday 09 Jan 2024
4:41 pm

Marcin Cieslak

LDEV-5436 Project-wide user sorting by last then first name

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/dto/PermissionGateDTO.java
    • -7
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -2
    • +2
    ./web/gate/gateStatus.jsp
    • -4
    • +4
    ./web/gate/openGateSingleUser.jsp
    • -1
    • +1
    ./web/grouping/viewGroups.jsp
    • -2
    • +2
    ./web/includes/javascript/monitorLesson.js
    • -3
    • +3
    ./web/tblmonitor/teams.jsp
    • -4
    • +2
    ./web/viewSequence.jsp
  10. … 142 more files in changeset.
Monday 08 Jan 2024
6:47 pm

Marcin Cieslak

LDEV-5436 Add project-wide User sorting on Java level

Options
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -7
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java
  3. … 9 more files in changeset.
Saturday 30 Dec 2023
8:23 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -6
    • +6
    ./web/WEB-INF/tags/PageLearner.tag
  2. … 31 more files in changeset.
Friday 29 Dec 2023
5:38 pm

Marcin Cieslak

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

# Conflicts:

# lams_common/db/sql/insert_lams_config_data.sql

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

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

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

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

Ernie Ghiglione

LDEV-5397 Updating labels

Options
    • -542
    • +542
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 13 more files in changeset.
Thursday 28 Dec 2023
5:09 am

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.
5:09 am

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.
4:14 am

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.
4:04 am

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
9: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.
6:46 pm

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.
4:42 pm

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
3:15 pm

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.
Saturday 16 Dec 2023
12:31 am

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.
Friday 15 Dec 2023
7: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
10: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
9: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
9: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
8: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
7: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.
4:44 am

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
7: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.