lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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 19 Dec 2017
8:47 pm

Marcin Cieslak

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

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

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

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

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

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

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

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -0
    • +13
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
    • -3
    • +5
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
    • -16
    • +73
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
    • -1
    • +1
    /lams_build/conf/domain.xml
    • -1
    • +1
    /lams_build/conf/slim/standalone.xml
    • -1
    • +1
    /lams_build/conf/standalone.xml
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -36
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
    • -9
    • +59
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -5
    • +160
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
  16. … 31 more files in changeset.
8:03 am

Andrey Balan

LDEV-4490 Fix exceptions caused by NULL ConfidenceLevel columns

Options
    • -0
    • +17
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171218.sql
    • -0
    • +17
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20171218.sql
Sunday 17 Dec 2017
9:27 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4487 Toggle display activity scores option in monitor

Options
    • -0
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java
    • -0
    • +6
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +9
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +19
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -0
    • +18
    /lams_monitoring/web/css/_monitorLesson_base.scss
    • -0
    • +22
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -4
    • +19
    /lams_monitoring/web/monitor.jsp
    • -0
    • +15
    /lams_monitoring/web/monitorTour.jsp
Saturday 16 Dec 2017
6:27 pm

Marcin Cieslak

Merge branch 'LDEV-4488'

Options
6:25 pm

Marcin Cieslak

LDEV-4488 Add "create date" in org details

Options
    • -0
    • +10
    /lams_admin/web/organisation/list.jsp
6:11 pm

Marcin Cieslak

LDEV-4488 Replace "description" column with "create date" in org list

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -3
    • +5
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
    • -2
    • +2
    /lams_admin/web/organisation/list.jsp
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java
4:46 pm

Marcin Cieslak

Merge branch 'LDEV-4486'

Options
4:44 pm

Marcin Cieslak

LDEV-4486 Prevent user from removing course if there are lessons in it

When sysadming tries to remove a course, he gets warned about lessons

existing in the course or its subcourses. Then he is redirected to a

page where he can remove the lessons. Only if the course and its

subcourses are empty, the course can get removed.

Options
    • -0
    • +2
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -6
    • +13
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
    • -1
    • +30
    /lams_admin/web/organisation/createOrEdit.jsp
Friday 15 Dec 2017
9:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch for LDEV-4476 LDEV-4477 LDEV-4487

Options
Thursday 14 Dec 2017
10:55 pm

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

Merge branch 'LDEV-4482'

Options
10:53 pm

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

LDEV-4489 Fixing bug that non-leaders cannot pass the submit files if they have got to the activity before the leader.

Options
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
7:08 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

Merge branch 'LDEV-4482'

Options
7:05 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

LDEV-4489 Fix the bug that Non-leaders cannot pass the submit files if they have got to the activity before the leader

Options
    • -1
    • +1
    /lams_tool_sbmt/web/learner/waitForLeaderTimeLimit.jsp
    • -1
    • +1
    /lams_tool_sbmt/web/learner/waitforleader.jsp
Wednesday 13 Dec 2017
9:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4477 Disable trigger removed when status changed.

Options
    • -7
    • +20
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
4:04 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4474 Able to change the scheduled open date time for a gate.

Also fixed a number of bugs causing the schedule gate screens to

report strange times, missing fields, etc.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -2
    • +0
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +0
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -6
    • +2
    /lams_learning/web/gate/scheduleGateContent.jsp
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +71
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -2
    • +33
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
    • -0
    • +1
    /lams_monitoring/web/WEB-INF/struts-config.xml
    • -1
    • +1
    /lams_monitoring/web/gate/gateStatus.jsp
    • -0
    • +66
    /lams_monitoring/web/gate/scheduleGateContent.jsp
1:43 pm

Marcin Cieslak

LDEV-4485 Remove ratings when whole lesson is removed

Options
    • -0
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171213.sql
8:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4477 Disable lesson on schedule

Options
    • -0
    • +5
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/FinishScheduleLessonJob.java
    • -3
    • +19
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -56
    • +118
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -11
    • +19
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -1
    • +0
    /lams_monitoring/web/css/_monitorLesson_base.scss
    • -22
    • +76
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -7
    • +27
    /lams_monitoring/web/monitor.jsp
Tuesday 12 Dec 2017
7:25 pm

Marcin Cieslak

Merge branch 'LDEV-4485'

Options
7:24 pm

Marcin Cieslak

LDEV-4485 Implement deletion of all lessons from a course

Options
    • -2
    • +7
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -10
    • +61
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
    • -0
    • +5
    /lams_admin/web/WEB-INF/struts-config.xml
    • -0
    • +5
    /lams_admin/web/WEB-INF/tiles-defs.xml
    • -0
    • +76
    /lams_admin/web/organisation/deleteAllLessons.jsp
    • -12
    • +13
    /lams_admin/web/organisation/list.jsp
4:58 pm

Marcin Cieslak

LDEV-4485 Adjust course heading layout

Options
    • -5
    • +10
    /lams_admin/web/organisation/list.jsp
    • -1
    • +11
    /lams_admin/web/userlist.jsp
Sunday 10 Dec 2017
1:13 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4476: Monitor can change the scheduled start date.

Options
    • -22
    • +28
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +5
    /lams_monitoring/web/css/_monitorLesson_base.scss
    • -3
    • +1
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -4
    • +5
    /lams_monitoring/web/monitor.jsp
Saturday 09 Dec 2017
12:01 pm

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

Merge branch 'LDEV-4482'

Options
12:00 pm

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

LDEV-4482 Update changes on Leader Awareness feature for Submit File tool

Options
    • -1
    • +4
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -4
    • +14
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
    • -3
    • +3
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java
    • -0
    • +40
    /lams_tool_sbmt/web/learner/waitForLeaderTimeLimit.jsp
    • -0
    • +53
    /lams_tool_sbmt/web/learner/waitforleader.jsp
Thursday 07 Dec 2017
9:23 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

Merge branch 'LDEV-4482'

Options
9:22 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

LDEV-4482 Doing Minor Updates on Leader Awareness of Submit Tool

Options
    • -10
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java
    • -9
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20171114.sql
    • -3
    • +2
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
Wednesday 06 Dec 2017
10:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457 Tweaking screen size for iPad

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/main.js
10:02 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457 Monitor can do group upload, course grouping has upload

Fixed the security so that Monitor role users can use the groups

spreadsheet upload feature. Added upload support for the course

grouping screen.

Options
    • -2
    • +2
    /lams_central/web/includes/javascript/main.js
    • -45
    • +117
    /lams_central/web/includes/javascript/orgGroup.js
    • -2
    • +1
    /lams_central/web/includes/javascript/orgGrouping.js
    • -35
    • +36
    /lams_central/web/orgGroup.jsp
    • -63
    • +200
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
5:42 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek

Updating Greek

Options
    • -3
    • +16
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
Tuesday 05 Dec 2017
10:03 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4484 Print Grouping Page

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    /lams_central/web/css/orgGroup.scss
    • -0
    • +15
    /lams_central/web/includes/javascript/orgGroup.js
    • -0
    • +1
    /lams_central/web/includes/javascript/orgGrouping.js
    • -0
    • +1
    /lams_central/web/orgGroup.jsp
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +47
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -0
    • +8
    /lams_monitoring/web/css/_monitorLesson_base.scss
    • -21
    • +49
    /lams_monitoring/web/grouping/viewGroups.jsp
1:48 am

Marcin Cieslak

LDEV-4447 Put default value of "enable kumalive" so it is not null

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java