lams-github

lams_build

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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
Thursday 26 Oct 2017
1:29 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • binary
    ./lib/lams/lams.jar
  2. … 1 more file in changeset.
12:55 am

Andrey Balan

LDEV-4451 Create Confidence level system

Create Confidence level classes similar to the Ratings ones, that we

already have. They must be located in lams_common folder as it's going

to be used by 3 tools: learners are going to enter them in Assessment

and MCQ, and we later display them in all three tools.

Options
    • binary
    ./lib/lams/lams.jar
  2. … 10 more files in changeset.
Wednesday 25 Oct 2017
11:50 am

Marcin Cieslak

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

Rewrite Kumalive JSON code to Jackson

Options
    • binary
    ./lib/lams/lams.jar
  2. … 6 more files in changeset.
Tuesday 24 Oct 2017
3:53 pm

Marcin Cieslak

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

Options
    • binary
    ./lib/lams/lams-learning.jar
  2. … 4 more files in changeset.
Monday 23 Oct 2017
6:05 pm

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on organisation level

Options
    • binary
    ./lib/lams/lams.jar
  2. … 7 more files in changeset.
5:34 pm

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on sysadmin level

Options
    • binary
    ./lib/lams/lams.jar
  2. … 6 more files in changeset.
Sunday 22 Oct 2017
8:29 pm

Marcin Cieslak

Merge branch 'LDEV-4366'

Options
    • binary
    ./lib/lams/lams.jar
  2. … 4 more files in changeset.
Thursday 19 Oct 2017
10:15 pm

Marcin Cieslak

LDEV-4440 Add a test library which does not reference Struts

After full LAMS migration to Spring MVC it will become

3rdParty.userlibraries

Options
    • binary
    ./lib/lams/lams-central.jar
  2. … 67 more files in changeset.
10:15 pm

Marcin Cieslak

LDEV-4440 Add a test library which does not reference Struts

After full LAMS migration to Spring MVC it will become

3rdParty.userlibraries

Options
    • -0
    • +38
    ./noStruts.userlibraries
Saturday 14 Oct 2017
2:59 pm

Marcin Cieslak

LDEV-4400, LDEV-3315 Comment out a test parameter

It should be uncommented only for TestHarness.

Options
    • -11
    • +22
    ./conf/host.xml
2:51 pm

Marcin Cieslak

LDEV-4400, LDEV-3315 Toggle session ID change for each LAMS module

WildFly 10 changes session ID after authentication by default in order

to prevent session fixation attack. It breaks TestHarness, though. In

order to run TH, session ID change needs to be turned off.

Turning it off for Central is not enough as a request to any other

module, like Tool, triggers session ID change. In this case we need to

have session ID change turned on or off in each LAMS module, not just

Central.

Options
    • -1
    • +9
    ./build_base.xml
    • -0
    • +1
    ./conf/deployment-handler/io.undertow.servlet.ServletExtension
    • -10
    • +15
    ./conf/host.xml
  4. … 2 more files in changeset.
Friday 13 Oct 2017
3:26 pm

Marcin Cieslak

LDEV-4440 Upgrade Spring to version 4.3.12

Add Spring MVC module.

Options
    • -8
    • +11
    ./3rdParty.userlibraries
    • binary
    ./lib/spring/spring-aop-4.3.10.RELEASE.jar
    • binary
    ./lib/spring/spring-aop-4.3.12.RELEASE.jar
    • binary
    ./lib/spring/spring-beans-4.3.10.RELEASE.jar
    • binary
    ./lib/spring/spring-beans-4.3.12.RELEASE.jar
    • binary
    ./lib/spring/spring-context-4.3.10.RELEASE.jar
    • binary
    ./lib/spring/spring-context-4.3.12.RELEASE.jar
    • binary
    ./lib/spring/spring-context-support-4.3.10.RELEASE.jar
    • binary
    ./lib/spring/spring-context-support-4.3.12.RELEASE.jar
    • binary
    ./lib/spring/spring-core-4.3.10.RELEASE.jar
    • binary
    ./lib/spring/spring-core-4.3.12.RELEASE.jar
    • binary
    ./lib/spring/spring-expression-4.3.10.RELEASE.jar
    • binary
    ./lib/spring/spring-expression-4.3.12.RELEASE.jar
    • binary
    ./lib/spring/spring-jdbc-4.3.10.RELEASE.jar
    • binary
    ./lib/spring/spring-jdbc-4.3.12.RELEASE.jar
  16. … 10 more files in changeset.
2:02 pm

Marcin Cieslak

Fix merged lams.jar

Options
    • binary
    ./lib/lams/lams.jar
2:01 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

Options
    • binary
    ./lib/lams/lams.jar
  2. … 8 more files in changeset.
Wednesday 11 Oct 2017
4:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Merging LDEV-4433 changes from Master

Added weighting % markers to the new activity summary.

Options
    • binary
    ./lib/lams/lams.jar
  2. … 2 more files in changeset.
Monday 09 Oct 2017
11:12 am

Marcin Cieslak

Update LAMS libraries after merge

Options
    • binary
    ./lib/lams/lams-central.jar
    • binary
    ./lib/lams/lams.jar
11:08 am

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -1
    • +1
    ./common.properties
    • binary
    ./lib/lams/lams.jar
    • -1
    • +1
    ./unix.properties
  4. … 27 more files in changeset.
Saturday 07 Oct 2017
2:14 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4433: reverting files that shouldn't have changed.

Options
    • -4
    • +0
    ./common.properties
    • -1
    • +0
    ./unix.properties
2:00 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4433: adding new label

Options
    • -1
    • +5
    ./common.properties
    • -1
    • +2
    ./unix.properties
  3. … 2 more files in changeset.
Monday 02 Oct 2017
8:44 pm

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
    • binary
    ./lib/lams/lams.jar
  2. … 11 more files in changeset.
Sunday 01 Oct 2017
2:59 pm

Marcin Cieslak

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

Options
    • binary
    ./lib/lams/lams.jar
  2. … 1 more file in changeset.
Saturday 30 Sep 2017
7:09 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4366

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java

Options
    • binary
    ./lib/lams/lams.jar
  2. … 3 more files in changeset.
Wednesday 27 Sep 2017
8:30 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Gradebook calculations and UI support weighting

Options
    • binary
    ./lib/lams/lams-gradebook.jar
    • binary
    ./lib/lams/lams.jar
  3. … 15 more files in changeset.
Monday 25 Sep 2017
3:14 pm

Marcin Cieslak

LDEV-4415 Add a title to weights dialog

Options
    • binary
    ./lib/lams/lams.jar
  2. … 3 more files in changeset.
2:45 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4415

Options
    • binary
    ./lib/lams/lams.jar
  2. … 1 more file in changeset.
Thursday 14 Sep 2017
12:08 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 branch rebased to master and merge conflict of lams.jar resolved.

Options
    • binary
    ./lib/lams/lams.jar
11:22 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in GMap

Options
    • binary
    ./lib/lams/lams.jar
  2. … 3 more files in changeset.
Monday 11 Sep 2017
6:39 am

Marcin Cieslak

LDEV-4293 Prevent deadlock exceptions on logout

It seems that a server-side logout not only causes invalidation

exception (which will be dealt with soon), but also puts session fetch

transaction in deadlock. This commit fixed the deadlock.

Options
    • -1
    • +1
    ./conf/domain.xml
Sunday 10 Sep 2017
6:29 am

Marcin Cieslak

Merge LDEV-4408 into lams31

Options
    • binary
    ./lib/lams/lams.jar
  2. … 1 more file in changeset.
6:22 am

Marcin Cieslak

LDEV-4408 Implement session list in sysadmin

Options
    • binary
    ./lib/lams/lams.jar
  2. … 7 more files in changeset.