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
Friday 21 Dec 2018
7:24 pm

Andrey Balan

Merge branch 'LDEV-4678' into lams31

Options
7:24 pm

Andrey Balan

LDEV-4678 Remove no longer needed @Autowired applicationContext

Options
    • -5
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -4
    • +0
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java
    • -15
    • +10
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java
    • -5
    • +0
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
    • -5
    • +0
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
    • -5
    • +0
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java
    • -5
    • +0
    /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java
    • -3
    • +0
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java
    • -7
    • +0
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java
    • -5
    • +1
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java
    • -5
    • +0
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java
    • -4
    • +0
    /lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
    • -5
    • +0
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java
    • -5
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -6
    • +2
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/LearningController.java
  16. … 6 more files in changeset.
4:47 am

Andrey Balan

Merge branch 'LDEV-4678' into lams31

Options
4:47 am

Andrey Balan

LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

Options
    • -0
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonToolService.java
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
    • -18
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
    • -0
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -16
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -3
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/notebook.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/results.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/submissionDeadline.jsp
    • -4
    • +8
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
    • -16
    • +2
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java
    • -4
    • +3
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/AuthoringController.java
    • -11
    • +7
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java
  16. … 128 more files in changeset.
2:05 am

Andrey Balan

LDEV-4678 Remove all ServiceProxy classes

Also get rid of LearningWebUtil.putActivityPositionInRequest(Long

activityId, HttpServletRequest request, ServletContext context) and

LearningWebUtil.getActivityMapping(ServletContext context) methods. As

it's better to invoke according service methods directly.

Options
    • -183
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
    • -1
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -130
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java
    • -18
    • +9
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/BranchingActivityController.java
    • -9
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java
    • -7
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
    • -9
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayActivityController.java
    • -9
    • +8
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
    • -13
    • +6
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayParallelActivityController.java
    • -7
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayToolActivityController.java
    • -6
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -6
    • +10
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
    • -15
    • +8
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java
    • -10
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java
    • -7
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
  16. … 37 more files in changeset.
Wednesday 19 Dec 2018
5:49 am

Andrey Balan

LDEV-4736 Switch to using newer navigator.mediaDevices.getUserMedia

If continue using the old method, Chrome throws an error and FF shows a

deprecation message.

Options
    • -24
    • +21
    /lams_central/web/includes/javascript/webrtc-capturestill.js
5:49 am

Andrey Balan

LDEV-4736 Switch to using newer navigator.mediaDevices.getUserMedia

If continue using the old method, Chrome throws an error and FF shows a

deprecation message.

Options
    • -24
    • +21
    /lams_central/web/includes/javascript/webrtc-capturestill.js
Tuesday 18 Dec 2018
8:37 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4732 User Role screen error handling for no roles reinstated

Options
    • -2
    • +6
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
8:01 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4729 Scheduled notifications can be deleted

Options
    • -1
    • +3
    /lams_monitoring/web/emailnotifications/courseNotifications.jsp
    • -0
    • +2
    /lams_monitoring/web/emailnotifications/lessonNotifications.jsp
    • -13
    • +14
    /lams_monitoring/web/emailnotifications/scheduledEmailList.jsp
1:36 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4728 Lesson Description CKEditor restricted palette, update saves

Options
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/EditLessonIntroController.java
    • -1
    • +1
    /lams_central/web/addLesson.jsp
    • -7
    • +3
    /lams_central/web/editLessonIntro.jsp
10:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4737 Course based lesson delete does not throw exception

Options
    • -7
    • +9
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -4
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -0
    • +5
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Friday 14 Dec 2018
4:45 pm

Marcin Cieslak

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

Options
4:10 pm

Marcin Cieslak

LDEV-4609 Fix archived lesson mark formatting

Options
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java
2:49 pm

Marcin Cieslak

Merge branch 'LDEV-4735' into lams31

Options
2:48 pm

Marcin Cieslak

LDEV-4735 Fix an URL in learning outcomes in authoring

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag
  16. … 17 more files in changeset.
2:20 pm

Marcin Cieslak

Merge branch 'LDEV-4734' into lams31

Options
2:20 pm

Marcin Cieslak

LDEV-4734 Fix org password reset by providing default values to form

Also refactor input names and add extra checks just to be safe.

Options
    • -12
    • +16
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java
    • -14
    • +14
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgPasswordChangeForm.java
    • -4
    • +4
    /lams_admin/web/orgPasswordChange.jsp
12:35 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4726 Restoring division line lost when licenses were updated.

Options
    • -0
    • +1
    /lams_central/web/authoring/authoring.jsp
12:14 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4733 Clone and delete lessons are shown for SysAdmin

Options
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
    • -1
    • +3
    /lams_admin/web/organisation/cloneStart.jsp
    • -0
    • +1
    /lams_admin/web/organisation/deleteAllLessons.jsp
    • -2
    • +2
    /lams_admin/web/organisation/list.jsp
9:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4726 Licenses updated to Creative Commons 4.0

Options
    • -0
    • +3
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -6
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java
    • -4
    • +5
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +243
    /lams_central/web/images/license/by-nc-nd.svg
    • -0
    • +202
    /lams_central/web/images/license/by-nc-sa.eu.svg
    • -0
    • +202
    /lams_central/web/images/license/by-nc-sa.svg
    • -0
    • +166
    /lams_central/web/images/license/by-nc.eu.svg
    • -0
    • +203
    /lams_central/web/images/license/by-nd.svg
    • -0
    • +199
    /lams_central/web/images/license/by-sa.svg
    • -0
    • +155
    /lams_central/web/images/license/by.svg
    • binary
    /lams_central/web/images/license/bync.jpg
    • binary
    /lams_central/web/images/license/byncnd.jpg
    • binary
    /lams_central/web/images/license/byncsa.jpg
    • binary
    /lams_central/web/images/license/bynd.jpg
  16. … 6 more files in changeset.
Thursday 13 Dec 2018
9:28 pm

Marcin Cieslak

LDEV-4731 Initial implementation of enrolments parser

Options
    • -0
    • +327
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
    • -1
    • +12
    /lams_central/web/WEB-INF/web.xml
2:07 pm

Marcin Cieslak

Merge branch 'LDEV-4730' into lams31

Options
2:06 pm

Marcin Cieslak

LDEV-4730 Fix column mappings in Hibernate

Options
    • -1
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/ForumConfigItem.java
    • -3
    • +3
    /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeConfigItem.java
2:02 pm

Marcin Cieslak

LDEV-4705 Merge group admin role to manager in LDAP configuration

Options
    • -0
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20181213.sql
1:41 pm

Marcin Cieslak

LDEV-4725 Manually delete rating criteria

There is no DB cascade for this.

Also fix transition removal.

Options
    • -0
    • +5
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
10:12 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4705 Merging course admin to course manager

Removing unnecessary columns in course user management

Options
    • -8
    • +0
    /lams_admin/web/userlist.jsp
Wednesday 12 Dec 2018
4:09 pm

Marcin Cieslak

LDEV-4725 Fix entity path in a query

There was a full canonical name in a query which ceased to work after

renaming entities' package.

Options
    • -4
    • +5
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java
2:54 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4705: UI improvements search users in admin

Options
    • -12
    • +12
    /lams_admin/web/usersearchlist.jsp
12:06 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4709 Monitoring gate pages have select/unselect all checkboxes

Options
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +29
    /lams_monitoring/web/gate/openGateSingleUser.jsp
Tuesday 11 Dec 2018
4:50 am

Marcin Cieslak

Merge branch 'LDEV-4725' into lams31

Options