lams-github

lams_learning

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
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 22 Sep 2017
11: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
    • -20
    • +45
    ./src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
    • -4
    • +13
    ./web/notebook/view.jsp
    • -9
    • +5
    ./web/notebook/viewalljournals.jsp
  4. … 10 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
    • -1
    • +1
    ./web/grouping/show.jsp
  3. … 43 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
    • -2
    • +2
    ./web/WEB-INF/web.xml
  2. … 33 more files in changeset.
Tuesday 22 Aug 2017
12:56 pm

Marcin Cieslak

Merge branch 'master' into LDEV-4366

Options
    • -5
    • +1
    ./web/WEB-INF/struts-config.xml
12:30 pm

Marcin Cieslak

LDEV-4393 Fix parameter flow for lesson notebook

Current lesson ID was not retained during submits. It has to be present

on each page and submit so "view all" page knows where to add a new

entry.

Options
    • -12
    • +12
    ./src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
    • -5
    • +1
    ./web/WEB-INF/struts-config.xml
    • -0
    • +1
    ./web/notebook/addnew.jsp
    • -3
    • +7
    ./web/notebook/view.jsp
    • -12
    • +10
    ./web/notebook/viewall.jsp
Monday 21 Aug 2017
12:37 am

Marcin Cieslak

LDEV-4366 Smooth animation with properly resized portraits

Options
    • -7
    • +7
    ./web/css/kumalive.scss
    • -14
    • +15
    ./web/includes/javascript/kumalive.js
    • -0
    • +1
    ./web/kumalive/kumalive.jsp
Friday 18 Aug 2017
3:52 am

Andrey Balan

LDEV-4407 Move classes to the proper packages

Servlet classes were moved to learning.web.servlet package.

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

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

Options
    • -81
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/LogLessonMarkPushedToIntegrationsServlet.java
    • -218
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/RepopulateProgressMarksServlet.java
    • -0
    • +81
    ./src/java/org/lamsfoundation/lams/learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java
    • -0
    • +218
    ./src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java
    • -2
    • +2
    ./web/WEB-INF/web.xml
12:52 am

Marcin Cieslak

LDEV-4366 Use new portrait API

Options
    • -41
    • +21
    ./web/css/kumalive.scss
    • -17
    • +5
    ./web/includes/javascript/kumalive.js
  3. … 1 more file in changeset.
Thursday 17 Aug 2017
11:23 pm

Marcin Cieslak

LDEV-4366 Hide all rubric marks on question finish

Options
    • -1
    • +4
    ./web/includes/javascript/kumalive.js
11:17 pm

Marcin Cieslak

LDEV-4366 Hide "no mark" button

Options
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    ./web/includes/javascript/kumalive.js
    • -1
    • +0
    ./web/kumalive/kumalive.jsp
11:14 pm

Marcin Cieslak

LDEV-4366 Make all rubrics checked by defaul on new Kumalive create

Also hide rubrics box if there are no rubrics defined.

Options
    • -1
    • +4
    ./web/includes/javascript/kumalive.js
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
    • +51
    ./src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
    • -22
    • +23
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.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
    ./src/java/org/lamsfoundation/lams/learning/web/RepopulateProgressMarksServlet.java
    • -1
    • +1
    ./web/WEB-INF/web.xml
  3. … 18 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
    • +5
    ./.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
4:16 pm

Marcin Cieslak

LDEV-4393 Fix Add button in lesson Notebook

The initial button takes lesson ID from an attribute. If there are some

entries already, lesson ID is not set as an attribute. Instead, the

button is duplicated below and takes lesson ID from entries' external

ID. The initial button gets hidden if there are already entries.

Options
    • -12
    • +10
    ./web/notebook/viewall.jsp
12:53 pm

Marcin Cieslak

LDEV-4394 Minor improvements for compiler optimisation

Options
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
  2. … 2 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
    • -10
    • +9
    ./web/includes/javascript/presence.js
  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
    • -5
    • +9
    ./web/includes/javascript/presence.js
  3. … 36 more files in changeset.
1:05 am

Marcin Cieslak

LDEV-4366 Introduce rubrics to Kumalive

Options
    • -3
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml
    • -0
    • +28
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveRubric.hbm.xml
    • -0
    • +26
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveScore.hbm.xml
    • -1
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +102
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -56
    • +118
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -12
    • +9
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java
    • -0
    • +88
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java
    • -0
    • +78
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java
    • -0
    • +44
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -0
    • +142
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -4
    • +24
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -7
    • +0
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
  16. … 15 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
    • -78
    • +0
    ./web/css/nprogress.scss
    • -4
    • +0
    ./web/css/presence.scss
    • -1
    • +1
    ./web/grouping/show.jsp
    • -1
    • +0
    ./web/includes/javascript/nprogress.js
    • -1
    • +1
    ./web/includes/javascript/presence.js
    • -4
    • +4
    ./web/loadToolActivity.jsp
    • -1
    • +0
    ./web/presenceChat.jsp
  10. … 148 more files in changeset.
Tuesday 18 Jul 2017
2:01 pm

Marcin Cieslak

LDEV-4366 Send ping every few idle minutes

Options
    • -1
    • +34
    ./web/includes/javascript/kumalive.js
12:56 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4383: Gates title are not displayed to learners

Forgot to remove c tag from file

Options
    • -1
    • +0
    ./web/gate/permissionGateContent.jsp
12:54 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4383: Gates title are not displayed to learners

Adding gates description to a separate jsp and then include it to all gate types

Options
    • -4
    • +4
    ./web/gate/conditionGateContent.jsp
    • -0
    • +15
    ./web/gate/gateDescription.jsp
    • -3
    • +3
    ./web/gate/permissionGateContent.jsp
    • -4
    • +2
    ./web/gate/scheduleGateContent.jsp
    • -3
    • +1
    ./web/gate/synchGateContent.jsp
Wednesday 12 Jul 2017
1:11 pm

Marcin Cieslak

LDEV-4366 Make icons smaller on small devices

Options
    • -37
    • +80
    ./web/css/kumalive.scss
    • -6
    • +6
    ./web/includes/javascript/kumalive.js
12:25 pm

Marcin Cieslak

LDEV-4366 Fix checking if current user raised hand

Options
    • -4
    • +5
    ./web/includes/javascript/kumalive.js