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
Friday 05 Jan 2018
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -1
    • +27
    ./web/WEB-INF/tags/Comments.tag
    • -12
    • +55
    ./web/WEB-INF/tags/Page.tag
  3. … 64 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
    ./src/java/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
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 28 more files in changeset.
Sunday 29 Oct 2017
1:19 am

Marcin Cieslak

LDEV-4411 Mark entities as cacheable

usage="read-only" seems to do nothing at the moment, but it may be a

guidance for future optimisations.

Options
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml
  5. … 234 more files in changeset.
Monday 18 Sep 2017
8:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

Options
    • -5
    • +7
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 44 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
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dto/ReflectDTO.java
    • -1
    • +8
    ./web/pages/monitoring/reflections.jsp
    • -0
    • +1
    ./web/pages/monitoring/summary.jsp
  4. … 3 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
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/dto/ReflectDTO.java
    • -1
    • +8
    ./web/pages/monitoring/reflections.jsp
    • -0
    • +1
    ./web/pages/monitoring/summary.jsp
  4. … 3 more files in changeset.
Wednesday 30 Aug 2017
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 73 more files in changeset.
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 74 more files in changeset.
Friday 11 Aug 2017
10:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4404 Tags and tlds match LAMS standard tags.

Customisation made to CKEditor tag removed and the new toolbar

set in the jsp rather than hardcoded in the tag.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/AdvancedAccordian.tag
    • -2
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -3
    • +3
    ./web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +1
    ./web/WEB-INF/tags/Date.tag
    • -1
    • +1
    ./web/WEB-INF/tags/DefineLater.tag
    • -0
    • +84
    ./web/WEB-INF/tags/FileUpload.tag
    • -37
    • +37
    ./web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +28
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -2
    • +7
    ./web/WEB-INF/tags/Rating.tag
    • -1
    • +1
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
    • -1
    • +1
    ./web/WEB-INF/tags/StyledRating.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TSTable.tag
  16. … 11 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
    • -0
    • +2
    ./.classpath
    • -23
    • +23
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -27
    • +35
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
    • -7
    • +10
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java
  7. … 130 more files in changeset.
Monday 07 Aug 2017
2:53 pm

Marcin Cieslak

LDEV-4402 Use Spring support for Hibernate v5 instead of v4

WF10 is shipped with Hibernate 5, so Spring support version should

match.

Options
    • -1
    • +1
    ./web/WEB-INF/web.xml
  2. … 19 more files in changeset.
Saturday 05 Aug 2017
5:36 pm

Marcin Cieslak

LDEV-4400 Update dependecies to embedded libraries

WildFly 10 is shipped with newer versions of libraries that LAMS uses.

LAMS now points to proper JAR files. Following libraries were updated:

beanutils 1.8.3 -> 1.9.2

codec 1.9 -> 1.10

collection 3.2.1 -> 3.2.2

xerces 2.11.0.SP3 -> 2.11.0.SP4

httpclient 4.2.1 -> 4.5

httpcore 4.2.1 -> 4.4.1

wildfly-controller-client 8.2.1 -> 2.2.0 (probably naming convention was

changed)

jboss-dmr 1.2.0 -> 1.3.0

Hibernate 4.3.7 -> 5.0.10

log4j-jboss-logmanager 1.1.0 -> 1.1.2

jcl-over-slf4j 1.7.2 -> 1.7.7

undertow-core 1.1.8 -> 1.4.0

undertow-servlet 1.1.8 -> 1.4.0

javax.mail 1.5.0 -> 1.5.5

jboss-jstl 1.1.2 -> 1.1.3

jboss-logging 3.1.4 -> 3.3.0

remoting-jmx 2.0.0 -> 2.0.1

slf4j-api 1.7.2 -> 1.7.7

picketbox 4.0.21 -> 4.9.6

jboss-websocket-api 1.1.0 -> 1.1.1

joda-time 1.6.2 -> 2.7

Options
    • -5
    • +5
    ./.classpath
  2. … 47 more files in changeset.
Sunday 30 Jul 2017
3:07 am

Andrey Balan

LDEV-4394 Fix "addTime" request

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
    • -1
    • +1
    ./web/pages/learning/learning.jsp
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
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
    • -4
    • +36
    ./web/pages/learning/waitForTimeLimitLaunch.jsp
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
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -22
    • +83
    ./src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
    • -3
    • +3
    ./web/pages/learning/learning.jsp
  4. … 9 more files in changeset.
2:57 pm

Marcin Cieslak

LDEV-4392 Fix websocket close detection

Make sure there is only, well implemented one piece of code that detects

websocket close and optionally reconnects it.

Options
    • -12
    • +10
    ./web/pages/learning/learning.jsp
Thursday 27 Jul 2017
6:04 pm

Marcin Cieslak

LDEV-4392 Fix websocket close detection

Make sure there is only, well implemented one piece of code that detects

websocket close and optionally reconnects it.

Options
    • -14
    • +42
    ./web/WEB-INF/tags/Page.tag
  2. … 37 more files in changeset.
Tuesday 25 Jul 2017
8:05 pm

Marcin Cieslak

LDEV-4392 Control websocket reconnect

Do not reconnect if close happened immediately after open. Limit command

websocket reconnects.

Options
    • -2
    • +7
    ./web/pages/learning/learning.jsp
  2. … 37 more files in changeset.
Tuesday 27 Jun 2017
12:15 am

Andrey Balan

After migration clean up

Options
    • -0
    • +2
    ./.gitignore
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
    • -31
    • +0
    ./.classpath
    • -19
    • +0
    ./.project
    • -7
    • +0
    ./build.properties
    • -26
    • +0
    ./build.xml
    • -276
    • +0
    ./conf/etherpad-lite/src/node/db/AuthorManager.js
    • -444
    • +0
    ./conf/etherpad-lite/src/node/utils/Settings.js
    • -947
    • +0
    ./conf/etherpad-lite/src/static/js/pad.js
    • -854
    • +0
    ./conf/etherpad-lite/src/static/js/pad_userlist.js
    • -184
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml
    • -58
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.hbm.xml
    • -119
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml
    • -108
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml
    • -0
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -91
    • +0
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -34
    • +0
    ./db/sql/activity_insert.sql
  16. … 125 more files in changeset.
Tuesday 13 Jun 2017
1:27 pm

Marcin Cieslak

After migration clean up

Options
    • -2
    • +0
    ./.cvsignore
    • -1
    • +0
    ./web/includes/images/.cvsignore
Wednesday 24 May 2017
1:42 pm

Marcin Cieslak

LDEV-4332: Send websocket ping after 3 minutes of idleness so the connection does not get cut because of idle timeout.

Options
    • -2
    • +27
    ./web/pages/learning/learning.jsp
1:42 pm

Marcin Cieslak

LDEV-4332: Send websocket ping after 3 minutes of idleness so the connection does not get cut because of idle timeout.

Options
    • -2
    • +27
    ./web/pages/learning/learning.jsp
Saturday 13 May 2017
2:28 pm

Marcin Cieslak

LDEV-4332: Refresh page or reconnect websocket only on abnormal close and not on navigation.

Options
    • -13
    • +26
    ./web/WEB-INF/tags/Page.tag
2:28 pm

Marcin Cieslak

LDEV-4332: Refresh page or reconnect websocket only on abnormal close and not on navigation.

Options
    • -13
    • +26
    ./web/WEB-INF/tags/Page.tag
Friday 05 May 2017
4:02 am

Andrey Balan

LDEV-4335 Change the address bar color in Android's Chrome

Options
    • -0
    • +1
    ./web/WEB-INF/tags/Head.tag
4:02 am

Andrey Balan

LDEV-4335 Change the address bar color in Android's Chrome

Options
    • -0
    • +1
    ./web/WEB-INF/tags/Head.tag
Thursday 04 May 2017
9:33 pm

Marcin Cieslak

LDEV-4332: Refresh page when a tool websocket gets closed. Re-init Command websocket when it gets closed. Rename websockets in JS code to ensure name uniqueness within the page.

Options
    • -2
    • +6
    ./web/pages/learning/learning.jsp
9:33 pm

Marcin Cieslak

LDEV-4332: Refresh page when a tool websocket gets closed. Re-init Command websocket when it gets closed. Rename websockets in JS code to ensure name uniqueness within the page.

Options
    • -2
    • +6
    ./web/pages/learning/learning.jsp