Fisheye: Diff - lams-github/lams_monitoring/web/monitor.jsp

Tree
Options

c52f84e

Merge branch 'v4.8' into LDEV-5424
# Conflicts:
# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
# lams_tool_assessment/web/pages/monitoring/summary.jsp
# lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_daco/web/pages/monitoring/listRecords.jsp
# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp
# lams_tool_images/web/pages/monitoring/imagesummary.jsp
# lams_tool_laqa/web/monitoring/PrintAnswers.jsp
# lams_tool_larsrc/web/pages/monitoring/userlist.jsp
# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp
# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp
# lams_tool_leader/web/pages/monitoring/summary.jsp
# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp
# lams_tool_preview/web/pages/monitoring/rubricspart.jsp
# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

09 Apr 24 Andrey Balan c52f84ea751e7f1bdfb0574df665fa66081217f9

6ca7c6f

Merge branch 'v4.8' into LDEV-5424
# Conflicts:
# lams_admin/web/WEB-INF/tags/PageLearner.tag
# lams_central/web/WEB-INF/tags/PageLearner.tag
# lams_central/web/includes/javascript/rating5.js
# lams_gradebook/web/WEB-INF/tags/PageLearner.tag
# lams_learning/web/WEB-INF/tags/PageLearner.tag
# lams_learning/web/css/components-learner.scss
# lams_monitoring/web/WEB-INF/tags/PageLearner.tag
# lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag
# lams_tool_assessment/web/pages/learning/results/essay.jsp
# lams_tool_assessment/web/pages/monitoring/monitoring.jsp
# lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp
# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
# lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
# lams_tool_chat/web/WEB-INF/tags/PageLearner.tag
# lams_tool_daco/web/WEB-INF/tags/PageLearner.tag
# lams_tool_doku/web/WEB-INF/tags/PageLearner.tag
# lams_tool_forum/web/WEB-INF/tags/PageLearner.tag
# lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag
# lams_tool_images/web/WEB-INF/tags/PageLearner.tag
# lams_tool_images/web/pages/learning/parts/commentsarea.jsp
# lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag
# lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag
# lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag
# lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag
# lams_tool_leader/web/WEB-INF/tags/PageLearner.tag
# lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag
# lams_tool_nb/web/WEB-INF/tags/PageLearner.tag
# lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag
# lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag
# lams_tool_preview/web/WEB-INF/tags/PageLearner.tag
# lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag
# lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag
# lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag
# lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag
# lams_tool_survey/web/WEB-INF/tags/PageLearner.tag
# lams_tool_task/web/WEB-INF/tags/PageLearner.tag
# lams_tool_vote/web/WEB-INF/tags/PageLearner.tag
# lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag
# lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag
# lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag
# lams_www/web/WEB-INF/tags/PageLearner.tag

29 Feb 24 Andrey Balan 6ca7c6f9b49fe23c7f11e22e40334749c6b7d13f

Loading ...