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
Wednesday 25 Nov 2020
11:14 pm

Marcin Cieslak

LDEV-5118 Update information about Etherpad plugins

Options
    • -6
    • +10
    ./conf/etherpad/readme.txt
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
    ./conf/etherpad/etherpad-lite/src/node/hooks/express/webaccess.js
    • -0
    • +149
    ./conf/etherpad/etherpad-lite/src/static/js/pad_cookie.js
    • -0
    • +577
    ./conf/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
    ./conf/etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -2
    • +44
    ./conf/etherpad/etherpad-lite/settings.json
    • -21
    • +41
    ./conf/etherpad/etherpad-lite/src/static/js/pad.js
    • -2
    • +2
    ./conf/etherpad/etherpad-lite/src/static/js/pad_userlist.js
    • -7
    • +11
    ./conf/etherpad/readme.txt
Sunday 08 Nov 2020
11:56 pm

Marcin Cieslak

LDEV-4996 Fix "show line numbers" Etherpad functionality

Options
    • -1
    • +1
    ./conf/etherpad/etherpad-lite/src/static/js/pad.js
Friday 02 Oct 2020
10:53 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./3rdParty.userlibraries
  2. … 1 more file in changeset.
10:51 pm

Marcin Cieslak

LDEV-5084 Disable Save button on LTI lesson create

Fetching memberships can take a while and an user can double click the

button.

Options
    • -1
    • +1
    ./3rdParty.userlibraries
  2. … 1 more file in changeset.
Thursday 20 Aug 2020
2:46 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_central/web/questions/questionFile.jsp

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

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_lamc/web/WEB-INF/tags/Etherpad.tag

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

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

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

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

Options
    • -3
    • +2
    ./build.xml
  2. … 25 more files in changeset.
Monday 10 Aug 2020
12:49 pm

Marcin Cieslak

LDEV-5058 Allow tool adding both on fresh build and afterwards

As a column got removed from a LAMS core table, we need to make sure

that all scenarios work well: an upgrade from previous version, a fresh

build and adding extra tools afterwards.

Options
    • -2
    • +2
    ./librarypackages/chatscribe/libraryActivity1_insert.sql
    • -2
    • +2
    ./librarypackages/chatscribe/toolActivity1_insert.sql
    • -2
    • +2
    ./librarypackages/chatscribe/toolActivity2_insert.sql
    • -2
    • +2
    ./librarypackages/forumscribe/libraryActivity1_insert.sql
    • -2
    • +2
    ./librarypackages/forumscribe/toolActivity1_insert.sql
    • -2
    • +2
    ./librarypackages/forumscribe/toolActivity2_insert.sql
    • -2
    • +2
    ./librarypackages/shareresourcesforum/libraryActivity1_insert.sql
    • -2
    • +2
    ./librarypackages/shareresourcesforum/toolActivity1_insert.sql
    • -2
    • +2
    ./librarypackages/shareresourcesforum/toolActivity2_insert.sql
  10. … 33 more files in changeset.
Friday 12 Jun 2020
12:02 pm

Ernie Ghiglione

LDEV-5040: jboss-cli* to remain

We use these for starting WF as a service in unix servers.

Options
    • -2
    • +1
    ./build.xml
Wednesday 10 Jun 2020
1:13 pm

Marcin Cieslak

LDEV-5037 Allow JMX calls to retrieve server internal stats

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

Marcin Cieslak

LDEV-5037 Allow JMX calls to retrieve server internal stats

Options
    • -0
    • +6
    ./conf/slim/standalone.xml
Tuesday 19 May 2020
11:02 pm

Marcin Cieslak

LDEV-5028 Add Peer Review tool to standard LAMS build

Options
    • -1
    • +1
    ./build.xml
Monday 18 May 2020
12:45 pm

Marcin Cieslak

LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

Options
    • -12
    • +19
    ./conf/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
    ./conf/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
    ./conf/etherpad/etherpad-lite/settings.json
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.