lams-github

lams_tool_preview

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
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 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
    • -1
    • +1
    ./web/includes/css/learning.scss
    • -3
    • +5
    ./web/pages/learning/comment.jsp
    • -1
    • +2
    ./web/pages/learning/hedging.jsp
    • -3
    • +7
    ./web/pages/learning/star.jsp
  6. … 40 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
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java
    • -16
    • +31
    ./src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
    • -14
    • +8
    ./src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java
    • -2
    • +3
    ./web/pages/monitoring/criteria.jsp
    • -3
    • +10
    ./web/pages/monitoring/criteriapart.jsp
    • -1
    • +2
    ./web/pages/monitoring/summary.jsp
  8. … 36 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
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java
    • -16
    • +31
    ./src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
    • -14
    • +8
    ./src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java
    • -2
    • +3
    ./web/pages/monitoring/criteria.jsp
    • -3
    • +10
    ./web/pages/monitoring/criteriapart.jsp
    • -1
    • +2
    ./web/pages/monitoring/summary.jsp
  8. … 36 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
    • -41
    • +50
    ./src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java
    • -44
    • +52
    ./src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
    • -11
    • +14
    ./src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java
    • -159
    • +157
    ./src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java
  6. … 131 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.
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
    • -10
    • +12
    ./web/WEB-INF/tlds/lams/lams.tld
    • -12
    • +0
    ./web/includes/css/learning.scss
    • -6
    • +16
    ./web/includes/javascript/ranking.js
    • -1
    • +1
    ./web/pages/learning/comment.jsp
    • -1
    • +1
    ./web/pages/learning/hedging.jsp
    • -2
    • +2
    ./web/pages/learning/rankall.jsp
    • -1
    • +1
    ./web/pages/learning/ranking.jsp
    • -1
    • +1
    ./web/pages/learning/results.jsp
    • -1
    • +1
    ./web/pages/learning/star.jsp
    • -2
    • +1
    ./web/pages/monitoring/criteria.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
  13. … 145 more files in changeset.
Monday 10 Jul 2017
10:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 CSS Files removed if they are now generated files using SASS

Options
    • -0
    • +1
    ./.gitignore
    • -84
    • +0
    ./web/includes/css/learning.css
  3. … 41 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
    • -0
    • +16
    ./.externalToolBuilders/SASS_lams_tool_preview.launch
    • -1
    • +2
    ./.gitignore
    • -21
    • +5
    ./.project
    • -1
    • +4
    ./build.properties
    • -1
    • +0
    ./web/common/header.jsp
    • -1
    • +0
    ./web/common/tabbedheader.jsp
    • -72
    • +57
    ./web/includes/css/learning.css
    • -0
    • +90
    ./web/includes/css/learning.scss
    • -33
    • +0
    ./web/includes/css/peerreview.css
  10. … 150 more files in changeset.
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
  4. … 312 more files in changeset.
Wednesday 24 May 2017
7:35 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-2999: Moving the database update into the tool as the Peer Review tool is not included in the standard build.

Options
    • -0
    • +40
    ./src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170512.sql
  2. … 1 more file in changeset.
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.
Wednesday 17 May 2017
9:27 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-2999 Include a rating option for reviewed resources (authored only). To make the grouped rating of authored resources work properly, session id was added to the rating and rating comments tables and all code using the shared jRating script and shared ratings updated to store the session code. DB script updates existing rating, rating comment records.

Options
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java
    • -12
    • +12
    ./src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java
    • -2
    • +4
    ./web/pages/learning/comment.jsp
    • -1
    • +2
    ./web/pages/learning/star.jsp
  7. … 34 more files in changeset.
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. … 35 more files in changeset.
Friday 05 May 2017
4:03 am

Andrey Balan

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

Options
    • -0
    • +1
    ./web/WEB-INF/tags/Head.tag
  2. … 31 more files in changeset.
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
    • -18
    • +24
    ./web/WEB-INF/tags/Page.tag
  2. … 36 more files in changeset.
Thursday 27 Apr 2017
7:33 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-2999: Allow learner to change their rating (when using the tag entry) and tweaking how the retry configuration is set up on initialisation.

Options
    • -1
    • +6
    ./web/WEB-INF/tags/Rating.tag
    • -2
    • +3
    ./web/pages/learning/star.jsp
  3. … 19 more files in changeset.
Friday 07 Apr 2017
11:35 pm

Andrey Balan

LDEV-4233 After teacher hid the learner do not show this user in export file

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
    • -19
    • +19
    ./src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java
10:26 pm

Andrey Balan

LDEV-4286 * Edit Activity in monitoring page to be opened in a popup page * Move "Edit activity" buttons to the right

Options
    • -1
    • +1
    ./web/pages/monitoring/editactivity.jsp
  2. … 29 more files in changeset.
Tuesday 04 Apr 2017
8:27 pm

Andrey Balan

LDEV-4300 Audit logs when activity is modified in monitor

Options
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java
  4. … 86 more files in changeset.
9:39 am

erniegx <ernieg@gmail.com>

LDEV-4072: fixing label

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
Friday 31 Mar 2017
2:31 am

Andrey Balan

LDEV-4291 Move getAccessMode method to WebUtil

Options
    • -27
    • +4
    ./src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java
  2. … 30 more files in changeset.
Saturday 25 Mar 2017
12:37 am

Andrey Balan

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

Options
    • -52
    • +16
    ./src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java
    • -3
    • +1
    ./web/WEB-INF/struts-config.xml
    • -14
    • +10
    ./web/pages/authoring/authoring.jsp
    • -75
    • +0
    ./web/pages/authoring/definelater.jsp
  5. … 23 more files in changeset.