lams-github

lams_tool_doku

Clone Tools

Stats

Commits this week: 0
Total Committers: 11
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 Apr 2020
8:09 pm

Marcin Cieslak

LDEV-4997 Move Etherpad custom files to central

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

Marcin Cieslak

LDEV-4997 Move Etherpad custom files to central

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

Marcin Cieslak

LDEV-4996 Adjust Etherpad customised files for version 1.8.0

Options
    • -0
    • +535
    ./conf/etherpad-lite/settings.json
    • -157
    • +123
    ./conf/etherpad-lite/src/node/db/AuthorManager.js
    • -444
    • +0
    ./conf/etherpad-lite/src/node/utils/Settings.js
    • -13
    • +4
    ./conf/etherpad-lite/src/static/js/ace2_inner.js
    • -36
    • +39
    ./conf/etherpad-lite/src/static/js/pad.js
    • -2
    • +3
    ./conf/etherpad-lite/src/static/js/pad_userlist.js
    • -2
    • +2
    ./readme.txt
8:03 pm

Marcin Cieslak

LDEV-4996 Adjust Etherpad customised files for version 1.8.0

Options
    • -0
    • +535
    ./conf/etherpad-lite/settings.json
    • -157
    • +123
    ./conf/etherpad-lite/src/node/db/AuthorManager.js
    • -261
    • +0
    ./conf/etherpad-lite/src/node/db/SecurityManager.js
    • -444
    • +0
    ./conf/etherpad-lite/src/node/utils/Settings.js
    • -13
    • +4
    ./conf/etherpad-lite/src/static/js/ace2_inner.js
    • -36
    • +39
    ./conf/etherpad-lite/src/static/js/pad.js
    • -2
    • +3
    ./conf/etherpad-lite/src/static/js/pad_userlist.js
    • -2
    • +2
    ./readme.txt
7:04 pm

Marcin Cieslak

LDEV-4997 Fix highlighted lines overlapping

Options
    • -0
    • +5521
    ./conf/etherpad-lite/src/static/js/ace2_inner.js
7:04 pm

Marcin Cieslak

LDEV-4997 Fix highlighted lines overlapping

Options
    • -0
    • +5521
    ./conf/etherpad-lite/src/static/js/ace2_inner.js
Wednesday 15 Apr 2020
7:57 pm

Marcin Cieslak

LDEV-4997 Add height auto grow feature and parameter

Options
    • -0
    • +70
    ./conf/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -2
    • +5
    ./readme.txt
  3. … 2 more files in changeset.
7:57 pm

Marcin Cieslak

LDEV-4997 Add height auto grow feature and parameter

Options
    • -0
    • +70
    ./conf/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -2
    • +5
    ./readme.txt
  3. … 2 more files in changeset.
Monday 13 Apr 2020
1:21 pm

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
  2. … 12 more files in changeset.
Thursday 02 Apr 2020
3:28 pm

Marcin Cieslak

LDEV-4997 Fix learner search when registering on Doku websocket server

Options
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranUserDAO.java
    • -3
    • +14
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
3:28 pm

Marcin Cieslak

LDEV-4997 Fix learner search when registering on Doku websocket server

Options
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranUserDAO.java
    • -3
    • +14
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
3:23 pm

Marcin Cieslak

LDEV-4997 Introduce Etherpad as a JSP tag

Options
    • -0
    • +261
    ./conf/etherpad-lite/src/node/db/SecurityManager.js
    • -15
    • +7
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +1
    ./web/pages/learning/learning.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
  5. … 7 more files in changeset.
Wednesday 01 Apr 2020
8:13 pm

Marcin Cieslak

LDEV-4994 Fix description field in authoring

Options
    • -1
    • +1
    ./web/pages/authoring/basic.jsp
Monday 30 Mar 2020
9:58 pm

Marcin Cieslak

LDEV-4997 Move Etherpad Javascript code

Options
    • -113
    • +0
    ./web/includes/javascript/etherpad.js
  2. … 1 more file in changeset.
9:58 pm

Marcin Cieslak

LDEV-4997 Move Etherpad Javascript code

Options
    • -113
    • +0
    ./web/includes/javascript/etherpad.js
  2. … 1 more file in changeset.
1:30 pm

Marcin Cieslak

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

Options
    • -865
    • +0
    ./src/java/net/gjerull/etherpad/client/EPLiteClient.java
    • -301
    • +0
    ./src/java/net/gjerull/etherpad/client/EPLiteConnection.java
    • -11
    • +0
    ./src/java/net/gjerull/etherpad/client/EPLiteException.java
    • -44
    • +0
    ./src/java/net/gjerull/etherpad/client/GETRequest.java
    • -56
    • +0
    ./src/java/net/gjerull/etherpad/client/POSTRequest.java
    • -5
    • +0
    ./src/java/net/gjerull/etherpad/client/Request.java
    • -10
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranConfigItemDAO.java
    • -24
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranConfigItemDAOHibernate.java
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql
    • -11
    • +3
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -52
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.java
    • -5
    • +3
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java
    • -46
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranConfigurationException.java
    • -161
    • +37
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  16. … 18 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
    • -865
    • +0
    ./src/java/net/gjerull/etherpad/client/EPLiteClient.java
    • -301
    • +0
    ./src/java/net/gjerull/etherpad/client/EPLiteConnection.java
    • -11
    • +0
    ./src/java/net/gjerull/etherpad/client/EPLiteException.java
    • -44
    • +0
    ./src/java/net/gjerull/etherpad/client/GETRequest.java
    • -56
    • +0
    ./src/java/net/gjerull/etherpad/client/POSTRequest.java
    • -5
    • +0
    ./src/java/net/gjerull/etherpad/client/Request.java
    • -10
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranConfigItemDAO.java
    • -24
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranConfigItemDAOHibernate.java
    • -11
    • +3
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -52
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.java
    • -5
    • +3
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java
    • -46
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranConfigurationException.java
    • -161
    • +37
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -25
    • +4
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -62
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AdminController.java
  16. … 17 more files in changeset.
Thursday 26 Mar 2020
6:59 pm

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
  2. … 7 more files in changeset.
Tuesday 24 Mar 2020
2:13 pm

Marcin Cieslak

LDEV-4994 Add description field to Dokumaran

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql
    • -4
    • +16
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -0
    • +6
    ./web/pages/authoring/basic.jsp
    • -0
    • +3
    ./web/pages/learning/learning.jsp
Thursday 23 Jan 2020
6:40 am

Andrey Balan

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

Options
    • -1
    • +0
    ./web/403.jsp
    • -1
    • +0
    ./web/404.jsp
    • -0
    • +6
    ./web/WEB-INF/web.xml
    • -1
    • +1
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/error.jsp
    • -1
    • +0
    ./web/login.jsp
  7. … 167 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
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 94 more files in changeset.
Friday 03 Jan 2020
2:59 pm

Marcin Cieslak

LDEV-4743 Squash tool patches updating to version 3.1

Options
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20170303.sql
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20180425.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20190103.sql
    • -0
    • +23
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20190103_updateTo31.sql
  5. … 115 more files in changeset.
Thursday 02 Jan 2020
9:12 pm

Ernie Ghiglione

LDEV-4932 Add CSRF to OutcomeAuthor tag

Options
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 30 more files in changeset.
9:00 pm

Ernie Ghiglione

LDEV-4932 removing multipart encoding

There are plenty of form we set the multipart encoding for uploading files, but no files are uploaded. This has implications for CSRF tokens. So we remove the enctype="multipart/form-data" for all the authoring forms that aren't needed.

Options
    • -1
    • +1
    ./web/pages/authoring/authoring.jsp
  2. … 14 more files in changeset.
Wednesday 01 Jan 2020
7:43 am

Ernie Ghiglione

LDEV-4932 Passing CSRF token as a post rather than get

Options
    • -2
    • +2
    ./web/pages/authoring/authoring.jsp
  2. … 41 more files in changeset.
Tuesday 31 Dec 2019
5:14 am

Andrey Balan

LDEV-4932 Secure save tool authoring with CSRF Guard

Options
    • -11
    • +1
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java
    • -1
    • +2
    ./web/pages/authoring/authoring.jsp
  3. … 41 more files in changeset.
Saturday 28 Dec 2019
11:18 pm

Marcin Cieslak

LDEV-4935 Secure Dokumaran websockets

User gets checked if he participates in the given activity.

Options
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DAO.java
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -28
    • +33
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -3
    • +11
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
2:23 am

Andrey Balan

LDEV-4932 Secure edit in monitor with CSRF Guard

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java
    • -0
    • +70
    ./web/WEB-INF/tlds/security/csrfguard.tld
    • -0
    • +15
    ./web/WEB-INF/web.xml
    • -0
    • +1
    ./web/common/taglibs.jsp
    • -5
    • +7
    ./web/pages/monitoring/editactivity.jsp
  6. … 105 more files in changeset.
Thursday 19 Dec 2019
6:21 am

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -12
    • +16
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
  2. … 42 more files in changeset.
Thursday 14 Nov 2019
9:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.