lams-github / lams_build

conf

Clone Tools

Stats

Commits this week: 0
Total Committers: 22
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 19 Nov 2020
12:14 am

Marcin Cieslak

LDEV-5118 Use sameSite=None for Etherpad cookies

So Etherpad can be embedded in iframe

Options
    • -0
    • +207
    ./etherpad/etherpad-lite/src/node/hooks/express/webaccess.js
    • -0
    • +149
    ./etherpad/etherpad-lite/src/static/js/pad_cookie.js
    • -0
    • +577
    ./etherpad/etherpad-lite/src/static/js/pad_utils.js
Wednesday 18 Nov 2020
11:49 pm

Marcin Cieslak

LDEV-5118 Update Etherpad to version 1.8.6

Options
    • -18
    • +11
    ./etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -2
    • +44
    ./etherpad/etherpad-lite/settings.json
    • -21
    • +41
    ./etherpad/etherpad-lite/src/static/js/pad.js
    • -2
    • +2
    ./etherpad/etherpad-lite/src/static/js/pad_userlist.js
    • -7
    • +11
    ./etherpad/readme.txt
Sunday 08 Nov 2020
11:56 pm

Marcin Cieslak

LDEV-4996 Fix "show line numbers" Etherpad functionality

Options
    • -1
    • +1
    ./etherpad/etherpad-lite/src/static/js/pad.js
Wednesday 10 Jun 2020
1:13 pm

Marcin Cieslak

LDEV-5037 Allow JMX calls to retrieve server internal stats

Options
    • -0
    • +6
    ./slim/standalone.xml
1:13 pm

Marcin Cieslak

LDEV-5037 Allow JMX calls to retrieve server internal stats

Options
    • -0
    • +6
    ./slim/standalone.xml
Monday 18 May 2020
12:45 pm

Marcin Cieslak

LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

Options
    • -12
    • +19
    ./etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js
  2. … 32 more files in changeset.
Saturday 16 May 2020
2:37 pm

Ernie Ghiglione

LDEV-4996 add further details to readme

Options
    • -8
    • +15
    ./etherpad/readme.txt
12:35 pm

Ernie Ghiglione

LDEV-4996 changes to settings.json for etherpad 1.8.4

Change default skin to colibris

Change editOnliny to true

Bring back the return to pad in timeslider

Options
    • -13
    • +3
    ./etherpad/etherpad-lite/settings.json
Friday 15 May 2020
7:07 pm

Marcin Cieslak

LDEV-4996 Remove obsolete menu item

Options
    • -1
    • +1
    ./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
    ./etherpad/etherpad-lite/settings.json
    • -5513
    • +0
    ./etherpad/etherpad-lite/src/static/js/ace2_inner.js
    • -7
    • +20
    ./etherpad/etherpad-lite/src/static/js/pad.js
    • -21
    • +7
    ./etherpad/etherpad-lite/src/static/js/pad_userlist.js
    • -1
    • +3
    ./etherpad/readme.txt
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
    ./j2ee/jboss-deployment-structure.xml
  2. … 30 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
    ./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
    ./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
    ./etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -0
    • +535
    ./etherpad/etherpad-lite/settings.json
    • -0
    • +242
    ./etherpad/etherpad-lite/src/node/db/AuthorManager.js
    • -0
    • +5512
    ./etherpad/etherpad-lite/src/static/js/ace2_inner.js
    • -0
    • +950
    ./etherpad/etherpad-lite/src/static/js/pad.js
    • -0
    • +855
    ./etherpad/etherpad-lite/src/static/js/pad_userlist.js
    • -0
    • +22
    ./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
    ./etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -0
    • +535
    ./etherpad/etherpad-lite/settings.json
    • -0
    • +242
    ./etherpad/etherpad-lite/src/node/db/AuthorManager.js
    • -0
    • +5512
    ./etherpad/etherpad-lite/src/static/js/ace2_inner.js
    • -0
    • +950
    ./etherpad/etherpad-lite/src/static/js/pad.js
    • -0
    • +855
    ./etherpad/etherpad-lite/src/static/js/pad_userlist.js
    • -0
    • +22
    ./etherpad/readme.txt
  8. … 7 more files in changeset.
Tuesday 31 Mar 2020
6:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Options
    • -0
    • +1
    ./j2ee/jboss-deployment-structure.xml
  2. … 15 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
    • +1
    ./j2ee/jboss-deployment-structure.xml
  2. … 15 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
    • -0
    • +1
    ./j2ee/jboss-deployment-structure.xml
  2. … 32 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
    • -0
    • +1
    ./j2ee/jboss-deployment-structure.xml
  2. … 31 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
    • -0
    • +1
    ./j2ee/jboss-deployment-structure.xml
  2. … 94 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
    ./domain.xml
    • -0
    • +8
    ./slim/standalone.xml
    • -0
    • +8
    ./standalone.xml
  4. … 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
    • -1
    • +0
    ./j2ee/jboss-deployment-structure.xml
  2. … 9 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
    • +1
    ./j2ee/jboss-deployment-structure.xml
  2. … 9 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
    • +1
    ./j2ee/jboss-deployment-structure.xml
  2. … 9 more files in changeset.
Wednesday 07 Aug 2019
9:32 pm

Andrey Balan

LDEV-4589 Make org.apache.httpcomponents.core module available

Options
    • -0
    • +1
    ./j2ee/jboss-deployment-structure.xml
9:32 pm

Andrey Balan

LDEV-4589 Make org.apache.httpcomponents.core module available

Options
    • -0
    • +1
    ./j2ee/jboss-deployment-structure.xml
Friday 19 Apr 2019
11:39 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -0
    • +1
    ./j2ee/jboss-deployment-structure.xml
  2. … 3 more files in changeset.
11:31 pm

Andrey Balan

LDEV-4810 Reintroduce Batik lib, required for producing Jlatexmath's SVG

Options
    • -0
    • +1
    ./j2ee/jboss-deployment-structure.xml
  2. … 4 more files in changeset.
Saturday 19 Jan 2019
9:30 pm

Marcin Cieslak

LDEV-4755 Add ClamAV client library

Options
    • -0
    • +1
    ./j2ee/jboss-deployment-structure.xml
  2. … 9 more files in changeset.
Friday 18 Jan 2019
8:25 pm

Marcin Cieslak

LDEV-4753 Change default log level to DEBUG with info about production

Options
    • -3
    • +7
    ./domain.xml
    • -2
    • +6
    ./slim/standalone.xml
    • -2
    • +10
    ./standalone.xml