lams-github

lams_tool_scribe

Clone Tools

Stats

Commits this week: 0
Total Committers: 21
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
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/scribe/service/ScribeService.java
  2. … 45 more files in changeset.
Wednesday 22 Nov 2017
8:55 pm

Andrey Balan

LDEV-4473 Add bootstrap.js when it's not available on page

Options
    • -1
    • +7
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Thursday 16 Nov 2017
4:54 am

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./web/WEB-INF/tags/Page.tag
  2. … 33 more files in changeset.
Thursday 02 Nov 2017
10:41 pm

Marcin Cieslak

LDEV-4411 Add collections 2nd level cache

Options
    • -0
    • +4
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml
    • -0
    • +4
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml
  3. … 96 more files in changeset.
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/scribe/service/ScribeService.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/scribe/model/Scribe.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml
  6. … 233 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
8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java
    • -11
    • +6
    ./web/layouts/defaultLayout.jsp
    • -6
    • +10
    ./web/pages/monitoring/summary.jsp
  4. … 33 more files in changeset.
8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java
    • -11
    • +6
    ./web/layouts/defaultLayout.jsp
    • -6
    • +10
    ./web/pages/monitoring/summary.jsp
  4. … 33 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.
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
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java
    • -32
    • +29
    ./src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
    • -17
    • +26
    ./src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
  7. … 130 more files in changeset.
Monday 07 Aug 2017
3:03 pm

Marcin Cieslak

LDEV-4402 Get rid of LAMS customised session filter

This filter was implemented in 2005 and seems more like a workaround

than a feature we need. Especially that many of LAMS tools already use

the standard filter and they work OK.

Options
    • -1
    • +1
    ./web/WEB-INF/web.xml
  2. … 23 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
    • -3
    • +3
    ./.classpath
  2. … 47 more files in changeset.
2:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Sizing tweaks

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.
1:04 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

Options
    • -0
    • +28
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  3. … 87 more files in changeset.
Monday 31 Jul 2017
11:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Portrait tag and javascript to display portraits

A new tag and javascript file shows the user portraits in one of 4 sizes

and either square or round. If no portrait exists a generic coloured

user icon is used. Portraits shown in Forum and Noticeboard Comments.

Options
    • -0
    • +26
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 53 more files in changeset.
Saturday 29 Jul 2017
12:53 pm

Marcin Cieslak

LDEV-4394 Minor improvements for compiler optimisation

Options
    • -13
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
  2. … 2 more files 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
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
    • -7
    • +17
    ./src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
  4. … 9 more files in changeset.
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
    • -6
    • +5
    ./web/WEB-INF/tags/Page.tag
    • -8
    • +9
    ./web/pages/learning/learning.jsp
  3. … 36 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
    • -4
    • +14
    ./web/WEB-INF/tags/Page.tag
    • -2
    • +29
    ./web/pages/learning/learning.jsp
  3. … 36 more files in changeset.
Wednesday 19 Jul 2017
6:30 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

Options
    • -2
    • +2
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +12
    ./web/WEB-INF/tlds/lams/lams.tld
  3. … 155 more files in changeset.
Tuesday 11 Jul 2017
11:36 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels i18n

Mainly Norwegian, Greek and English

Options
    • -29
    • +18
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 52 more files in changeset.
Saturday 01 Jul 2017
11:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 SASS Used for CSS Development

First pass of converting our .css development to use SASS. Autobuild to

convert .scss to .css files has been set up for all projects where

target .css files were found. The overall ANT build has been modified

so the normal build will generate the .css files from .scss files. The

base variables are defined in lams_build/conf/sccs.

Options
    • -1
    • +2
    ./.gitignore
  2. … 158 more files in changeset.
Tuesday 13 Jun 2017
1:03 pm

Marcin Cieslak

After migration clean up

Options
    • -2
    • +0
    ./.cvsignore
    • -0
    • +2
    ./.gitignore
  3. … 313 more files in changeset.
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
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
    • -5
    • +28
    ./web/WEB-INF/tags/Page.tag
    • -4
    • +33
    ./web/pages/learning/scribe.jsp
  4. … 37 more files in changeset.
Thursday 18 May 2017
8:18 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4336: Running the test harness showed up a case where reportText can be null so that is now catered for in the newline processing

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
Saturday 13 May 2017
2:29 pm

Marcin Cieslak

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

Options
    • -4
    • +7
    ./web/WEB-INF/tags/Page.tag
    • -2
    • +4
    ./web/pages/learning/learning.jsp
  3. … 34 more files in changeset.
1:27 am

Andrey Balan

LDEV-4343 Remove obsolete "style" attribute from CssTag

Options
    • -9
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
    • -5
    • +3
    ./web/pages/authoring/pedagogicalPlannerForm.jsp
  3. … 55 more files in changeset.
Friday 12 May 2017
8:08 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4336: Text coming via websocket is now escaped and the newlines converted to <br> so the pages can use it as html and get the correct visual line breaks.

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
    • -1
    • +1
    ./web/pages/learning/learning.jsp
    • -1
    • +1
    ./web/pages/learning/scribe.jsp