lams-github

lams_build

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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
Friday 15 May 2020
7:07 pm

Marcin Cieslak

LDEV-4996 Remove obsolete menu item

Options
    • -1
    • +1
    ./conf/etherpad/etherpad-lite/settings.json
  2. … 1 more file in changeset.
6:44 pm

Marcin Cieslak

LDEV-4996 Update Etherpad customisations to version 1.8.4

Options
    • -2
    • +31
    ./conf/etherpad/etherpad-lite/settings.json
    • -5513
    • +0
    ./conf/etherpad/etherpad-lite/src/static/js/ace2_inner.js
    • -7
    • +20
    ./conf/etherpad/etherpad-lite/src/static/js/pad.js
    • -21
    • +7
    ./conf/etherpad/etherpad-lite/src/static/js/pad_userlist.js
    • -1
    • +3
    ./conf/etherpad/readme.txt
Monday 11 May 2020
6:14 pm

Marcin Cieslak

LDEV-4997 Renormalize line endings with git

Options
    • -41
    • +41
    ./3rdParty.userlibraries
    • -56
    • +56
    ./lib/spring/spring.module.xml
  3. … 419 more files in changeset.
Wednesday 06 May 2020
7:21 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

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

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Options
    • -0
    • +1
    ./3rdParty.userlibraries
    • -1
    • +11
    ./build.xml
    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +2
    ./liblist.txt
  5. … 27 more files in changeset.
Thursday 23 Apr 2020
2:04 pm

Marcin Cieslak

Merge branch 'LDEV-4997' into v4.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

Options
    • -0
    • +1
    ./3rdParty.userlibraries
  2. … 3 more files in changeset.
Tuesday 21 Apr 2020
6:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -44
    • +44
    ./3rdParty.userlibraries
    • -3
    • +3
    ./lib/apache-poi/compress.module.xml
    • -56
    • +56
    ./lib/spring/spring.module.xml
  4. … 461 more files in changeset.
Friday 17 Apr 2020
1:35 pm

Marcin Cieslak

LDEV-4996 Fix a typo preventing Etherpad module from loading

Options
    • -2
    • +3
    ./conf/etherpad/etherpad-lite/src/static/js/ace2_inner.js
1:35 pm

Marcin Cieslak

LDEV-4996 Fix a typo preventing Etherpad module from loading

Options
    • -2
    • +3
    ./conf/etherpad/etherpad-lite/src/static/js/ace2_inner.js
Thursday 16 Apr 2020
8:09 pm

Marcin Cieslak

LDEV-4997 Move Etherpad custom files to central

Options
    • -0
    • +70
    ./conf/etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -0
    • +535
    ./conf/etherpad/etherpad-lite/settings.json
    • -0
    • +242
    ./conf/etherpad/etherpad-lite/src/node/db/AuthorManager.js
    • -0
    • +5512
    ./conf/etherpad/etherpad-lite/src/static/js/ace2_inner.js
    • -0
    • +950
    ./conf/etherpad/etherpad-lite/src/static/js/pad.js
    • -0
    • +855
    ./conf/etherpad/etherpad-lite/src/static/js/pad_userlist.js
    • -0
    • +22
    ./conf/etherpad/readme.txt
  8. … 7 more files in changeset.
8:09 pm

Marcin Cieslak

LDEV-4997 Move Etherpad custom files to central

Options
    • -0
    • +70
    ./conf/etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -0
    • +535
    ./conf/etherpad/etherpad-lite/settings.json
    • -0
    • +242
    ./conf/etherpad/etherpad-lite/src/node/db/AuthorManager.js
    • -0
    • +5512
    ./conf/etherpad/etherpad-lite/src/static/js/ace2_inner.js
    • -0
    • +950
    ./conf/etherpad/etherpad-lite/src/static/js/pad.js
    • -0
    • +855
    ./conf/etherpad/etherpad-lite/src/static/js/pad_userlist.js
    • -0
    • +22
    ./conf/etherpad/readme.txt
  8. … 7 more files in changeset.
Saturday 04 Apr 2020
1:06 am

Marcin Cieslak

LDEV-4997 Fix path in library file

Options
    • -1
    • +1
    ./3rdParty.userlibraries
Tuesday 31 Mar 2020
6:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Options
    • -0
    • +3
    ./3rdParty.userlibraries
    • -1
    • +8
    ./build.xml
    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
    • binary
    ./lib/apache-poi/poi-scratchpad-4.0.1.jar
    • -0
    • +1
    ./lib/apache-poi/poi.module.xml
    • binary
    ./lib/apache-tika/tika-core-1.24.jar
    • binary
    ./lib/apache-tika/tika-parsers-1.24.jar
    • -0
    • +39
    ./lib/apache-tika/tika.module.xml
    • -0
    • +4
    ./liblist.txt
  10. … 7 more files in changeset.
6:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Cherry-pick from 5.0 branch

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_central/web/questions/questionFile.jsp

Options
    • -0
    • +3
    ./3rdParty.userlibraries
    • -1
    • +8
    ./build.xml
    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
    • binary
    ./lib/apache-poi/poi-scratchpad-4.0.1.jar
    • -0
    • +1
    ./lib/apache-poi/poi.module.xml
    • binary
    ./lib/apache-tika/tika-core-1.24.jar
    • binary
    ./lib/apache-tika/tika-parsers-1.24.jar
    • -0
    • +39
    ./lib/apache-tika/tika.module.xml
    • -0
    • +4
    ./liblist.txt
  10. … 7 more files in changeset.
Monday 30 Mar 2020
1:30 pm

Marcin Cieslak

LDEV-4997 Initial migration of Doku tool to Etherpad as central service

Options
    • -2
    • +2
    ./build.xml
    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +3
    ./lib/etherpad/etherpad.module.xml
  4. … 30 more files in changeset.
1:30 pm

Marcin Cieslak

LDEV-4997 Initial migration of Doku tool to Etherpad as central service

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/build.xml

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

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

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql

Options
    • -1
    • +1
    ./3rdParty.userlibraries
    • -2
    • +2
    ./build.xml
    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +3
    ./lib/etherpad/etherpad.module.xml
  5. … 28 more files in changeset.
Thursday 26 Mar 2020
10:21 pm

Marcin Cieslak

LDEV-4997 Add Etherpad client as WildFly library module

Options
    • -3
    • +4
    ./3rdParty.userlibraries
    • -1
    • +11
    ./build.xml
    • -0
    • +29
    ./lib/etherpad/etherpad.module.xml
    • binary
    ./lib/etherpad/etherpad_lite_client-1.2.13.jar
    • -0
    • +2
    ./liblist.txt
10:21 pm

Marcin Cieslak

LDEV-4997 Add Etherpad client as WildFly library module

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/build.xml

Options
    • -0
    • +1
    ./3rdParty.userlibraries
    • -1
    • +9
    ./build.xml
    • -0
    • +29
    ./lib/etherpad/etherpad.module.xml
    • binary
    ./lib/etherpad/etherpad_lite_client-1.2.13.jar
    • -0
    • +2
    ./liblist.txt
Tuesday 18 Feb 2020
10:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -4
    • +2
    ./build.xml
  2. … 192 more files in changeset.
Thursday 09 Jan 2020
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
    • -1
    • +9
    ./build.xml
    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +3
    ./liblist.txt
  4. … 92 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
    ./conf/domain.xml
    • -0
    • +8
    ./conf/slim/standalone.xml
    • -0
    • +8
    ./conf/standalone.xml
  4. … 1 more file in changeset.
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
    ./3rdParty.userlibraries
4:42 pm

Marcin Cieslak

LDEV-4939 Update 3rd party library config file

Options
    • -3
    • +5
    ./3rdParty.userlibraries
Tuesday 07 Jan 2020
5:36 pm

Marcin Cieslak

LDEV-4932 Update version and source code of CSRF Guard

Options
    • -0
    • +3
    ./liblist.txt
  2. … 2 more files in changeset.
5:31 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./lib/csrfguard/csrf.module.xml
    • binary
    ./lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
    • binary
    ./lib/csrfguard/csrfguard-3.1.0-custom-2020.01.07.jar
Saturday 04 Jan 2020
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
    ./lib/batik/batik-all-1.7.jar
    • binary
    ./lib/batik/batik-awt-util.jar
    • binary
    ./lib/batik/batik-dom.jar
    • binary
    ./lib/batik/batik-svggen.jar
    • binary
    ./lib/batik/batik-util.jar
    • binary
    ./lib/batik/batik-xml.jar
    • -9
    • +5
    ./lib/batik/batik.module.xml
Friday 20 Dec 2019
9:20 pm

Marcin Cieslak

LDEV-4932 CSRF Guard configuration is needed only in one place

Options
    • -7
    • +0
    ./build_base.xml
  2. … 1 more file in changeset.
Thursday 19 Dec 2019
11:01 pm

Marcin Cieslak

Revert "LDEV-4932 Initial integration of CSRF Guard"

This reverts commit c5a709e4cb42d0729ad3fbd814714fb27dd844df.

It should have been in a separate branch.

Options
    • -8
    • +0
    ./build.xml
    • -7
    • +0
    ./build_base.xml
    • -1
    • +0
    ./conf/j2ee/jboss-deployment-structure.xml
    • -34
    • +0
    ./lib/csrfguard/csrf.module.xml
    • binary
    ./lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
  6. … 5 more files in changeset.
11:00 pm

Marcin Cieslak

LDEV-4932 Initial integration of CSRF Guard

Add library and configuration file. Only Edit Profile form has a token

injected into form. Other POSTed forms will be stopped by the Guard,

with an error logged.

Options
    • -0
    • +8
    ./build.xml
    • -0
    • +7
    ./build_base.xml
    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +34
    ./lib/csrfguard/csrf.module.xml
    • binary
    ./lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
  6. … 5 more files in changeset.
11:00 pm

Marcin Cieslak

LDEV-4932 Initial integration of CSRF Guard

Add library and configuration file. Only Edit Profile form has a token

injected into form. Other POSTed forms will be stopped by the Guard,

with an error logged.

Options
    • -0
    • +8
    ./build.xml
    • -0
    • +7
    ./build_base.xml
    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +34
    ./lib/csrfguard/csrf.module.xml
    • binary
    ./lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
  6. … 5 more files in changeset.
Wednesday 16 Oct 2019
6:58 pm

Andrey Balan

LDEV-4883 Fix HttpClient warning “Invalid expires attribute”

Options
    • binary
    ./lib/basiclti-util/basiclti-util-1.2.0.jar
  2. … 3 more files in changeset.