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
Friday 20 Mar 2020
6:35 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

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

Options
    • -0
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./web/includes/javascript/monitorLesson.js
  3. … 20 more files in changeset.
Wednesday 18 Mar 2020
1:48 pm

Marcin Cieslak

LDEV-4993 Redesign Scratchie monitoring summary tab

Options
    • -14
    • +0
    ./web/css/_tblmonitor_base.scss
  2. … 8 more files in changeset.
Monday 16 Mar 2020
3:44 pm

Marcin Cieslak

LDEV-4989 Password Gate initial implementation

Options
    • -0
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
    • -13
    • +20
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -1
    • +14
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +21
    ./src/java/org/lamsfoundation/lams/monitoring/web/GateController.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/monitoring/web/form/GateForm.java
    • -0
    • +85
    ./web/gate/passwordGateContent.jsp
    • -0
    • +1
    ./web/includes/javascript/monitorLesson.js
    • -2
    • +7
    ./web/monitor.jsp
  11. … 27 more files in changeset.
Wednesday 19 Feb 2020
6:51 am

Ernie Ghiglione

LDEV-4975 Upgrade jquery to version 3.4.1

Options
    • -1
    • +1
    ./web/includes/javascript/monitorLesson.js
  2. … 16 more files in changeset.
Tuesday 18 Feb 2020
3:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -9
    • +7
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -16
    • +8
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
    • -13
    • +2
    ./web/tblmonitor/tblmonitor.jsp
    • -4
    • +4
    ./web/tblmonitor/teams.jsp
  5. … 189 more files in changeset.
Tuesday 28 Jan 2020
11:24 pm

Andrey Balan

LDEV-4953 Add missing <%@ page isErrorPage="true"%>

Options
    • -0
    • +1
    ./web/error.jsp
11:07 pm

Andrey Balan

LDEV-4951 Migrate MCQ tool to Assessment

Options
    • -0
    • +1
    ./web/error.jsp
  2. … 10 more files in changeset.
Thursday 23 Jan 2020
4:38 pm

Andrey Balan

LDEV-4954 Start now lesson in monitor using POST

Options
    • -1
    • +2
    ./web/includes/javascript/monitorLesson.js
4:23 pm

Andrey Balan

LDEV-4955 Properly disable lesson on schedule

Options
    • -3
    • +8
    ./web/includes/javascript/monitorLesson.js
    • -4
    • +0
    ./web/monitor.jsp
Wednesday 22 Jan 2020
11:40 pm

Andrey Balan

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

Options
    • -0
    • +6
    ./web/WEB-INF/web.xml
    • -1
    • +0
    ./web/login.jsp
  3. … 171 more files in changeset.
Thursday 09 Jan 2020
8:59 am

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

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

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

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

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

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

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

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

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

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

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

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

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

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

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

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

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

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

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

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

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

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

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

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

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

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

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

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

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

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

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

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

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

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

# lams_tool_scratchie/web/pages/authoring/basic.jsp

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

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

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

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

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

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

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

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

Options
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 94 more files in changeset.
Tuesday 07 Jan 2020
8:42 pm

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -68
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/web/FileUploadForm.java
    • -22
    • +9
    ./src/java/org/lamsfoundation/lams/monitoring/web/GateController.java
    • -130
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/web/GateForm.java
    • -20
    • +18
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
    • -17
    • +6
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -4
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/web/SequenceController.java
    • -14
    • +6
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
    • -0
    • +68
    ./src/java/org/lamsfoundation/lams/monitoring/web/form/FileUploadForm.java
    • -0
    • +130
    ./src/java/org/lamsfoundation/lams/monitoring/web/form/GateForm.java
    • -3
    • +2
    ./web/403.jsp
    • -3
    • +2
    ./web/404.jsp
    • -1
    • +0
    ./web/complexProgress.jsp
    • -1
    • +0
    ./web/emailnotifications/archivedEmailList.jsp
    • -1
    • +0
    ./web/emailnotifications/courseNotifications.jsp
  16. … 36 more files in changeset.
Monday 06 Jan 2020
4:09 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF to add lesson

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 2 more files in changeset.
Thursday 02 Jan 2020
2:12 pm

Ernie Ghiglione

LDEV-4932 Add CSRF to OutcomeAuthor tag

Options
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 30 more files in changeset.
1:49 am

Ernie Ghiglione

LDEV-4932 Adding CSRF to central and monitoring

Adding CSRF to:

- Grades on completion

- Enable/disable presence and IM

- Send emails

- Update users into lessons

- Send email notifications

- Delete email notifications

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressController.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -1
    • +1
    ./web/emailnotifications/courseNotifications.jsp
    • -1
    • +1
    ./web/emailnotifications/lessonNotifications.jsp
    • -2
    • +2
    ./web/emailnotifications/scheduledEmailList.jsp
    • -28
    • +37
    ./web/includes/javascript/monitorLesson.js
    • -0
    • +3
    ./web/monitor.jsp
  9. … 3 more files in changeset.
Tuesday 31 Dec 2019
7:35 pm

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

* Add CSRF protection to:

- Change lesson status (incl. remove)

- Remove lesson using main.jsp button

- Rename lesson

* Start using /common/taglibs.jsp in lams_central

Options
    • -34
    • +9
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -0
    • +70
    ./web/WEB-INF/tlds/security/csrfguard.tld
    • -0
    • +15
    ./web/WEB-INF/web.xml
    • -12
    • +9
    ./web/includes/javascript/monitorLesson.js
    • -19
    • +22
    ./web/monitor.jsp
    • -0
    • +1
    ./web/taglibs.jsp
  7. … 18 more files in changeset.
Wednesday 18 Dec 2019
11:21 pm

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -12
    • +14
    ./src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
  2. … 42 more files in changeset.
Tuesday 17 Dec 2019
11:41 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Added ids to support automated testing

Options
    • -2
    • +2
    ./web/gate/gateInfo.jsp
  2. … 1 more file in changeset.
Monday 16 Dec 2019
7:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into LDEV-4886

Options
    • -13
    • +20
    ./web/includes/javascript/monitorLesson.js
  2. … 1 more file in changeset.
Friday 06 Dec 2019
8:39 pm

Andrey Balan

LDEV-4897 Update Peerreview, Grouping servlet, Outcome controller to use new Excel exporting methods

* Improve code generating excel files. Add bold attribute to Excel rows

Options
    • -33
    • +27
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
  2. … 10 more files in changeset.
Tuesday 03 Dec 2019
8:44 pm

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

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

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

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

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

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

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties

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

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

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

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

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

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

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

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

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

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

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

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

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

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

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

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

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

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

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

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
  2. … 35 more files in changeset.
Monday 02 Dec 2019
2:06 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +22
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 118 more files in changeset.
7:09 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Adding ides to test monitor starting new lesson

Options
    • -1
    • +1
    ./web/gate/gateStatus.jsp
    • -1
    • +1
    ./web/grouping/chosenGrouping.jsp
    • -2
    • +3
    ./web/includes/javascript/monitorLesson.js
  4. … 2 more files in changeset.
Thursday 28 Nov 2019
12:28 pm

Marcin Cieslak

LDEV-4898 Fix race condition when generating a LD SVG

Options
    • -13
    • +20
    ./web/includes/javascript/monitorLesson.js
  2. … 1 more file in changeset.
Thursday 14 Nov 2019
2:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Tuesday 12 Nov 2019
9:00 pm

Marcin Cieslak

LDEV-4900 Run autosave command asynchronously after all

Synchronous approach would work only on LAMS installation with a single

application server. For multi-server environment we need to wait for the

proper server to pick up the command from DB.

Options
    • -12
    • +6
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 3 more files in changeset.
Monday 11 Nov 2019
5:06 pm

Marcin Cieslak

LDEV-4900 Trigger autosave when force completing Assessment activity

Options
    • -5
    • +29
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 5 more files in changeset.
Friday 01 Nov 2019
6:41 pm

Andrey Balan

LDEV-4897 Update Gradebook, Kumalive, and archived emails to use new Excel exporting methods

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -31
    • +23
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
  4. … 8 more files in changeset.
Thursday 31 Oct 2019
3:54 pm

Andrey Balan

LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

Options
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
  2. … 15 more files in changeset.
Wednesday 30 Oct 2019
5:35 pm

Andrey Balan

LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
  5. … 29 more files in changeset.