lams-github

lams_monitoring

Clone Tools

Stats

Commits this week: 0
Total Committers: 30
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
Wednesday 11 Oct 2017
1:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4415' Marks can now be weighted

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
  2. … 1 more file in changeset.
6:39 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek and English

Options
    • -5
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
Wednesday 27 Sep 2017
9:43 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Course export uses percentages, tour supports weights

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +6
    ./web/monitorTour.jsp
  3. … 1 more file in changeset.
Sunday 24 Sep 2017
3:32 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4420 Lesson status changes recorded in audit log.

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +40
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Friday 22 Sep 2017
5:20 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4423 Adding portraits to Monitor screens

Portraits incorporated into general monitor screens such as the

email sending popup, journal viewing, grouping and learner

progress. Also fixed issues in journal viewing relating to

LDEV-4393.

Options
    • -14
    • +1
    ./web/css/_monitorLesson_base.scss
    • -1
    • +2
    ./web/grouping/viewGroups.jsp
    • -7
    • +17
    ./web/includes/javascript/monitorLesson.js
    • -0
    • +1
    ./web/monitor.jsp
  5. … 9 more files in changeset.
Monday 18 Sep 2017
2: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.
Friday 15 Sep 2017
4:32 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4412: Audit log entries are created when lessons are removed.

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Wednesday 30 Aug 2017
1: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.
1: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 17 Aug 2017
10:04 pm

Andrey Balan

LDEV-4407 Move ContributeDTOFactory to the proper package

ContributeDTOFactory were moved to

org.lamsfoundation.lams.monitoring.service package.

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

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

Options
    • -170
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/ContributeDTOFactory.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java
    • -0
    • +170
    ./src/java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
Sunday 13 Aug 2017
3:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4405 War deployment minifies Javascript files

Options
    • -0
    • +4
    ./build.xml
Wednesday 09 Aug 2017
6:28 pm

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
    • -49
    • +51
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -28
    • +27
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressAction.java
    • -26
    • +29
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -82
    • +77
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
  6. … 131 more files in changeset.
Monday 07 Aug 2017
9:03 am

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
11:36 am

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.
8:11 am

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.
7:04 am

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.
Friday 04 Aug 2017
9:02 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4397: display shortenURL

Slightly modifying the UI

Options
    • -7
    • +0
    ./web/includes/javascript/monitorLesson.js
    • -17
    • +8
    ./web/monitor.jsp
Tuesday 01 Aug 2017
1:12 pm

Andrey Balan

LDEV-4397 Fix lesson URL shortener functionality

Options
    • -15
    • +19
    ./web/monitor.jsp
Monday 31 Jul 2017
5: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
12: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
2: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.
9:42 am

Marcin Cieslak

LDEV-4837 Fix learner icons positioning

New sequences have optional activities coordinates set correctly. Old

sequences had them set in Flash and they are broken in DB for FLA. SVG

generator can cope with it, now Monitoring too.

The solution uses SVG path instead of DB coordinates.

Options
    • -5
    • +5
    ./web/includes/javascript/monitorLesson.js
3:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4390 Purple Theme

Options
    • -0
    • +2
    ./web/css/purple_monitorLesson.scss
  2. … 9 more files in changeset.
Wednesday 19 Jul 2017
12: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
    • -0
    • +402
    ./web/css/_monitorLesson_base.scss
    • -0
    • +2
    ./web/css/defaultHTML_monitorLesson.scss
    • -413
    • +0
    ./web/css/monitorLesson.scss
    • -3
    • +3
    ./web/monitor.jsp
  7. … 151 more files in changeset.
Tuesday 11 Jul 2017
5:36 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels i18n

Mainly Norwegian, Greek and English

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +31
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -49
    • +153
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 49 more files in changeset.
Monday 10 Jul 2017
3:05 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4372 Tooltips in Monitoring tabs no longer clash

Options
    • -1
    • +1
    ./web/monitor.jsp
  2. … 8 more files in changeset.
4: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
    • -325
    • +0
    ./web/css/monitorLesson.css
  3. … 41 more files in changeset.
Saturday 01 Jul 2017
5: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_monitoring.launch
    • -1
    • +2
    ./.gitignore
    • -0
    • +9
    ./.project
    • -241
    • +161
    ./web/css/monitorLesson.css
    • -0
    • +413
    ./web/css/monitorLesson.scss
  6. … 154 more files in changeset.
Tuesday 13 Jun 2017
7:03 am

Marcin Cieslak

After migration clean up

Options
    • -2
    • +0
    ./.cvsignore
    • -0
    • +2
    ./.gitignore
  3. … 313 more files in changeset.
Wednesday 07 Jun 2017
8:30 am

erniegx <ernieg@gmail.com>

LDEV-4054 Updating Greek

Options
    • -2
    • +19
    ./conf/language/lams/ApplicationResources_el_GR.properties