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
Saturday 08 Feb 2020
5:18 am

Andrey Balan

Merge branch 'master' into v4.0

Options
    • -1
    • +0
    /lams_central/conf/security/Owasp.CsrfGuard.properties
5:17 am

Andrey Balan

LDEV-4932 No need to protect /admin/user/remove.do, as it simply shows another jsp page

Options
    • -2
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
    • -2
    • +8
    /lams_admin/web/remove.jsp
    • -13
    • +12
    /lams_admin/web/userlist.jsp
    • -1
    • +0
    /lams_central/conf/security/Owasp.CsrfGuard.properties
4:38 am

Andrey Balan

LDEV-4965 Avoid reseting lessonFinishUrl on saving ltiConsumer

Options
    • -7
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
    • -0
    • +10
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
    • -3
    • +3
    /lams_admin/web/integration/ltiConsumer.jsp
Friday 07 Feb 2020
9:57 pm

Andrey Balan

LDEV-4964 Let learners access LTI deep linking lesson prior to teacher

Options
    • -4
    • +21
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -10
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
9:57 pm

Andrey Balan

LDEV-4964 Let learners access LTI deep linking lesson prior to teacher

(cherry picked from commit dfe7f83f0d8544622cfd3e30484158ec43610cce)

Options
    • -4
    • +21
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -10
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
6:21 am

Andrey Balan

LDEV-4946 Display control buttons again

Options
    • -7
    • +10
    /lams_central/web/lti/addLesson.jsp
Thursday 06 Feb 2020
8:50 pm

Marcin Cieslak

LKC-225 Add configuration settings for Workflow Automation

Options
    • -0
    • +5
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -5
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
8:00 pm

Marcin Cieslak

LDEV-4963 Allow learner access to some authoring image upload URLs

Options
    • -0
    • +3
    /lams_tool_images/web/WEB-INF/web.xml
4:45 pm

Marcin Cieslak

Merge branch 'LDEV-4963' into v4.0

Options
4:45 pm

Marcin Cieslak

LDEV-4963 Fix CSRF token for multipart/form-data form

Options
    • -2
    • +2
    /lams_tool_images/web/pages/authoring/parts/addimage.jsp
4:33 pm

Marcin Cieslak

LDEV-4962 Fix portraits with complex UUIDs

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/portrait.js
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -4
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -2
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
1:53 am

Marcin Cieslak

LDEV-4962 Fix portraits with complex UUIDs

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/portrait.js
    • -3
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
Wednesday 05 Feb 2020
2:10 pm

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -0
    • +2
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java
    • -5
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -1
    • +1
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java
    • -1
    • +1
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java
    • -8
    • +5
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumUserDao.java
    • -1
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java
    • -42
    • +34
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -44
    • +40
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java
    • -3
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaUsrResp.java
    • -31
    • +24
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
    • -6
    • +4
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/VisitLogDTO.java
    • -8
    • +10
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java
    • -2
    • +2
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java
    • -88
    • +80
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
  16. … 11 more files in changeset.
2:10 pm

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Conflicts:

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -0
    • +2
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java
    • -5
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -1
    • +1
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java
    • -1
    • +1
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java
    • -8
    • +5
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumUserDao.java
    • -1
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java
    • -42
    • +34
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -3
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java
    • -3
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaUsrResp.java
    • -31
    • +24
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
    • -6
    • +4
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/VisitLogDTO.java
    • -8
    • +10
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java
    • -2
    • +2
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java
    • -88
    • +80
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
  16. … 11 more files in changeset.
6:51 am

Andrey Balan

Merge branch 'master' into v4.0

Options
6:48 am

Andrey Balan

LDEV-4876 Take into account useAlternativeUseridParameterName LTI server setting when creating users using membership service

Options
    • -2
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
Tuesday 04 Feb 2020
11:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Options
    • -8
    • +13
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
    • -3
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserForm.java
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitActionForm.java
    • -3
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java
    • -5
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
    • -20
    • +27
    /lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
    • -4
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/NodeKey.java
    • -5
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java
    • -0
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200204.sql
    • -9
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
    • -6
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -7
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
  16. … 21 more files in changeset.
11:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

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

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

Options
    • -8
    • +13
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
    • -3
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserForm.java
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitActionForm.java
    • -3
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java
    • -5
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
    • -20
    • +27
    /lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
    • -14
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java
    • -4
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/NodeKey.java
    • -5
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java
    • -0
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200204.sql
    • -9
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
    • -6
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  16. … 24 more files in changeset.
3:43 am

Andrey Balan

LDEV-4875 Don't allocate answers with different letter case (if question is case-insensitive)

Options
    • -1
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Monday 03 Feb 2020
1:13 pm

Marcin Cieslak

LDEV-4958 Set content folder ID in form when creating a QB question

Options
    • -0
    • +1
    /lams_central/web/qb/authoring/addessay.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addtruefalse.jsp
Friday 31 Jan 2020
11:18 pm

Marcin Cieslak

LDEV-4802 Use redirect instead of forward to QB interface

Using a cross-module forward for some reason prevents modules from

shutting down in the end.

Options
    • -11
    • +9
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
10:41 pm

Marcin Cieslak

LDEV-4802 Use redirect instead of forward to QB interface

Using a cross-module forward for some reason prevents modules from

shutting down in the end.

Options
    • -25
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
4:55 pm

Andrey Balan

LDEV-4951 Migrate MCQ tool to Assessment

Options
    • -0
    • +260
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/McqImportContentVersionFilter.java
    • -18
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -2
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200120.sql
Thursday 30 Jan 2020
6:01 am

Andrey Balan

Merge branch 'LDEV-4959' into v4.0

Options
6:00 am

Andrey Balan

LDEV-4959 Prevent leader and non-leader from creating two GradebookUserLessons at the same time

Options
    • -0
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql
    • -3
    • +4
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Wednesday 29 Jan 2020
6:24 am

Andrey Balan

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

Options
    • -0
    • +1
    /lams_monitoring/web/error.jsp
6:07 am

Andrey Balan

LDEV-4951 Migrate MCQ tool to Assessment

Options
    • -0
    • +1
    /lams_monitoring/web/error.jsp
    • -0
    • +12
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +152
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200120.sql
    • -8
    • +17
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java
    • -0
    • +170
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/UserMarkDTO.java
    • -0
    • +35
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -3
    • +388
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +52
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -0
    • +11
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
Tuesday 28 Jan 2020
7:19 pm

Marcin Cieslak

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

Options
7:17 pm

Marcin Cieslak

Merge branch 'LDEV-4958' into v4.0

Options
7:17 pm

Marcin Cieslak

LDEV-4958 Set content folder ID when importing QTI questions to QB

Options
    • -0
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java