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 11 Apr 2023
3:00 am

Marcin Cieslak

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

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

Options
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java
  2. … 6 more files in changeset.
Friday 07 Apr 2023
7:55 pm

Marcin Cieslak

LDEV-5350 Do not remove groups used for branching on spreadsheet upload

Options
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
  2. … 1 more file in changeset.
Monday 06 Mar 2023
10:27 pm

Marcin Cieslak

LDEV-5370 Make 0.5 score column in rubrics configurable in authoring

Options
    • -5
    • +10
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 41 more files in changeset.
6:59 pm

Marcin Cieslak

LDEV-5370 Add 0.5 score column in rubrics criteria in Peer Review

Options
    • -4
    • +78
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 36 more files in changeset.
Monday 27 Feb 2023
5:53 pm

Marcin Cieslak

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

Conflicts:

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java

Options
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -158
    • +9
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
  3. … 11 more files in changeset.
Friday 24 Feb 2023
11:34 pm

Marcin Cieslak

LDEV-5363 Remove duplicate method

Options
    • -86
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
Friday 10 Feb 2023
12:31 am

Marcin Cieslak

LDEV-5363 Add TBL course gradebook export

Options
    • -80
    • +15
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
  2. … 8 more files in changeset.
Monday 30 Jan 2023
11:53 pm

Marcin Cieslak

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

Conflicts:

lams_admin/web/userChangePass.jsp

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_central/web/WEB-INF/web.xml

lams_central/web/authoring/authoring.jsp

lams_central/web/authoring/svgGenerator.jsp

lams_central/web/extGroups.jsp

lams_central/web/orgGroup.jsp

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

lams_monitoring/web/grouping/chosenGrouping.jsp

Options
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java
    • -18
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java
    • -3
    • +3
    ./web/WEB-INF/tags/Page.tag
  4. … 42 more files in changeset.
11:37 pm

Marcin Cieslak

LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

Options
    • -3
    • +3
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +2
    ./web/grouping/chosenGrouping.jsp
    • -10
    • +10
    ./web/timeLimit.jsp
  4. … 50 more files in changeset.
Saturday 28 Jan 2023
8:20 pm

Marcin Cieslak

LDEV-5358 Always sort groups by name, case insensitive

Options
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/monitoring/dto/TblGroupDTO.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
    • -18
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
  4. … 6 more files in changeset.
1:14 am

Marcin Cieslak

# WARNING: head commit changed in the meantime

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

Options
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java
  2. … 8 more files in changeset.
Wednesday 25 Jan 2023
10:08 pm

Marcin Cieslak

LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

Options
    • -2
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 37 more files in changeset.
Saturday 21 Jan 2023
4:08 pm

Marcin Cieslak

LDEV-4341 Always save org grouping to top course

Options
    • -9
    • +15
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
Thursday 19 Jan 2023
7:32 pm

Marcin Cieslak

LDEV-5200, LKC-114 Reset Flux updating student choices on AE tab change

Options
    • -0
    • +3
    ./web/tblmonitor/aes.jsp
7:24 pm

Marcin Cieslak

LDEV-5200 Always load student choices by default in AE monitoring view

Options
    • -4
    • +4
    ./web/tblmonitor/aes.jsp
Thursday 12 Jan 2023
7:14 pm

Ernie Ghiglione

LDEV-5345 Updating English, Spanish, German, Greek

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 9 more files in changeset.
Saturday 07 Jan 2023
1:20 am

Marcin Cieslak

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

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 9 more files in changeset.
Thursday 05 Jan 2023
8:49 pm

Marcin Cieslak

LDEV-5354 Rename encoding methods so they can incorporate course ID

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 2 more files in changeset.
6:46 pm

Marcin Cieslak

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

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

Options
    • -0
    • +19
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 12 more files in changeset.
Wednesday 04 Jan 2023
6:34 pm

Marcin Cieslak

LDEV-5200 Fix Edit Class dialog role extraction from HTML structure

Options
    • -2
    • +3
    ./web/includes/javascript/monitorLesson.js
Tuesday 03 Jan 2023
7:16 pm

Marcin Cieslak

LDEV-5200 Add redirect in case integrations uses TBL monitoring URL

Options
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
Friday 30 Dec 2022
3:53 am

Marcin Cieslak

LDEV-5200 Fix learner search and search clear

Options
    • -5
    • +0
    ./web/includes/javascript/monitorLesson.js
1:01 am

Marcin Cieslak

LDEV-5200 Fix learner search and search clear

Options
    • -5
    • +9
    ./web/includes/javascript/monitorLesson.js
12:39 am

Marcin Cieslak

LDEV-5200 Add completed activities and lesson info on learners tab

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +13
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -0
    • +4
    ./web/css/components-monitoring.css
    • -8
    • +10
    ./web/includes/javascript/monitorLesson.js
    • -4
    • +10
    ./web/monitor-learners-tab.jsp
Friday 23 Dec 2022
8:05 pm

Marcin Cieslak

LDEV-5350 Fix issue with detecting groupings in LD

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  3. … 1 more file in changeset.
Thursday 22 Dec 2022
11:26 pm

Marcin Cieslak

LDEV-5350 Detect grouping on LD choice in Add Lesson dialog

Options
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 4 more files in changeset.
Monday 19 Dec 2022
8:39 pm

Marcin Cieslak

LDEV-5350 Add Course Grouping selection to Add Lesson dialog

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  3. … 9 more files in changeset.
Sunday 18 Dec 2022
1:02 am

Ernie Ghiglione

LDEV-5345 Updating Greek

Options
    • -9
    • +9
    ./conf/language/lams/ApplicationResources_el_GR.properties
Saturday 17 Dec 2022
9:21 pm

Marcin Cieslak

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

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_central/web/includes/javascript/orgGroup.js

lams_central/web/orgGroup.jsp

lams_central/web/orgGrouping.jsp

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java
    • -1
    • +15
    ./web/WEB-INF/web.xml
  3. … 5 more files in changeset.
8:24 pm

Marcin Cieslak

LDEV-3119 Any org super user can edit course groupings

Till now only Course Manager could edit Course Groupings. It is an

unnecessary limitation. Plus integrations set only monitor and author

roles in course, never course manager. And some universities would like

to be able to work with course groupings.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
    • -1
    • +15
    ./web/WEB-INF/web.xml
  3. … 5 more files in changeset.