lams-github / lams_build

lib

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
Tuesday 31 Oct 2017
12:59 am

Marcin Cieslak

LDEV-4453 Add "gradebook on lesson complete" field to Lesson

Options
    • binary
    ./lams/lams.jar
  2. … 8 more files in changeset.
Monday 30 Oct 2017
3:50 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

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

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

Options
    • binary
    ./lams/lams.jar
  2. … 4 more files in changeset.
Thursday 26 Oct 2017
7:29 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • binary
    ./lams/lams.jar
  2. … 1 more file in changeset.
6: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
    ./lams/lams.jar
  2. … 10 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
    • binary
    ./lams/lams.jar
  2. … 6 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
    • binary
    ./lams/lams-learning.jar
  2. … 4 more files in changeset.
12:05 am

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on organisation level

Options
    • binary
    ./lams/lams.jar
  2. … 7 more files in changeset.
Monday 23 Oct 2017
11:34 pm

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on sysadmin level

Options
    • binary
    ./lams/lams.jar
  2. … 6 more files in changeset.
2:29 am

Marcin Cieslak

Merge branch 'LDEV-4366'

Options
    • binary
    ./lams/lams.jar
  2. … 4 more files in changeset.
Friday 20 Oct 2017
4:15 am

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
    ./lams/lams-central.jar
  2. … 67 more files in changeset.
Friday 13 Oct 2017
9:26 pm

Marcin Cieslak

LDEV-4440 Upgrade Spring to version 4.3.12

Add Spring MVC module.

Options
    • binary
    ./spring/spring-aop-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-aop-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-beans-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-beans-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-context-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-context-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-context-support-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-context-support-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-core-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-core-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-expression-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-expression-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-jdbc-4.3.10.RELEASE.jar
    • binary
    ./spring/spring-jdbc-4.3.12.RELEASE.jar
    • binary
    ./spring/spring-orm-4.3.10.RELEASE.jar
  16. … 10 more files in changeset.
8:02 pm

Marcin Cieslak

Fix merged lams.jar

Options
    • binary
    ./lams/lams.jar
8: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
    ./lams/lams.jar
  2. … 8 more files in changeset.
Wednesday 11 Oct 2017
10: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
    ./lams/lams.jar
  2. … 2 more files in changeset.
Monday 09 Oct 2017
5:12 pm

Marcin Cieslak

Update LAMS libraries after merge

Options
    • binary
    ./lams/lams-central.jar
    • binary
    ./lams/lams.jar
5:08 pm

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

Marcin Cieslak

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

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

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
    ./lams/lams.jar
  2. … 3 more files in changeset.
Wednesday 27 Sep 2017
2:30 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Gradebook calculations and UI support weighting

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

Marcin Cieslak

LDEV-4415 Add a title to weights dialog

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

Marcin Cieslak

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

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

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • binary
    ./lams/lams.jar
5:22 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in GMap

Options
    • binary
    ./lams/lams.jar
  2. … 3 more files in changeset.
Sunday 10 Sep 2017
12:29 pm

Marcin Cieslak

Merge LDEV-4408 into lams31

Options
    • binary
    ./lams/lams.jar
  2. … 1 more file in changeset.
12:22 pm

Marcin Cieslak

LDEV-4408 Implement session list in sysadmin

Options
    • binary
    ./lams/lams.jar
  2. … 7 more files in changeset.
Saturday 09 Sep 2017
4:45 pm

Marcin Cieslak

LDEV-4402 Reintroduce XML Commons library

The library was supposed to become obsolete after changing XStream cod,

but is still required by Struts and Apache Commons Validator.

Also obsolete entries for JBoss Web and Gson were removed from a

configuration file.

Options
    • binary
    ./xml-commons/xml-apis-ext.jar
    • binary
    ./xml-commons/xml-apis.jar
    • -0
    • +49
    ./xml-commons/xmlcommons.module.xml
  4. … 2 more files in changeset.
4:39 pm

Marcin Cieslak

LDEV-4293, LDEV-4400 Update domain configuration for WF10

WildFly 10 configuration files are slightly changed compared to WildFly

8 and LAMS custom stuff had to be adjusted too.

Options
    • binary
    ./lams/lams.jar
  2. … 2 more files in changeset.
Friday 08 Sep 2017
12:22 pm

Marcin Cieslak

LDEV-4415 Add front end for weighted outputs

Options
    • binary
    ./lams/lams.jar
  2. … 14 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
    • binary
    ./lams/lams.jar
  2. … 74 more files in changeset.