lams-github / lams_tool_doku / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 9
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:55 am

Marcin Cieslak

LDEV-5113 Set max mark for Dokumaran to 100

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranOutputFactory.java
  2. … 1 more file in changeset.
Tuesday 17 Nov 2020
7:21 pm

Marcin Cieslak

LDEV-5113 Introduce manual grading tool output

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -46
    • +18
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranOutputFactory.java
  3. … 3 more files in changeset.
Thursday 12 Nov 2020
11:19 pm

Marcin Cieslak

LDEV-4196 Sort groups alphabetically in Dokumaran monitoring UI

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranSessionDAOHibernate.java
Tuesday 28 Jul 2020
3:04 pm

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
  2. … 33 more files in changeset.
Friday 29 May 2020
7:07 pm

Marcin Cieslak

LDEV-4997 Fix Doku content initialisation

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
Tuesday 12 May 2020
3:59 pm

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/includes/javascript/openUrls.js

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

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

lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

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

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

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/LearningController.java

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java

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

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql

lams_tool_lamc/web/tblmonitoring/mcq.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

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

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

lams_tool_scratchie/web/pages/learning/scratchies.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

lams_www/web/news.html

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
  2. … 8 more files in changeset.
Monday 11 May 2020
6:05 pm

Marcin Cieslak

LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

Options
    • -15
    • +7
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 8 more files in changeset.
1:06 pm

Ernie Ghiglione

LDEV-5008 backporting to master

Options
    • -4
    • +6
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql
    • -0
    • +17
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql
  3. … 3 more files in changeset.
Thursday 30 Apr 2020
8:33 am

Ernie Ghiglione

LDEV-5008 Rename doKumaran tool

Options
    • -1
    • +6
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql
    • -1
    • +5
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql
  3. … 2 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
    • -10
    • +9
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  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
    • -1
    • +1
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  2. … 463 more files in changeset.
Monday 20 Apr 2020
6:55 pm

Marcin Cieslak

LDEV-4999 Allow marks update in Dokuy monitoring summary page

Options
    • -1
    • +46
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  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
    • -2
    • +69
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  2. … 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
    ./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
    ./lamsfoundation/lams/tool/dokumaran/dao/DokumaranUserDAO.java
    • -3
    • +14
    ./lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
    • -2
    • +2
    ./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
    ./lamsfoundation/lams/tool/dokumaran/dao/DokumaranUserDAO.java
    • -3
    • +14
    ./lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
3:23 pm

Marcin Cieslak

LDEV-4997 Introduce Etherpad as a JSP tag

Options
    • -15
    • +7
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 10 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
    • -10
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dao/DokumaranConfigItemDAO.java
    • -24
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranConfigItemDAOHibernate.java
    • -3
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql
    • -0
    • +13
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql
    • -11
    • +3
    ./lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -52
    • +0
    ./lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.java
    • -5
    • +3
    ./lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java
    • -46
    • +0
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranConfigurationException.java
    • -161
    • +37
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -25
    • +4
    ./lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -62
    • +0
    ./lamsfoundation/lams/tool/dokumaran/web/controller/AdminController.java
    • -9
    • +10
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
    • -12
    • +11
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
    • -27
    • +0
    ./lamsfoundation/lams/tool/dokumaran/web/form/AdminForm.java
  15. … 19 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
    • -10
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dao/DokumaranConfigItemDAO.java
    • -24
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranConfigItemDAOHibernate.java
    • -11
    • +3
    ./lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -52
    • +0
    ./lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.java
    • -5
    • +3
    ./lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java
    • -46
    • +0
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranConfigurationException.java
    • -161
    • +37
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -25
    • +4
    ./lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -62
    • +0
    ./lamsfoundation/lams/tool/dokumaran/web/controller/AdminController.java
    • -9
    • +10
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
    • -12
    • +11
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
    • -27
    • +0
    ./lamsfoundation/lams/tool/dokumaran/web/form/AdminForm.java
  13. … 20 more files in changeset.
Tuesday 24 Mar 2020
2:13 pm

Marcin Cieslak

LDEV-4994 Add description field to Dokumaran

Options
    • -0
    • +14
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql
    • -4
    • +16
    ./lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
  3. … 3 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
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20170303.sql
    • -15
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20180425.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20190103.sql
    • -0
    • +23
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20190103_updateTo31.sql
  5. … 115 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
    ./lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java
  2. … 42 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
    ./lamsfoundation/lams/tool/dokumaran/dao/DAO.java
    • -2
    • +10
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -28
    • +33
    ./lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -3
    • +11
    ./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
    ./lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java
  2. … 109 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
    ./lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
  2. … 42 more files in changeset.
Wednesday 13 Nov 2019
3:32 am

Andrey Balan

LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

Options
    • -2
    • +0
    ./lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java
    • -0
    • +8
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  3. … 59 more files in changeset.
Friday 05 Apr 2019
3:36 pm

Marcin Cieslak

LDEV-4802 Stop websocket threads even more gracefully

An exception can occur also when session gets open, not only when it

gets closed.

Options
    • -5
    • +6
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
  2. … 7 more files in changeset.
Tuesday 08 Jan 2019
6:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4743 Squash/Update SQL scripts ready for LAMS 3.1 release

Options
    • -0
    • +14
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20190103.sql
  2. … 129 more files in changeset.
Friday 21 Dec 2018
7:24 pm

Andrey Balan

LDEV-4678 Remove no longer needed @Autowired applicationContext

Options
    • -5
    • +0
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  2. … 20 more files in changeset.
4:47 am

Andrey Balan

LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

Options
    • -0
    • +5
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -16
    • +2
    ./lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -4
    • +1
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  4. … 140 more files in changeset.