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
Tuesday 07 Nov 2017
6:21 pm

Marcin Cieslak

LDEV-4453 Add "Your mark" in lesson complete gradebook

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    ./web/lessonComplete.jsp
  3. … 3 more files in changeset.
Saturday 04 Nov 2017
8:10 pm

Marcin Cieslak

LDEV-4453 Add gradebook on lesson complete front end

Options
    • -0
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
    • -0
    • +82
    ./web/lessonComplete.jsp
  4. … 4 more files in changeset.
Thursday 02 Nov 2017
10:41 pm

Marcin Cieslak

LDEV-4411 Add collections 2nd level cache

Options
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml
  2. … 97 more files in changeset.
Tuesday 31 Oct 2017
2:02 pm

Marcin Cieslak

LDEV-4366 Fix case of Kumalive class in Ant build file

It worked fine on case-insensitive systems, but on Linux it could not

find the Kumalive websocket class.

Options
    • -1
    • +1
    ./build.xml
2:02 pm

Marcin Cieslak

LDEV-4366 Fix case of Kumalive class in Ant build file

It worked fine on case-insensitive systems, but on Linux it could not

find the Kumalive websocket class.

Options
    • -1
    • +1
    ./build.xml
2:02 pm

Marcin Cieslak

LDEV-4366 Fix case of Kumalive class in Ant build file

It worked fine on case-insensitive systems, but on Linux it could not

find the Kumalive websocket class.

Options
    • -1
    • +1
    ./build.xml
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/learning/command/Command.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveRubric.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveScore.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/presence/model/PresenceChatMessage.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/presence/model/PresenceChatUser.hbm.xml
  7. … 232 more files in changeset.
Wednesday 25 Oct 2017
5:50 pm

Marcin Cieslak

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

Rewrite Kumalive JSON code to Jackson

Options
    • -0
    • +332
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -0
    • +566
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +61
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -0
    • +556
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  5. … 3 more files in changeset.
Tuesday 24 Oct 2017
9:53 pm

Marcin Cieslak

LDEV-4366 Disable learner's button when Kumalive is not started

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  3. … 3 more files in changeset.
Monday 23 Oct 2017
11:34 pm

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on sysadmin level

Options
    • -0
    • +50
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
  3. … 5 more files in changeset.
2:29 am

Marcin Cieslak

Merge branch 'LDEV-4366'

Options
    • -2
    • +41
    ./conf/language/lams/ApplicationResources.properties
  2. … 4 more files in changeset.
Friday 20 Oct 2017
3:44 am

Marcin Cieslak

LDEV-4402 Fix an incorrect property in JSON

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
Friday 13 Oct 2017
9:26 pm

Marcin Cieslak

LDEV-4440 Upgrade Spring to version 4.3.12

Add Spring MVC module.

Options
    • -32
    • +23
    ./src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java
  2. … 24 more files in changeset.
Wednesday 11 Oct 2017
1:27 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4435 Portraits displayed for View Learners grouping option

Options
    • -4
    • +10
    ./web/grouping/choose.jsp
12:26 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English (AU)

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
Wednesday 04 Oct 2017
2:09 pm

Marcin Cieslak

LDEV-4366 Re-enable export buttons based on cookie conversation

The solution is based on Andrey's solution for Gradebook.

Options
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -17
    • +28
    ./web/kumalive/kumaliveReport.jsp
Tuesday 03 Oct 2017
2:19 pm

Marcin Cieslak

LDEV-4366 Add learners summary sheet to Kumalive Excel report

Also add date to learner attempts in Kumalive sheet and do some minor

formatting.

Options
    • -1
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -17
    • +125
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
2:17 pm

Marcin Cieslak

LDEV-4366 Disable export buttons to prevent double clicking

They get re-enable after few seconds.

Options
    • -11
    • +21
    ./web/kumalive/kumaliveReport.jsp
10:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4423 Additional portrait entries

Options
    • -1
    • +1
    ./web/grouping/show.jsp
  2. … 10 more files in changeset.
2:44 am

Marcin Cieslak

LDEV-4366 Kumalive reports export

Allow exporting all and selected Kumalives in Excel format. Use i18n

instead of hardcoded labels. Move free jqGrid library to lams_central.

Minor fixes.

Options
    • -0
    • +14
    ./conf/language/lams/ApplicationResources.properties
    • -5
    • +52
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -2
    • +13
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -27
    • +150
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -20829
    • +0
    ./web/includes/javascript/jquery.jqgrid.src.js
    • -14
    • +57
    ./web/kumalive/kumaliveReport.jsp
  10. … 3 more files in changeset.
Sunday 01 Oct 2017
8:59 pm

Marcin Cieslak

LDEV-4366 Fix JAR broken when merging. Fix batch naming.

Options
    • -1
    • +1
    ./web/includes/javascript/kumalive.js
  2. … 1 more file in changeset.
2:05 am

Marcin Cieslak

LDEV-4366 Initial implementation of Kumalive reports

Latest free jqGrid is used as the one present in lams_central is

outdated and standard jqGrid became commercial.

Use bootstrap theme with Font Awesome icons.

Rewrite XML code used in Gradebook to feed jqGrid into JSON.

Options
    • -0
    • +1
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveScore.hbm.xml
    • -5
    • +126
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -2
    • +9
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -2
    • +45
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -2
    • +11
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -4
    • +181
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -0
    • +5
    ./web/WEB-INF/struts-config.xml
    • -0
    • +20829
    ./web/includes/javascript/jquery.jqgrid.src.js
    • -1
    • +4
    ./web/includes/javascript/kumalive.js
    • -0
    • +160
    ./web/kumalive/kumaliveReport.jsp
  13. … 3 more files in changeset.
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