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
Thursday 16 Jan 2020
6:17 pm

Marcin Cieslak

LDEV-4898 Fix race condition when generating a LD SVG

Options
    • -28
    • +41
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
4:24 pm

Marcin Cieslak

LDEV-4846 Prevent creation of QB questions with missing content folder

Options
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200116.sql
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
5:56 am

Andrey Balan

LDEV-4943 Don't log error message on learner accessing LTI lesson

(cherry picked from commit 9f6b6a7487f9b5cbf283bf95361e3778e93fde95)

Options
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
5:56 am

Andrey Balan

LDEV-4943 Don't log error message on learner accessing LTI lesson

Options
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
4:06 am

Andrey Balan

LDEV-4875 Add "cursor:pointer" to drag-and-drop answers

Options
    • -0
    • +3
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
3:43 am

Andrey Balan

LDEV-4875 Prevent monitors from allocating empty or autosaved answers

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -1
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Wednesday 15 Jan 2020
5:57 am

Andrey Balan

LDEV-4928 Update TBL monitor and Excel export to fully support VSA type

Options
    • -1
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -10
    • +26
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -35
    • +79
    /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/TblMonitorController.java
    • -1
    • +1
    /lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
Tuesday 14 Jan 2020
5:43 pm

Marcin Cieslak

Merge branch 'LDEV-4941' into v4.0

Options
5:43 pm

Marcin Cieslak

LDEV-4941 Prevent "stealing" a QB question

Prevent changing an existing question's collection if it is not in one

of user's own collections

Options
    • -18
    • +23
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -1
    • +2
    /lams_central/web/qb/authoring/addQuestionFooter.jsp
    • -3
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
    • -4
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -5
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Monday 13 Jan 2020
9:20 pm

Marcin Cieslak

LDEV-4884 Skip QB questions with existing UUID on XML import

Options
    • -1
    • +39
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
Saturday 11 Jan 2020
5:33 am

Andrey Balan

LDEV-4831 Bypass 2FA if using Login-as

(cherry picked from commit 26e7a51d2a74ef045d6e056752fd60bf510f2024)

Options
    • -4
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
5:33 am

Andrey Balan

LDEV-4831 Bypass 2FA if using Login-as

Options
    • -4
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
Friday 10 Jan 2020
10:28 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

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

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

Options
    • -1
    • +2
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -0
    • +816
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/AuthoringController.java
    • -0
    • +885
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java
    • -0
    • +559
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java
    • -0
    • +182
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/PedagogicalPlannerController.java
    • -0
    • +437
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringConditionController.java
    • -0
    • +641
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java
    • -0
    • +1318
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java
    • -0
    • +399
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java
    • -0
    • +130
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/PedagogicalPlannerController.java
    • -0
    • +234
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/AuthoringController.java
    • -0
    • +367
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java
    • -0
    • +165
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/MonitoringController.java
    • -0
    • +613
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java
    • -2
    • +5
    /lams_tool_scratchie/.classpath
9:44 pm

Andrey Balan

LDEV-2866 Name tools' controller classes uniformly

Options
    • -0
    • +842
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/AuthoringController.java
    • -0
    • +899
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java
    • -842
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -899
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -545
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -181
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
    • -0
    • +545
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java
    • -0
    • +181
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/PedagogicalPlannerController.java
    • -0
    • +445
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringConditionController.java
    • -0
    • +1193
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java
    • -0
    • +1435
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java
    • -0
    • +407
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java
    • -0
    • +123
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/PedagogicalPlannerController.java
    • -445
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
    • -1193
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
  16. … 13 more files in changeset.
9:08 pm

Andrey Balan

LKC-231 Calculate percentages properly in Excel export

(cherry picked from commit 1dc5f5ec294283f43ce1deaa33066bdf1190ff1d)

Options
    • -16
    • +15
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -1
    • +1
    /lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
9:08 pm

Andrey Balan

LKC-231 Calculate percentages properly in Excel export

Options
    • -16
    • +15
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -1
    • +1
    /lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
8:47 pm

Marcin Cieslak

LDEV-4746 Allow even larger output for SQL concat function

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
8:47 pm

Marcin Cieslak

LDEV-4746 Fix strip_tags SQL function when input is NULL

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190721.sql
6:10 am

Andrey Balan

LDEV-4932 Add CSRF to QB bank calls

Options
    • -0
    • +18
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -7
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -7
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -2
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
    • -12
    • +9
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addVsa.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addessay.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addordering.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addtruefalse.jsp
  16. … 18 more files in changeset.
Thursday 09 Jan 2020
11:12 pm

Marcin Cieslak

SP-4 Staff gets only monitor and author roles, not learner

Options
    • -14
    • +23
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
4:04 pm

Andrey Balan

Merge branch 'v4.0' of https://github.com/lamsfoundation/lams into v4.0

Options
3:59 pm

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
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java
    • -2
    • +3
    /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
    • -16
    • +21
    /lams_admin/web/user.jsp
    • -1
    • +2
    /lams_admin/web/userChangePass.jsp
    • -1
    • +9
    /lams_build/build.xml
    • -0
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +3
    /lams_build/liblist.txt
    • -0
    • +237
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -5
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -2
    • +3
    /lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +35
    /lams_central/web/WEB-INF/web.xml
    • -7
    • +4
    /lams_central/web/addLesson.jsp
    • -9
    • +6
    /lams_central/web/authoring/authoring.jsp
    • -5
    • +1
    /lams_central/web/authoring/template/tool/assessmcq.jsp
    • -3
    • +1
    /lams_central/web/authoring/template/tool/assessment.jsp
  16. … 80 more files in changeset.
2:58 pm

Marcin Cieslak

LDEV-4932 Adjust CSRF Guard logging

Logger uses LAMS format and logs only warnings (attacks) rather than all

its checks.

Options
    • -1
    • +9
    /lams_build/conf/domain.xml
    • -0
    • +8
    /lams_build/conf/slim/standalone.xml
    • -0
    • +8
    /lams_build/conf/standalone.xml
    • -1
    • +2
    /lams_central/conf/security/Owasp.CsrfGuard.properties
2:34 pm

Marcin Cieslak

SP-4 Add teacher to subcourses

Options
    • -35
    • +72
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
2:31 pm

Marcin Cieslak

LDEV-4649 Use correct scale field when importing learning outcomes

Options
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
6:01 am

Andrey Balan

Merge branch 'LDEV-4932'

# Conflicts:

# lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040021.sql

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java

Options
    • -9
    • +8
    /lams_admin/web/toolcontent/toolcontentlist.jsp
    • -1
    • +1
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java
    • -1
    • +1
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
    • -24
    • +9
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java
5:44 am

Andrey Balan

LDEV-4932 Add CSRF Excel export in tools

Options
    • -1
    • +4
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -2
    • +8
    /lams_central/web/includes/javascript/download.js
    • -4
    • +1
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -1
    • +1
    /lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
    • -7
    • +3
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java
    • -1
    • +1
    /lams_tool_preview/web/pages/monitoring/summary.jsp
    • -3
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +1
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
    • -18
    • +2
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java
    • -5
    • +2
    /lams_tool_survey/web/pages/monitoring/summary.jsp
Wednesday 08 Jan 2020
5:16 pm

Marcin Cieslak

Merge branch 'SP-4'

Options
4:44 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

Options
    • -2
    • +4
    /lams_build/3rdParty.userlibraries
4:42 pm

Marcin Cieslak

LDEV-4939 Update 3rd party library config file

Options
    • -3
    • +5
    /lams_build/3rdParty.userlibraries