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 Sep 2018
12:08 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

Options
    • -9
    • +9
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -4
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -13
    • +13
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/BranchingActivityController.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -13
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -6
    • +6
    /lams_learning/web/branching/preview.jsp
    • -5
    • +5
    /lams_learning/web/branching/wait.jsp
    • -1
    • +1
    /lams_learning/web/gate/conditionGateContent.jsp
    • -4
    • +4
    /lams_learning/web/gate/gateDescription.jsp
    • -7
    • +5
    /lams_learning/web/gate/gateNext.jsp
    • -1
    • +1
    /lams_learning/web/gate/permissionGateContent.jsp
    • -8
    • +8
    /lams_learning/web/gate/scheduleGateContent.jsp
    • -3
    • +3
    /lams_learning/web/gate/synchGateContent.jsp
    • -1
    • +1
    /lams_learning/web/grouping/choose.jsp
  16. … 15 more files in changeset.
12:05 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4440' of https://github.com/lamsfoundation/lams into LDEV-4440

Options
6:31 am

Andrey Balan

LDEV-4440 Fix bug with tablesorter parameter

Options
    • -1
    • +1
    /lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
6:17 am

Andrey Balan

LDEV-4440 code formatting

Options
    • -11
    • +0
    /lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/MonitoringController.java
    • -3
    • +1
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java
    • -7
    • +0
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java
    • -7
    • +0
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java
    • -3
    • +2
    /lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
    • -2
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java
    • -1
    • +0
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/LearningController.java
6:14 am

Andrey Balan

LDEV-4440 Remove erroneous validation method from forms

Options
    • -8
    • +0
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/AuthoringForm.java
    • -11
    • +0
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java
    • -36
    • +6
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java
    • -8
    • +0
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/AuthoringForm.java
    • -9
    • +0
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/AuthoringForm.java
    • -8
    • +0
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPageForm.java
6:13 am

Andrey Balan

LDEV-4440 Fix form validation

Options
    • -15
    • +27
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java
    • -93
    • +52
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
    • -3
    • +1
    /lams_tool_forum/web/jsps/learning/edit.jsp
    • -3
    • +2
    /lams_tool_forum/web/jsps/learning/reply.jsp
Thursday 20 Sep 2018
12:34 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Peer Review converted to Spring MVC

Options
    • -1
    • +1
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java
    • -3
    • +8
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
    • -1
    • +1
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
    • -12
    • +5
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java
    • -17
    • +34
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java
    • -13
    • +0
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/PeerreviewForm.java
    • -9
    • +4
    /lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +0
    /lams_tool_preview/web/pages/authoring/authoring.jsp
    • -1
    • +1
    /lams_tool_preview/web/pages/authoring/basic.jsp
    • -3
    • +3
    /lams_tool_preview/web/pages/learning/notebook.jsp
    • -3
    • +3
    /lams_tool_preview/web/pages/learning/notebookdisplay.jsp
    • -6
    • +6
    /lams_tool_preview/web/pages/learning/results.jsp
    • -2
    • +15
    /lams_tool_preview/web/pages/monitoring/reflections.jsp
Wednesday 19 Sep 2018
7:31 pm

Marcin Cieslak

Merge Fiona's fork into main repository

Options
    • -1
    • +1
    /lams_tool_preview/.classpath
    • -21
    • +17
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
    • -0
    • +239
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/AuthoringController.java
    • -0
    • +63
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/ClearSessionController.java
    • -0
    • +887
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java
    • -185
    • +0
    /lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
    • -22
    • +21
    /lams_tool_preview/web/pages/authoring/advance.jsp
7:15 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Peer Review code changes made, working through issues

Options
    • -1
    • +1
    /lams_tool_preview/.classpath
    • -0
    • +6
    /lams_tool_preview/.externalToolBuilders/SASS_lams_tool_preview.launch
    • -0
    • +1
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java
    • -0
    • +2
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewSessionDAOHibernate.java
    • -4
    • +12
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
    • -3
    • +1
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewSession.java
    • -0
    • +2
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewApplicationException.java
    • -21
    • +17
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
    • -0
    • +2
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/UploadPeerreviewFileException.java
    • -1
    • +2
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java
    • -271
    • +0
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java
    • -45
    • +0
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java
    • -955
    • +0
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java
    • -710
    • +0
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java
    • -72
    • +0
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/TblMonitoringAction.java
  16. … 48 more files in changeset.
9:11 am

Marcin Cieslak

LDEV-4440 Add Forum form validation

Options
    • -0
    • +5
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
    • -7
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
9:10 am

Marcin Cieslak

LDEV-4440 Get rid of a typo in Forum message form

Options
    • -1
    • +1
    /lams_tool_forum/web/jsps/learning/message/bodyarea.jsp
4:31 am

Andrey Balan

LDEV-4440 fix path to close.jsp which is shown on finishing already finished activity

Options
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
4:30 am

Andrey Balan

LDEV-4440 add missing tags (</div></c:if>)

Options
    • -15
    • +19
    /lams_tool_forum/web/jsps/learning/message/topicform.jsp
4:29 am

Andrey Balan

LDEV-4440 fix lazy initialization exception

Options
    • -1
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
4:28 am

Andrey Balan

LDEV-4440 fix Spring related Share Resources' issues

Options
    • -2
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
    • -1
    • +0
    /lams_tool_larsrc/web/pages/authoring/authoring.jsp
12:39 am

Marcin Cieslak

LDEV-4440 Fix paths to JSP pages for profile controller

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java
    • -5
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java
12:32 am

Marcin Cieslak

LDEV-4440 Fix entry to Live Edit

It seems that it was a problem with bootstrapping authoring rather than

migration to Spring MVC.

Options
    • -3
    • +4
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
Tuesday 18 Sep 2018
3:46 pm

Marcin Cieslak

Merge remote-tracking branch 'andrey/LDEV-4440' into LDEV-4440

Options
    • -11
    • +12
    /lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -21
    • +16
    /lams_central/web/WEB-INF/web.xml
    • -100
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java
    • -33
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
8:41 am

Andrey Balan

LDEV-4440 Fix importQTI feature

Options
    • -1
    • +1
    /lams_tool_lamc/web/authoring/BasicContent.jsp
8:41 am

Andrey Balan

LDEV-4440 Stop using deprecated DiskFileUpload

Use ServletFileUpload together with DiskFileItemFactory instead.

Options
    • -11
    • +12
    /lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -25
    • +26
    /lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
    • -17
    • +21
    /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -100
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java
    • -33
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
2:48 am

Marcin Cieslak

LDEV-4440 Fix JSON result in learning outcomes controller

Options
    • -18
    • +19
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
2:47 am

Marcin Cieslak

LDEV-4440 Migrate Zoom tool to Spring MVC

Options
    • -2
    • +2
    /lams_tool_zoom/.classpath
    • -0
    • +23
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20180917.sql
    • -1
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomConstants.java
    • -9
    • +10
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomUtil.java
    • -30
    • +26
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AdminController.java
    • -43
    • +33
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java
    • -9
    • +18
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/ClearSessionController.java
    • -53
    • +46
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java
    • -31
    • +27
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/MonitoringController.java
    • -18
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java
    • -21
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/LearningForm.java
    • -57
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/MonitoringForm.java
    • -5
    • +8
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/zoomApplicationContext.xml
    • -0
    • +17
    /lams_tool_zoom/web/WEB-INF/spring-servlet.xml
    • -143
    • +0
    /lams_tool_zoom/web/WEB-INF/struts-config.xml
  16. … 48 more files in changeset.
Monday 17 Sep 2018
7:32 pm

Marcin Cieslak

LDEV-4440 Rename Zoom Action package and classes

Options
    • -104
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AdminAction.java
    • -220
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AuthoringAction.java
    • -51
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/ClearSessionAction.java
    • -251
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java
    • -122
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/MonitoringAction.java
    • -0
    • +104
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AdminController.java
    • -0
    • +220
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java
    • -0
    • +51
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/ClearSessionController.java
    • -0
    • +251
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java
    • -0
    • +122
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/MonitoringController.java
5:40 pm

Marcin Cieslak

LDEV-4440 Get rid of unnecessary HTML attribute

Options
    • -1
    • +1
    /lams_tool_kaltura/web/pages/learning/commentlist.jsp
5:24 pm

Marcin Cieslak

LDEV-4440 Distribute same tags to all projects

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/AuthoringButton.tag
    • -0
    • +1
    /lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -0
    • +1
    /lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -3
    • +5
    /lams_admin/web/WEB-INF/tags/CommentsAuthor.tag
    • -10
    • +5
    /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
    • -5
    • +4
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -0
    • +1
    /lams_admin/web/WEB-INF/tags/Rating.tag
    • -0
    • +1
    /lams_admin/web/WEB-INF/tags/StyledRating.tag
    • -2
    • +2
    /lams_central/web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -10
    • +5
    /lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
    • -0
    • +1
    /lams_gradebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -1
    • +1
    /lams_gradebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -2
    • +2
    /lams_gradebook/web/WEB-INF/tags/CommentsAuthor.tag
    • -10
    • +5
    /lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
  16. … 203 more files in changeset.
4:42 pm

Marcin Cieslak

LDEV-4440 Fix a file malformed after migration to Spring MVC

Options
    • -36
    • +16
    /lams_learning/web/progressBroken.jsp
4:41 pm

Marcin Cieslak

LDEV-4440 Get rid of tags-html library references from JSP and tag files

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    /lams_central/web/policyConsents.jsp
    • -1
    • +1
    /lams_central/web/profile/policyDetails.jsp
    • -1
    • +1
    /lams_central/web/profile/profilePolicyConsents.jsp
    • -1
    • +1
    /lams_central/web/signup/emailVerify.jsp
    • -1
    • +1
    /lams_central/web/signup/emailVerifyResult.jsp
    • -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/CommentsAuthor.tag
  16. … 33 more files in changeset.
Saturday 15 Sep 2018
1:43 pm

Marcin Cieslak

Merge branch 'LDEV-4440' of https://github.com/lamsfoundation/lams.git into LDEV-4440

Options
    • -71
    • +11
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java
    • -75
    • +10
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
    • -34
    • +20
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/AuthoringController.java
    • -86
    • +17
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java
    • -77
    • +11
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java
1:43 pm

Marcin Cieslak

LDEV-4440 Add JJWT library to noStruts list

Options
    • -0
    • +1
    /lams_build/noStruts.userlibraries
1:41 pm

Marcin Cieslak

Merges Asia's and Andrey's changes into LDEV-4440

Conflicts:

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.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
    • -1
    • +1
    /lams_central/web/includes/javascript/dialog.js
    • -1
    • +1
    /lams_tool_assessment/.classpath
    • -15
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +1966
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -0
    • +62
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/ClearSessionController.java
    • -0
    • +1276
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -0
    • +645
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -186
    • +0
    /lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
    • -48
    • +47
    /lams_tool_assessment/web/pages/authoring/advance.jsp