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
Monday 23 Oct 2017
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
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.