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
Monday 22 Jan 2018
9:09 pm

Marcin Cieslak

Merge branch 'LDEV-4500'

Options
9:08 pm

Marcin Cieslak

LDEV-4500 Check if all activities in TBL sequence are grouped

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_central/web/authoring/authoring.jsp
    • -3
    • +57
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
11:38 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4498 Portrait displayed on user search screen.

Options
    • -1
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java
    • -2
    • +9
    /lams_admin/web/usersearchlist.jsp
Thursday 18 Jan 2018
6:43 pm

Marcin Cieslak

Merge branch 'LDEV-4497'

Options
6:41 pm

Marcin Cieslak

LDEV-4497 Split content folder ID when browsing uploaded files

Options
    • -1
    • +8
    /lams_central/web/ckeditor/filemanager/browser/default/browser.html
6:20 pm

Marcin Cieslak

LDEV-4497 Split authored image path when saving

Options
    • -4
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java
5:47 pm

Marcin Cieslak

LDEV-4497 Read LD thumbs from either old or new dir structure

Also focus only on SVG images as PNGs are not supported anymore.

Also use only one source of LD thumbs top dir.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -25
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -7
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
    • -19
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
5:23 pm

Marcin Cieslak

LDEV-4497 Split LD thumb path when saving

Options
    • -8
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
1:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4413 Share Resources no longer requires a title

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
    • -0
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -16
    • +0
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
9:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4495 Able to rerate all already entries when max rate used.

Options
    • -1
    • +14
    /lams_central/web/includes/javascript/rating.js
8:02 am

Andrey Balan

LDEV-4496 People from the same group get the "same shuffle"

Options
    • -1
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
Monday 15 Jan 2018
11:05 pm

Andrey Balan

Merge branch 'LDEV-4494'

Options
11:00 pm

Andrey Balan

LDEV-4494 Avoid cloning/importing lessons created by old NTU plugin

Options
    • -1
    • +6
    /lams_bb_integration/RELEASE_NOTES.TXT
    • -1
    • +1
    /lams_bb_integration/WEB-INF/bb-manifest.xml
    • -1
    • +1
    /lams_bb_integration/build.xml
    • -3
    • +3
    /lams_bb_integration/src/org/lamsfoundation/bb/integration/servlet/LinkToolsServlet.java
    • -1
    • +1
    /lams_bb_integration/src/org/lamsfoundation/bb/integration/servlet/UpdateServerUrlServlet.java
    • -2
    • +2
    /lams_bb_integration/src/org/lamsfoundation/bb/integration/util/BlackboardUtil.java
Monday 08 Jan 2018
7:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-3805 Reflections are paged

Options
    • -1
    • +0
    /lams_tool_gmap/conf/language/lams/ApplicationResources.properties
7:42 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-3805 Reflections are paged.

Options
    • -5
    • +46
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
    • -2
    • +4
    /lams_tool_gmap/conf/language/lams/ApplicationResources.properties
    • -0
    • +10
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java
    • -1
    • +103
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java
    • -0
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml
    • -0
    • +24
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -0
    • +6
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
    • -0
    • +10
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java
    • -38
    • +51
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
    • -1
    • +1
    /lams_tool_gmap/web/pages/learning/parts/finishButton.jsp
    • -1
    • +13
    /lams_tool_gmap/web/pages/monitoring/headItems.jsp
    • -30
    • +0
    /lams_tool_gmap/web/pages/monitoring/notebook.jsp
    • -100
    • +96
    /lams_tool_gmap/web/pages/monitoring/summary.jsp
Friday 05 Jan 2018
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -1
    • +27
    /lams_admin/web/WEB-INF/tags/Comments.tag
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/comments/CommentConstants.java
    • -6
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
    • -1
    • +27
    /lams_central/web/WEB-INF/tags/Comments.tag
    • -8
    • +8
    /lams_central/web/comments/new.jsp
    • -1
    • +1
    /lams_central/web/comments/topicview.jsp
    • -0
    • +9
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentSession.hbm.xml
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/comments/CommentSession.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/comments/dao/ICommentDAO.java
    • -3
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java
    • -11
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java
    • -6
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java
    • -1
    • +27
    /lams_gradebook/web/WEB-INF/tags/Comments.tag
    • -1
    • +27
    /lams_learning/web/WEB-INF/tags/Comments.tag
  16. … 51 more files in changeset.
10:26 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -0
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180102.sql
    • -0
    • +14
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20171220.sql
    • -0
    • +7
    /lams_tool_larsrc/web/pages/authoring/parts/ratings.jsp
    • -0
    • +31
    /lams_tool_larsrc/web/pages/monitoring/comments.jsp
7:37 am

Andrey Balan

LDEV-4478 Bump the version to 1.2.26

Options
    • -0
    • +2
    /lams_bb_integration/RELEASE_NOTES.TXT
    • -1
    • +1
    /lams_bb_integration/WEB-INF/bb-manifest.xml
    • -1
    • +1
    /lams_bb_integration/build.xml
Saturday 23 Dec 2017
4:43 am

Andrey Balan

LDEV-4491 Bootstrap Pedagogical Planner pages

Options
    • -4
    • +0
    /lams_central/web/css/pedagogicalPlanner.css
    • -4
    • +5
    /lams_central/web/tutorialVideo.jsp
4:39 am

Andrey Balan

LDEV-4492 Fix wrong casting activityDAO to ActivityDAO

It has to be IActivityDAO instead.

Options
    • -38
    • +24
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
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