lams-github / lams_tool_doku

web

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
Monday 18 May 2020
1:06 pm

Marcin Cieslak

LDEV-4996 Adjust doKu code to follow Etherpad resize update

Options
    • -1
    • +1
    ./pages/learning/learning.jsp
    • -1
    • +1
    ./pages/monitoring/summary.jsp
12:45 pm

Marcin Cieslak

LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

Options
    • -1
    • +1
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Saturday 16 May 2020
6:31 pm

Marcin Cieslak

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

Conflicts:

lams_tool_zoom/web/pages/learning/learning.jsp

Options
    • -11
    • +13
    ./pages/monitoring/summary.jsp
  2. … 1 more file in changeset.
Friday 15 May 2020
7:09 pm

Marcin Cieslak

LDEV-4996 Add Etherpad autogrow feature to Doku tool

Options
    • -0
    • +13
    ./pages/learning/learning.jsp
    • -11
    • +13
    ./pages/monitoring/summary.jsp
6:53 pm

Marcin Cieslak

LDEV-4996 Adjust Etherpad autogrow feature

Options
    • -2
    • +2
    ./WEB-INF/tags/Etherpad.tag
  2. … 31 more files in changeset.
Monday 11 May 2020
6:05 pm

Marcin Cieslak

LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

Options
    • -1
    • +1
    ./pages/learning/learning.jsp
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  3. … 7 more files in changeset.
Tuesday 28 Apr 2020
11:59 am

Marcin Cieslak

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

Options
    • -0
    • +2
    ./pages/monitoring/summary.jsp
11:58 am

Marcin Cieslak

LDEV-5012 Display description field in Dokumaran monitoring.

Options
    • -0
    • +2
    ./pages/monitoring/summary.jsp
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
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  2. … 3 more files in changeset.
Wednesday 22 Apr 2020
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Tuesday 21 Apr 2020
6:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
  2. … 463 more files in changeset.
Monday 20 Apr 2020
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    ./WEB-INF/tlds/lams/lams.tld
  3. … 87 more files in changeset.
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    ./WEB-INF/tlds/lams/lams.tld
  3. … 87 more files in changeset.
6:55 pm

Marcin Cieslak

LDEV-4999 Allow marks update in Dokuy monitoring summary page

Options
    • -13
    • +68
    ./pages/monitoring/summary.jsp
  2. … 4 more files in changeset.
Saturday 18 Apr 2020
2:23 pm

Marcin Cieslak

LDEV-4999 Display users in tablesorter in Doku monitoring summary

Options
    • -0
    • +90
    ./pages/monitoring/summary.jsp
  2. … 2 more files in changeset.
Thursday 02 Apr 2020
3:23 pm

Marcin Cieslak

LDEV-4997 Introduce Etherpad as a JSP tag

Options
    • -1
    • +1
    ./pages/learning/learning.jsp
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  3. … 9 more files in changeset.
Wednesday 01 Apr 2020
8:13 pm

Marcin Cieslak

LDEV-4994 Fix description field in authoring

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

Marcin Cieslak

LDEV-4997 Move Etherpad Javascript code

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

Marcin Cieslak

LDEV-4997 Move Etherpad Javascript code

Options
    • -113
    • +0
    ./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
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
    • -59
    • +0
    ./pages/admin/config.jsp
  3. … 31 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
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
    • -59
    • +0
    ./pages/admin/config.jsp
  3. … 30 more files in changeset.
Tuesday 24 Mar 2020
2:13 pm

Marcin Cieslak

LDEV-4994 Add description field to Dokumaran

Options
    • -0
    • +6
    ./pages/authoring/basic.jsp
    • -0
    • +3
    ./pages/learning/learning.jsp
  3. … 3 more files in changeset.
Thursday 23 Jan 2020
6:40 am

Andrey Balan

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

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

Ernie Ghiglione

LDEV-4932 Add CSRF to OutcomeAuthor tag

Options
    • -2
    • +3
    ./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
    ./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
    ./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
    • -1
    • +2
    ./pages/authoring/authoring.jsp
  2. … 42 more files in changeset.
Saturday 28 Dec 2019
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
    • -0
    • +70
    ./WEB-INF/tlds/security/csrfguard.tld
    • -0
    • +15
    ./WEB-INF/web.xml
    • -0
    • +1
    ./common/taglibs.jsp
    • -5
    • +7
    ./pages/monitoring/editactivity.jsp
  5. … 106 more files in changeset.