lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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 26 Oct 2022
1:46 pm

Marcin Cieslak

LDEV-5340 Do additional escaping for commented out properties

Controller does not understand that an example property is commented out

in JavaScript and still parses it.

Options
    • -5
    • +6
    /lams_central/web/includes/javascript/ckconfig_custom.js
Tuesday 25 Oct 2022
8:12 pm

Marcin Cieslak

LDEV-4900 Copy answers to non-leader on force complete Assessment

Options
    • -4
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
5:32 pm

Marcin Cieslak

LDEV-5340 Allow video embedding from custom sites

Options
    • -0
    • +141
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/EditorEmbedProxyController.java
    • -1
    • +17
    /lams_central/web/includes/javascript/ckconfig_custom.js
Monday 24 Oct 2022
10:56 pm

Marcin Cieslak

LDEV-5337 Add new FileUpload tag to all projects

Options
    • -0
    • +82
    /lams_admin/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +82
    /lams_gradebook/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +82
    /lams_learning/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +82
    /lams_monitoring/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +82
    /lams_tool_assessment/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +82
    /lams_tool_chat/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +82
    /lams_tool_daco/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +82
    /lams_tool_doku/web/WEB-INF/tags/FileUpload5.tag
  16. … 49 more files in changeset.
10:55 pm

Marcin Cieslak

Merge branch 'LDEV-5337' into v4.7

Options
10:50 pm

Marcin Cieslak

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

Conflicts:

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

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

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

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_admin/web/integration/ltiConsumerList.jsp

lams_admin/web/signupmanagement/list.jsp

Options
    • -0
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -3
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java
    • -0
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java
    • -1
    • +21
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java
    • -0
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java
    • -1
    • +28
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
    • -9
    • +19
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
    • -0
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java
    • -0
    • +4
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
    • -10
    • +16
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
    • -18
    • +21
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
    • -6
    • +8
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
    • -0
    • +6
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
    • -1
    • +1
    /lams_admin/web/integration/ltiConsumerList.jsp
    • -0
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
10:43 pm

Marcin Cieslak

LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

Options
    • -1
    • +0
    /lams_central/.gitignore
    • -0
    • +5
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
    • -1
    • +9
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
    • -0
    • +82
    /lams_central/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +66
    /lams_central/web/css/orgGroup.css
    • -146
    • +0
    /lams_central/web/css/orgGroup.scss
    • -0
    • +21
    /lams_central/web/includes/javascript/dialog5.js
    • -13
    • +2
    /lams_central/web/includes/javascript/main.js
    • -78
    • +49
    /lams_central/web/includes/javascript/orgGroup.js
    • -1
    • +1
    /lams_central/web/includes/javascript/orgGrouping.js
    • -1
    • +1
    /lams_central/web/includes/javascript/upload.js
    • -184
    • +207
    /lams_central/web/orgGroup.jsp
    • -35
    • +13
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
  16. … 5 more files in changeset.
2:42 am

Marcin Cieslak

Merge branch 'LDEV-5339' into v4.6

Options
2:41 am

Marcin Cieslak

LDEV-5339 Remove duplicate Signup Page delete button

Options
    • -1
    • +0
    /lams_admin/web/signupmanagement/list.jsp
Sunday 23 Oct 2022
5:25 pm

Marcin Cieslak

Merge branch 'LDEV-5335' into v4.6

Options
10:05 am

Ernie Ghiglione

LDEV-5335 Log adjustments and fixes

Options
    • -2
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
Saturday 22 Oct 2022
6:43 pm

Marcin Cieslak

LDEV-5335 Log adjustments and fixes

Options
    • -0
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java
    • -0
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java
    • -1
    • +4
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java
    • -13
    • +14
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
    • -4
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
    • -0
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/web/filter/AuditLogFilter.java
    • -11
    • +32
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Monday 17 Oct 2022
8:57 pm

Marcin Cieslak

LDEV-5336 Add table with all learners' results

Options
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -32
    • +88
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -1
    • +13
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -2
    • +7
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -2
    • +2
    /lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
    • -144
    • +171
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
6:38 pm

Marcin Cieslak

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

Conflicts:

lams_monitoring/conf/language/lams/ApplicationResources.properties

Options
    • -0
    • +2
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
Friday 14 Oct 2022
9:23 pm

Marcin Cieslak

LDEB-5335 Add structured audit logs on various admin actions

Options
    • -0
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -3
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java
    • -0
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java
    • -5
    • +25
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java
    • -1
    • +28
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
    • -8
    • +25
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java
    • -11
    • +20
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
    • -0
    • +5
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java
    • -4
    • +14
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java
    • -0
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java
    • -0
    • +4
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
    • -5
    • +10
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
    • -17
    • +20
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
    • -6
    • +9
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
    • -1
    • +7
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
  16. … 8 more files in changeset.
Thursday 13 Oct 2022
5:38 pm

Marcin Cieslak

LDEV-3115 Make sure that activity selection box is not in LD SVG

Options
    • -0
    • +2
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
5:20 pm

Marcin Cieslak

LDEV-5277 Fix course naming and enrolment issue

Options
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -2
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
4:06 pm

Marcin Cieslak

LDEV-5332 Update QB option for VSA when correct option changes

Options
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
4:02 pm

Marcin Cieslak

LDEV-5332 Add VSA support to Question Results table

In Scratchie VSA answers were not linked to corresponding QB options,

making it impossible to count correct answer. From now on if answer is

correct, it will get linked to its QB option. Old VSA lessons though

will not yield good Question Results table.

Options
    • -11
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -27
    • +35
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
Wednesday 12 Oct 2022
8:21 pm

Marcin Cieslak

LDEV-5332 Identify questions and options by display order

iRAT and tRAT activities should be based on same questions from Question

Bank, with same IDs. It is not always the case, especially when

importing exported LDs.

Now corresponding questions are identified by display order, which

should be the same in both RAT activities.

Options
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -5
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/dto/QbAnswersForOptionDTO.java
    • -36
    • +33
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
    • -20
    • +0
    /lams_monitoring/web/tblmonitor/teamsOptionResultsCell.jsp
    • -10
    • +14
    /lams_monitoring/web/tblmonitor/teamsQuestionResults.jsp
    • -23
    • +21
    /lams_monitoring/web/tblmonitor/teamsQuestionResultsCell.jsp
10:16 am

Ernie Ghiglione

LDEV-4769 Updating English (AU) and Spanish

Options
    • -0
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -4
    • +4
    /lams_tool_chat/conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    /lams_tool_chat/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_chat/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +3
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +2
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +4
    /lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
  16. … 16 more files in changeset.
Tuesday 11 Oct 2022
9:07 pm

Marcin Cieslak

LDEV-5330 Fix broken link for Cancel button

Options
    • -1
    • +1
    /lams_admin/web/sessionmaintain.jsp
8:59 pm

Marcin Cieslak

Merge branch 'LDEV-5332' into v4.7

Options
    • -1
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -3
    • +70
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
8:59 pm

Marcin Cieslak

Merge branch 'LDEV-5330' into v4.7

Options
8:58 pm

Marcin Cieslak

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

Options
    • -1
    • +34
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -1
    • +3
    /lams_admin/web/policies/policies.jsp
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -11
    • +17
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java
    • -3
    • +3
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -3
    • +18
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
8:57 pm

Marcin Cieslak

LDEV-5332 Add Question Results table in Teams tab

Options
    • -1
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -5
    • +72
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/qb/dto/QbAnswersForOptionDTO.java
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -1
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -0
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +146
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
    • -2
    • +33
    /lams_monitoring/web/tblmonitor/teams.jsp
    • -0
    • +20
    /lams_monitoring/web/tblmonitor/teamsOptionResultsCell.jsp
    • -0
    • +99
    /lams_monitoring/web/tblmonitor/teamsQuestionResults.jsp
    • -0
    • +25
    /lams_monitoring/web/tblmonitor/teamsQuestionResultsCell.jsp
Friday 07 Oct 2022
8:20 pm

Marcin Cieslak

LDEV-5178 Skip password expiration check on login via integrations

Options
    • -11
    • +17
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java
    • -1
    • +6
    /lams_central/web/login.jsp
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
Thursday 06 Oct 2022
5:45 pm

Marcin Cieslak

Merge branch 'LDEV-5334' into v4.6

Options
5:44 pm

Marcin Cieslak

Merge branch 'LDEV-5333' into v4.6

Options
5:44 pm

Marcin Cieslak

LDEV-5333 Move HTML templates from WWW to Central folder

Options
    • -3
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -0
    • +887
    /lams_central/web/templates/gradebookReleaseLessonMarksEmailTemplate.html
    • -0
    • +643
    /lams_central/web/templates/userImportPasswordChangeEmailTemplate.html
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
    • -3
    • +3
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -887
    • +0
    /lams_www/web/gradebookReleaseLessonMarksEmailTemplate.html
    • -643
    • +0
    /lams_www/web/userImportPasswordChangeEmailTemplate.html