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 08 Jan 2020
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
4:37 pm

Marcin Cieslak

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

Options
6:34 am

Andrey Balan

LDEV-4932 Add CSRF to LD export and Excel export

Options
    • -0
    • +4
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java
    • -0
    • +1
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +1
    /lams_central/web/error.jsp
    • -2
    • +7
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -2
    • +2
    /lams_central/web/profile/portrait.jsp
    • -5
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +7
    /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +7
    /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
    • -2
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -1
    • +7
    /lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp
    • -3
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -1
    • +7
    /lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
4:20 am

Marcin Cieslak

LDEV-4644 Reintroduce an incorrectly deleted CSS file

Options
    • -0
    • +45
    /lams_central/web/css/outcome.scss
4:07 am

Andrey Balan

LDEV-4932 Start using /common/taglibs.jsp in lams_central

Options
    • -5
    • +1
    /lams_central/web/authoring/authoring.jsp
    • -6
    • +2
    /lams_central/web/authoring/svgGenerator.jsp
    • -10
    • +4
    /lams_central/web/authoring/template/createresult.jsp
    • -4
    • +1
    /lams_central/web/authoring/template/genericintro.jsp
    • -1
    • +1
    /lams_central/web/authoring/template/grouping.jsp
    • -6
    • +1
    /lams_central/web/authoring/template/list.jsp
    • -3
    • +1
    /lams_central/web/authoring/template/tbl/appex.jsp
    • -5
    • +1
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -1
    • +2
    /lams_central/web/authoring/template/tool/assessgradeselector.jsp
    • -5
    • +1
    /lams_central/web/authoring/template/tool/assessmcq.jsp
    • -3
    • +1
    /lams_central/web/authoring/template/tool/assessment.jsp
    • -3
    • +1
    /lams_central/web/authoring/template/tool/assessmentQTI.jsp
    • -3
    • +1
    /lams_central/web/authoring/template/tool/assessoption.jsp
    • -3
    • +1
    /lams_central/web/authoring/template/tool/assessredooption.jsp
    • -3
    • +1
    /lams_central/web/authoring/template/tool/mcoption.jsp
  16. … 54 more files in changeset.
3:52 am

Marcin Cieslak

SP-4 Provision staff members

Options
    • -211
    • +340
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
3:42 am

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -13
    • +18
    /lams_admin/web/user.jsp
    • -0
    • +14
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -8
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
    • -1
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java
    • -3
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java
    • -6
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
    • -2
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java
    • -20
    • +31
    /lams_central/web/includes/javascript/orgGroup.js
    • -5
    • +22
    /lams_central/web/includes/javascript/orgGrouping.js
    • -13
    • +5
    /lams_central/web/orgGroup.jsp
    • -2
    • +2
    /lams_central/web/orgGrouping.jsp
    • -13
    • +8
    /lams_central/web/profile/portrait.jsp
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -4
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
  16. … 36 more files in changeset.
Tuesday 07 Jan 2020
5:42 pm

Marcin Cieslak

LDEV-4366 Renormalize incorrect line endings for git to work better

Options
    • -319
    • +319
    /lams_learning/web/css/kumalive.scss
5:42 pm

Marcin Cieslak

LDEV-4366 Renormalize incorrect line endings for git to work better

Options
    • -319
    • +319
    /lams_learning/web/css/kumalive.scss
5:41 pm

Marcin Cieslak

LDEV-3119 Renormalize incorrect line endings for git to work better

Options
    • -38
    • +38
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040021.sql
5:36 pm

Marcin Cieslak

LDEV-4932 Update version and source code of CSRF Guard

Options
    • -0
    • +3
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/CsrfGuard.java
    • -1
    • +1
    /3rdParty_sources/versions.txt
    • -0
    • +3
    /lams_build/liblist.txt
5:31 pm

Marcin Cieslak

LDEV-4932 Squash multiple slashes into one when matching secured paths

Options
    • -1
    • +1
    /lams_build/lib/csrfguard/csrf.module.xml
    • binary
    /lams_build/lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
    • binary
    /lams_build/lib/csrfguard/csrfguard-3.1.0-custom-2020.01.07.jar
Monday 06 Jan 2020
11:09 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF to add lesson

Options
    • -0
    • +1
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -2
    • +2
    /lams_central/web/addLesson.jsp
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
6:44 am

Ernie Ghiglione

LDEV-4932 Adding CSRF to Author

- Save, Delete, Copy, Move and rename LDs

- Create folder

Options
    • -0
    • +8
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -6
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java
    • -4
    • +4
    /lams_central/web/authoring/authoring.jsp
    • -27
    • +44
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
Sunday 05 Jan 2020
11:49 pm

Ernie Ghiglione

LDEV Adding CSRF to Scratchie authoring

Options
    • -0
    • +2
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -2
    • +2
    /lams_tool_scratchie/web/pages/authoring/basic.jsp
    • -0
    • +1
    /lams_tool_scratchie/web/pages/authoring/parts/additem.jsp
8:47 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-4915'

Options
Saturday 04 Jan 2020
11:36 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF Notebook conditions

- Add/remove conditions

Options
    • -0
    • +2
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -3
    • +3
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java
    • -1
    • +2
    /lams_tool_notebook/web/pages/authoring/addCondition.jsp
    • -4
    • +7
    /lams_tool_notebook/web/pages/authoring/conditions.jsp
10:59 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF for QA authoring

- Add/edit questions

- remove questions

- Add and remove conditions

Options
    • -0
    • +5
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -3
    • +4
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
    • -3
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
    • -1
    • +2
    /lams_tool_laqa/web/authoring/addCondition.jsp
    • -6
    • +10
    /lams_tool_laqa/web/authoring/conditions.jsp
    • -2
    • +3
    /lams_tool_laqa/web/authoring/newQuestionBox.jsp
10:07 pm

Marcin Cieslak

Merge branch 'LDEV-4939'

Options
10:06 pm

marci <marci@mcieslak-msi>

LDEV-4939 Provide only Batik modules that LAMS uses

Prevent Batik / JDK 11 package name clash.

Options
    • binary
    /lams_build/lib/batik/batik-all-1.7.jar
    • binary
    /lams_build/lib/batik/batik-awt-util.jar
    • binary
    /lams_build/lib/batik/batik-dom.jar
    • binary
    /lams_build/lib/batik/batik-svggen.jar
    • binary
    /lams_build/lib/batik/batik-util.jar
    • binary
    /lams_build/lib/batik/batik-xml.jar
    • -9
    • +5
    /lams_build/lib/batik/batik.module.xml
Friday 03 Jan 2020
8:57 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF to voting authoring

Options
    • -0
    • +1
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -1
    • +1
    /lams_tool_survey/web/pages/authoring/basic.jsp
    • -0
    • +1
    /lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp
    • -0
    • +1
    /lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp
6:44 pm

Marcin Cieslak

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

Options
6:44 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

# Conflicts:

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

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

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

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

Options
    • -14
    • +25
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
    • -91
    • +176
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -30
    • +111
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
    • -5
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
    • -41
    • +81
    /lams_central/web/addLesson.jsp
    • -1
    • +5
    /lams_central/web/authoring/authoring.jsp
    • -13
    • +28
    /lams_central/web/includes/javascript/addLesson.js
    • -0
    • +58
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -12
    • +21
    /lams_central/web/qb/search.jsp
    • -5
    • +69
    /lams_central/web/qb/stats.jsp
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
    • -20
    • +33
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
  16. … 5 more files in changeset.
6:24 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
2:59 pm

Marcin Cieslak

LDEV-4743 Squash tool patches updating to version 3.1

Options
    • -19
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170315.sql
    • -16
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170822.sql
    • -34
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
    • -23
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -17
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171218.sql
    • -18
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180330.sql
    • -26
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180425.sql
    • -14
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180515.sql
    • -14
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190103.sql
    • -0
    • +117
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190103_updateTo31.sql
    • -23
    • +0
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20180801.sql
    • -14
    • +0
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20190103.sql
    • -0
    • +28
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20190103_updateTo31.sql
    • -17
    • +0
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20180425.sql
    • -14
    • +0
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20190103.sql
  16. … 104 more files in changeset.
2:29 pm

Marcin Cieslak

LDEV-4743 Squash core patches updating to version 3.1

Options
    • -16
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170209.sql
    • -14
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170308.sql
    • -16
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170309.sql
    • -14
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170310.sql
    • -38
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170323.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170410.sql
    • -16
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170411.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170508.sql
    • -76
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170628.sql
    • -50
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170710.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170720.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170814.sql
    • -22
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170908.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170926.sql
  16. … 38 more files in changeset.
2:11 pm

Marcin Cieslak

Merge tag 'v3.0'

Freeze 3.0 version

Options
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030200_updateTo232.sql
1:40 pm

Marcin Cieslak

LDEV-4743 Squash core patches updating to version 3.0

Options
    • -22
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040007.sql
    • -18
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040008.sql
    • -74
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040009.sql
    • -10
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040010.sql
    • -10
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040011.sql
    • -10
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040012.sql
    • -25
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040013.sql
    • -30
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040014.sql
    • -12
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040015.sql
    • -12
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040016.sql
    • -13
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040017.sql
    • -12
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040018.sql
    • -14
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040019.sql
    • -19
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040020.sql
    • -38
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040021.sql
  16. … 64 more files in changeset.
1:20 pm

Marcin Cieslak

LDEV-4743 Squash patches updating to version 2.4

Options
    • -43
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040000.sql
    • -14
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040002.sql
    • -18
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040004.sql
    • -128
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql
    • -0
    • +320
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006_updateTo24.sql