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 09 Apr 2024
7:16 am

Andrey Balan

Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/summary.jsp

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

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

# lams_tool_leader/web/pages/monitoring/summary.jsp

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

Options
    • -1
    • +1
    ./web/grouping/viewGroups.jsp
    • -8
    • +8
    ./web/includes/javascript/monitorLesson.js
    • -58
    • +66
    ./web/monitor.jsp
    • -3
    • +3
    ./web/tblmonitor/teams.jsp
  5. … 27 more files in changeset.
Friday 05 Apr 2024
7:12 pm

Marcin Cieslak

LDEV-5440 Use version 3 of JSP and JSTL and their schemas

Make IntelliJ understand the Web aspect of LAMS projects.

Options
    • -0
    • +2
    ./.classpath
    • -2
    • +4
    ./lams_monitoring.eml
    • -1
    • +17
    ./lams_monitoring.iml
    • -7
    • +0
    ./lkc_monitoring.eml
    • -2
    • +0
    ./lkc_monitoring.iml
    • -4
    • +3
    ./web/WEB-INF/tags/AdvancedAccordian.tag
    • -2
    • +2
    ./web/WEB-INF/tags/Alert.tag
    • -2
    • +2
    ./web/WEB-INF/tags/Alert5.tag
    • -4
    • +4
    ./web/WEB-INF/tags/Arrow.tag
    • -2
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -3
    • +3
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -3
    • +3
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -3
    • +3
    ./web/WEB-INF/tags/CKEditor.tag
    • -3
    • +3
    ./web/WEB-INF/tags/Comments.tag
    • -5
    • +3
    ./web/WEB-INF/tags/CommentsAuthor.tag
  16. … 2088 more files in changeset.
Tuesday 02 Apr 2024
2:35 pm

Marcin Cieslak

LDEV-5440 Do not use deprecated constructors of Double and Boolean

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java
  2. … 34 more files in changeset.
Monday 01 Apr 2024
3:28 am

Marcin Cieslak

LDEV-5440 Reintroduce more strict security rules in web.xml

Options
    • -1
    • +1
    ./web/WEB-INF/web.xml
  2. … 38 more files in changeset.
Sunday 31 Mar 2024
8:32 pm

Marcin Cieslak

LDEV-5440 Replace deprecated Long constructor

Options
    • -18
    • +18
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -8
    • +8
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  3. … 115 more files in changeset.
7:31 pm

Marcin Cieslak

LDEV-5440 Fix file uploads

Options
    • -1
    • +1
    ./web/WEB-INF/web.xml
  2. … 38 more files in changeset.
Wednesday 27 Mar 2024
6:54 pm

Marcin Cieslak

LDEV-5440 Fix multipart config in web.xml files

Options
    • -1
    • +2
    ./web/WEB-INF/web.xml
  2. … 35 more files in changeset.
Wednesday 20 Mar 2024
7:30 pm

Marcin Cieslak

LDEV-5440 Update web.xml version

Options
    • -4
    • +4
    ./web/WEB-INF/web.xml
  2. … 40 more files in changeset.
4:56 pm

Marcin Cieslak

LDEV-5440 Update code to match dependencies

In particular javax -> jakarta package change and new JPA not accepting some attributes.

Options
    • -3
    • +3
    ./web/WEB-INF/tlds/jstl/c.tld
    • -2
    • +2
    ./web/WEB-INF/tlds/jstl/fmt.tld
    • -2
    • +2
    ./web/WEB-INF/tlds/jstl/permittedTaglibs.tld
    • -2
    • +2
    ./web/WEB-INF/tlds/jstl/scriptfree.tld
    • -2
    • +2
    ./web/WEB-INF/tlds/jstl/x.tld
    • -1
    • +1
    ./web/WEB-INF/web.xml
  7. … 218 more files in changeset.
Friday 15 Mar 2024
9:44 pm

Marcin Cieslak

LDEV-5083 Don't show lesson status changer if it was Removed

Options
    • -2
    • +4
    ./web/includes/javascript/monitorLesson.js
    • -58
    • +66
    ./web/monitor.jsp
Wednesday 13 Mar 2024
9:29 pm

Marcin Cieslak

LDEV-5200 Prevent 4th learner icon from going under counter circle

Options
    • -1
    • +1
    ./web/includes/javascript/monitorLesson.js
  2. … 1 more file in changeset.
Friday 08 Mar 2024
4:01 am

Andrey Balan

LDEV-5424 abandon tabbed monitoring interface in favor of the breadcrumbs

* Remove dots from the analytics chart as per Ernie's request

Options
    • -1
    • +1
    ./web/timeLimit.jsp
  2. … 13 more files in changeset.
Wednesday 06 Mar 2024
7:49 pm

Ernie Ghiglione

LDEV-5397 Updating labels Greek, Spanish

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_es_ES.properties
  3. … 5 more files in changeset.
Saturday 02 Mar 2024
5:47 am

Andrey Balan

LDEV-5424 introduce new variation of monitoring interface. Assessment tool

Options
    • -1
    • +1
    ./web/timeLimit.jsp
  2. … 7 more files in changeset.
Thursday 29 Feb 2024
10:35 pm

Marcin Cieslak

LDEV-5436 Add comma in usernames in various places

Options
    • -5
    • +3
    ./web/includes/javascript/monitorLesson.js
  2. … 2 more files in changeset.
10:25 pm

Ernie Ghiglione

LDEV-5397 Updating labels Greek, Spanish, English

Options
    • -4
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 19 more files in changeset.
7:32 pm

Marcin Cieslak

Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

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

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

Options
    • -9
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -1
    • +1
    ./web/gate/gateStatus.jsp
    • -2
    • +2
    ./web/includes/javascript/monitorLesson.js
  5. … 31 more files in changeset.
7:17 pm

Marcin Cieslak

LDEV-5436 Use comma as name separator

Also fix names in few other places.

Options
    • -6
    • +15
    ./src/java/org/lamsfoundation/lams/monitoring/web/GateController.java
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java
  3. … 7 more files in changeset.
4:25 am

Andrey Balan

LDEV-5424 update to RestrictedUsageAccordian.tag and copy-tags

Options
    • -12
    • +35
    ./web/WEB-INF/tags/PageMonitor.tag
    • -4
    • +7
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
  3. … 61 more files in changeset.
4:12 am

Andrey Balan

Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_admin/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/includes/javascript/rating5.js

# lams_gradebook/web/WEB-INF/tags/PageLearner.tag

# lams_learning/web/WEB-INF/tags/PageLearner.tag

# lams_learning/web/css/components-learner.scss

# lams_monitoring/web/WEB-INF/tags/PageLearner.tag

# lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag

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

# lams_tool_assessment/web/pages/monitoring/monitoring.jsp

# lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/statisticpart.jsp

# lams_tool_chat/web/WEB-INF/tags/PageLearner.tag

# lams_tool_daco/web/WEB-INF/tags/PageLearner.tag

# lams_tool_doku/web/WEB-INF/tags/PageLearner.tag

# lams_tool_forum/web/WEB-INF/tags/PageLearner.tag

# lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag

# lams_tool_images/web/WEB-INF/tags/PageLearner.tag

# lams_tool_images/web/pages/learning/parts/commentsarea.jsp

# lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag

# lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_leader/web/WEB-INF/tags/PageLearner.tag

# lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag

# lams_tool_nb/web/WEB-INF/tags/PageLearner.tag

# lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag

# lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag

# lams_tool_preview/web/WEB-INF/tags/PageLearner.tag

# lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag

# lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag

# lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag

# lams_tool_survey/web/WEB-INF/tags/PageLearner.tag

# lams_tool_task/web/WEB-INF/tags/PageLearner.tag

# lams_tool_vote/web/WEB-INF/tags/PageLearner.tag

# lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag

# lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag

# lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag

# lams_www/web/WEB-INF/tags/PageLearner.tag

Options
    • -3
    • +6
    ./web/includes/javascript/monitorLesson.js
    • -2
    • +2
    ./web/monitor.jsp
  3. … 12 more files in changeset.
Wednesday 28 Feb 2024
5:43 am

Andrey Balan

LDEV-5445 proper support for mode="teacher" (which is open learning interface from monitoring)

* Hide PageLearner's header if mode="teacher"

Options
    • -9
    • +11
    ./web/WEB-INF/tags/PageLearner.tag
  2. … 52 more files in changeset.
Friday 23 Feb 2024
4:57 am

Andrey Balan

LDEV-5424 wrap timelimit widget with an accordion

Options
    • -7
    • +10
    ./web/timeLimit.jsp
  2. … 1 more file in changeset.
Tuesday 20 Feb 2024
8:53 pm

Marcin Cieslak

LDEV-5440 Further code upgrade to conform new WF libraries

Options
    • -28
    • +23
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
  2. … 61 more files in changeset.
7:14 pm

Marcin Cieslak

LDEV-5440 Update Hibernate queries with new syntax

Get rid of deprecated Long and Integer constructors.

Options
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  3. … 85 more files in changeset.
6:32 pm

Marcin Cieslak

LDEV-5440 Use WF 31 Final instead of Beta

Options
    • -1
    • +1
    ./.classpath
  2. … 70 more files in changeset.
Friday 16 Feb 2024
4:49 am

Andrey Balan

LDEV-5424 improvements to TBL monitor pages

Options
    • -3
    • +7
    ./web/monitor.jsp
    • -11
    • +6
    ./web/tblmonitor/aes.jsp
    • -67
    • +63
    ./web/tblmonitor/teams.jsp
    • -3
    • +2
    ./web/tblmonitor/teamsQuestionResults.jsp
    • -2
    • +1
    ./web/tblmonitor/teamsQuestionResultsCell.jsp
    • -55
    • +63
    ./web/timeLimit.jsp
  7. … 1 more file in changeset.
4:30 am

Andrey Balan

LDEV-5424 remove scriptlets as they are not permitted inside tags (PageMonitor.tag)

Options
    • -1
    • +1
    ./web/emailnotifications/courseNotifications.jsp
    • -1
    • +1
    ./web/emailnotifications/lessonNotifications.jsp
    • -1
    • +1
    ./web/emailnotifications/lessonNotifications5.jsp
  4. … 1 more file in changeset.
Thursday 15 Feb 2024
7:25 pm

Marcin Cieslak

LDEV-4601 Fix lesson scheduling

Options
    • -3
    • +6
    ./web/includes/javascript/monitorLesson.js
Tuesday 13 Feb 2024
6:12 pm

Marcin Cieslak

LDEV-5096 Move Close Gate button up

Some teachers think it is a Close Dialog button and get confused.

Options
    • -13
    • +12
    ./web/gate/gateStatus.jsp
Friday 09 Feb 2024
6:06 am

Andrey Balan

LDEV-5424 copy-tags

Options
    • -12
    • +12
    ./web/WEB-INF/tags/AdvancedAccordian.tag
    • -0
    • +84
    ./web/WEB-INF/tags/PageAdmin.tag
    • -2
    • +2
    ./web/WEB-INF/tags/PageLearner.tag
    • -0
    • +146
    ./web/WEB-INF/tags/PageMonitor.tag
    • -15
    • +48
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
    • -2
    • +6
    ./web/WEB-INF/tlds/lams/lams.tld
  7. … 186 more files in changeset.