lams-github

lams_tool_larsrc

Clone Tools

Stats

Commits this week: 0
Total Committers: 25
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 09 Oct 2017
5:08 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.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/web/actions/LearningWebsocketServer.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

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

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
  3. … 28 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.
Monday 11 Sep 2017
10:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java
    • -18
    • +32
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dto/ReflectDTO.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dto/VisitLogDTO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
    • -1
    • +2
    ./web/pages/monitoring/reflections.jsp
    • -8
    • +18
    ./web/pages/monitoring/summary.jsp
  10. … 34 more files in changeset.
10:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java
    • -18
    • +32
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dto/ReflectDTO.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dto/VisitLogDTO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
    • -1
    • +2
    ./web/pages/monitoring/reflections.jsp
    • -8
    • +18
    ./web/pages/monitoring/summary.jsp
  10. … 34 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.
Saturday 26 Aug 2017
4:04 pm

Marcin Cieslak

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

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
  2. … 33 more files in changeset.
Friday 18 Aug 2017
3:46 am

Andrey Balan

LDEV-4407 Move lams_contentrepository exceptions to the proper package

lams_contentrepository's exception classes were moved to

contentrepository.exception package.

(To access exceptions' earlier history use Eclipse's Show in History

feature or run 'git log --follow ./path/to/file')

Options
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
  2. … 66 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
    • -68
    • +76
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -18
    • +18
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
  4. … 133 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
    • -4
    • +4
    ./.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.
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
  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
    • -4
    • +14
    ./web/WEB-INF/tags/Page.tag
  2. … 37 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
    • -1
    • +1
    ./web/pages/learning/learning.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
  5. … 153 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
    • -34
    • +27
    ./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.
Thursday 29 Jun 2017
4:23 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4370 Show/Hide resources in monitor does not refresh properly

Options
    • -2
    • +2
    ./web/pages/monitoring/summary.jsp
1:39 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4350, LDEV-2999 adding labels

LDEV-4350, LDEV-2999 adding labels

Options
    • -3
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
1:39 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4350, LDEV-2999: adding labels

Adding new lable for LDEV-4350 and LDEV-2999

Options
    • -6
    • +7
    ./conf/language/lams/ApplicationResources.properties
1:37 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Updating Greek

Options
    • -3
    • +8
    ./conf/language/lams/ApplicationResources_el_GR.properties
Wednesday 28 Jun 2017
1:19 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4350 Include delete file button for student to remove the old file and reload a new one.

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +2
    ./web/pages/learning/learning.jsp
12:08 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4350 Include delete file button for student to remove the old file and reload a new one.

Options
    • -4
    • +5
    ./web/pages/learning/learning.jsp
11:41 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4350: Include delete file button for student to remove the old file and reload a new one.

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
Tuesday 13 Jun 2017
1:03 pm

Marcin Cieslak

After migration clean up

Options
    • -2
    • +0
    ./.cvsignore
    • -0
    • +2
    ./.gitignore
    • -1
    • +0
    ./web/includes/images/.cvsignore
    • -1
    • +0
    ./web/pages/learningobj/icons/.cvsignore
  5. … 311 more files in changeset.
Friday 09 Jun 2017
3:42 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4350 :Include delete file button for student to remove the old file and reload a new one.

Options
    • -1
    • +21
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
    • -0
    • +6
    ./web/WEB-INF/struts-config.xml
    • -1
    • +24
    ./web/pages/learning/learning.jsp
Monday 29 May 2017
9:59 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-2999L Putting new Rating option on a line by itself for clarity.

Options
    • -0
    • +1
    ./web/pages/authoring/parts/addurl.jsp
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
    • -5
    • +28
    ./web/WEB-INF/tags/Page.tag
  2. … 39 more files in changeset.