lams-github / lams_tool_doku / src

java

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
Friday 26 Jan 2018
9:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -4
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
  2. … 78 more files in changeset.
Tuesday 19 Dec 2017
8:47 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.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/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -0
    • +6
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 45 more files in changeset.
Thursday 02 Nov 2017
8:14 am

Andrey Balan

LDEV-4451 Implement ToolSessionManager.getConfidenceLevels() in all tools

This method allows Scratchie to query available confidence levels from

the tools that can provide it. Actually, only Assessment and MCQ will

implement it for real, all other tools will implements it as "return

null;".

Options
    • -0
    • +6
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 28 more files in changeset.
Thursday 14 Sep 2017
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Wiki, DoKumaran

Options
    • -0
    • +10
    ./org/lamsfoundation/lams/tool/dokumaran/dto/ReflectDTO.java
  2. … 5 more files in changeset.
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Wiki, DoKumaran

Options
    • -0
    • +10
    ./org/lamsfoundation/lams/tool/dokumaran/dto/ReflectDTO.java
  2. … 5 more files in changeset.
Thursday 10 Aug 2017
12:28 am

Marcin Cieslak

LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

Options
    • -23
    • +23
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -27
    • +35
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
    • -7
    • +10
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
    • -4
    • +4
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java
  6. … 131 more files in changeset.
Sunday 30 Jul 2017
3:07 am

Andrey Balan

LDEV-4394 Fix "addTime" request

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
  2. … 1 more file in changeset.
Saturday 29 Jul 2017
12:56 pm

Marcin Cieslak

LDEV-4394 Reintroduce page refresh to Doku

It was incorrectly removed in previous commits. Also make sure the other

websocket pings and reconnects.

Options
    • -8
    • +31
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
  2. … 1 more file in changeset.
Friday 28 Jul 2017
3:53 pm

Marcin Cieslak

LDEV-4394 Make page reload and websocket close requests cross-node

Some requests have been sent only to websockets on current node. Now

they are detected in DB and run on all nodes.

Options
    • -40
    • +40
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -22
    • +83
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
  3. … 10 more files in changeset.
Monday 19 Jun 2017
8:45 pm

Andrey Balan

Remove folder after it was moved to master

Removing it as there is no need to keep it in lams25 branch after it was

moved to the master branch. Besides, it was never meant to be run under

JBoss (lams25 branch).

Options
    • -865
    • +0
    ./net/gjerull/etherpad/client/EPLiteClient.java
    • -301
    • +0
    ./net/gjerull/etherpad/client/EPLiteConnection.java
    • -11
    • +0
    ./net/gjerull/etherpad/client/EPLiteException.java
    • -44
    • +0
    ./net/gjerull/etherpad/client/GETRequest.java
    • -56
    • +0
    ./net/gjerull/etherpad/client/POSTRequest.java
    • -5
    • +0
    ./net/gjerull/etherpad/client/Request.java
    • -123
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -77
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/dao/DAO.java
    • -10
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranConfigItemDAO.java
    • -36
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranDAO.java
    • -40
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranSessionDAO.java
    • -45
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranUserDAO.java
    • -24
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranConfigItemDAOHibernate.java
    • -64
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranDAOHibernate.java
    • -66
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranSessionDAOHibernate.java
  16. … 125 more files in changeset.
Thursday 04 May 2017
9:31 pm

Marcin Cieslak

LDEV-4252: Use another collection type instead of synchronisation.

Options
    • -13
    • +5
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
9:31 pm

Marcin Cieslak

LDEV-4252: Use another collection type instead of synchronisation.

Options
    • -13
    • +5
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
Tuesday 04 Apr 2017
8:26 pm

Andrey Balan

LDEV-4300 Audit logs when activity is modified in monitor

Options
    • -13
    • +5
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +7
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java
8:26 pm

Andrey Balan

LDEV-4300 Audit logs when activity is modified in monitor

Options
    • -13
    • +5
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +7
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java
Friday 31 Mar 2017
2:31 am

Andrey Balan

LDEV-4291 Move getAccessMode method to WebUtil

Options
    • -27
    • +4
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java
2:31 am

Andrey Balan

LDEV-4291 Move getAccessMode method to WebUtil

Options
    • -27
    • +4
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java
Saturday 25 Mar 2017
12:37 am

Andrey Balan

LDEV-4286 Show authoring advanced tab on re-editing content from monitor

Options
    • -28
    • +22
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java
  2. … 3 more files in changeset.
12:37 am

Andrey Balan

LDEV-4286 Show authoring advanced tab on re-editing content from monitor

Options
    • -28
    • +22
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java
  2. … 3 more files in changeset.
Tuesday 07 Mar 2017
5:41 pm

Andrey Balan

LDEV-4259 Fixed a few issues

Options
    • -4
    • +5
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 1 more file in changeset.
5:41 pm

Andrey Balan

LDEV-4259 Fixed a few issues

Options
    • -4
    • +5
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 1 more file in changeset.
2:08 pm

Andrey Balan

LDEV-4259 Make one minute added more precise

Options
    • -5
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
2:08 pm

Andrey Balan

LDEV-4259 Make one minute added more precise

Options
    • -5
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
5:58 am

Andrey Balan

LDEV-4259 Add time limit feature

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -0
    • +15
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20170303.sql
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -0
    • +32
    ./org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -0
    • +65
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +27
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -4
    • +15
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
    • -0
    • +123
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
    • -1
    • +39
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java
  11. … 10 more files in changeset.
5:58 am

Andrey Balan

LDEV-4259 Add time limit feature

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -0
    • +15
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20170303.sql
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -0
    • +32
    ./org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -0
    • +65
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +27
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -4
    • +15
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
    • -0
    • +123
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
    • -1
    • +39
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java
  11. … 10 more files in changeset.
Tuesday 31 Jan 2017
6:25 pm

Andrey Balan

LDEV-4205 Attempt to solve the problem with setting cookies to the top level domain

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
6:25 pm

Andrey Balan

LDEV-4205 Attempt to solve the problem with setting cookies to the top level domain

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
Monday 30 Jan 2017
5:00 pm

Andrey Balan

LDEV-4196 Cope with expired and close to being expired Etherpad sessions (which Etherpad regardless of their expiration date always returns)

Options
    • -36
    • +53
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
5:00 pm

Andrey Balan

LDEV-4196 Cope with expired and close to being expired Etherpad sessions (which Etherpad regardless of their expiration date always returns)

Options
    • -36
    • +53
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
Saturday 28 Jan 2017
2:44 am

Andrey Balan

LDEV-4196 * Adding buttons in monitoring that will recover faulty sessions. * Improved timelimit feature so it opens in the same iframe * Show line numbers option. Etherpad ignores this URL parameter when it's stored in cookie so turned off checking this cookie.

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/dokumaran/dto/SessionDTO.java
    • -155
    • +72
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -20
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/util/DokumaranToolContentHandler.java
    • -0
    • +35
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java
  8. … 6 more files in changeset.
2:44 am

Andrey Balan

LDEV-4196 * Adding buttons in monitoring that will recover faulty sessions. * Improved timelimit feature so it opens in the same iframe * Show line numbers option. Etherpad ignores this URL parameter when it's stored in cookie so turned off checking this cookie.

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/dokumaran/dto/SessionDTO.java
    • -155
    • +72
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -20
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/util/DokumaranToolContentHandler.java
    • -0
    • +35
    ./org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java
  8. … 6 more files in changeset.