Fisheye on lams-github/lams_monitoring/web/gate

lams-github (v4.8): Merge branch 'LDEV-5436' into v4.8...

Marcin Cieslak — Thu, 29 Feb 2024 12:32:58 +0100

Marcin Cieslak committed 330b0d5 on branch v4.8 in lams-github

Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java

(-8, +7)

| History

| Source

| Diff

· /lams_learning/web/grouping/choose.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

(-9, +2)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/gate/gateStatus.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/includes/javascript/monitorLesson.js

(-2, +2)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java

(-12, +9)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java

(-4, +3)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java

(-5, +5)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/results.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

(-1, +1)

| History

| Source

| Diff

… 20 more files in changeset.

lams-github (v4.8): LDEV-5096 Move Close Gate button up...

Marcin Cieslak — Tue, 13 Feb 2024 11:12:33 +0100

Marcin Cieslak committed 7f1db70 on branch v4.8 in lams-github

LDEV-5096 Move Close Gate button up

Some teachers think it is a Close Dialog button and get confused.

· /lams_monitoring/web/gate/gateStatus.jsp

(-13, +12)

| History

| Source

| Diff

lams-github (): LDEV-5424 fix tooltips and switch to bootstrap5 versions of .js and .css files

Andrey Balan — Thu, 08 Feb 2024 21:07:05 +0100

Andrey Balan committed bbdddbe on branch in lams-github

LDEV-5424 fix tooltips and switch to bootstrap5 versions of .js and .css files

· /lams_admin/web/orgPasswordChange.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/archivedEmailList.jsp

(-1, +2)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/courseNotifications.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/lessonNotifications.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/scheduledEmailList.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/gate/scheduleGateContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/timeLimit.jsp

(-5, +2)

| History

| Source

| Diff

· /lams_tool_chat/web/pages/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary5.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_larsrc/web/pages/monitoring/summary.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_leader/web/pages/monitoring/monitoring.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_mindmap/web/pages/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

… 16 more files in changeset.

lams-github (v4.8): LDEV-5436 Project-wide user sorting by last then first name

Marcin Cieslak — Tue, 09 Jan 2024 09:41:35 +0100

Marcin Cieslak committed d0f4c3b on branch v4.8 in lams-github

LDEV-5436 Project-wide user sorting by last then first name

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java

(-11, +12)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

(-11, +11)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java

(-15, +13)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/organisation/parts/selectLearners.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/parts/selectStaff.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/user/basiclist.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsController.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java

(-9, +8)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java

(-8, +7)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java

(-8, +10)

| History

| Source

| Diff

· /lams_central/web/emailuser.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/findUserLessons.jsp

(-1, +1)

| History

| Source

| Diff

… 136 more files in changeset.

lams-github (v4.8): LDEV-5397 import bootstrap5.scss into components.scss...

Andrey Balan — Tue, 21 Nov 2023 21:44:59 +0100

Andrey Balan committed 509e81c on branch v4.8 in lams-github

LDEV-5397 import bootstrap5.scss into components.scss

* Subsequently import components.scss into components-learner.scss

* It will allow using bootstrap5 CSS rules in components CSS classes

· /lams_admin/web/appadmin.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/cleanup.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/cleanupPreviewLessons.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/disabledusers.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importGroups.jsp

(-4, +3)

| History

| Source

| Diff

· /lams_admin/web/import/importexcel.jsp

(-4, +3)

| History

| Source

| Diff

· /lams_admin/web/import/importresult.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/import/status.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumer.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumerList.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/serverlist.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/servermaintain.jsp

(-3, +1)

| History

| Source

| Diff

· /lams_admin/web/logevent.jsp

(-3, +2)

| History

| Source

| Diff

· /lams_admin/web/loginmaintain.jsp

(-2, +1)

| History

| Source

| Diff

… 35 more files in changeset.

lams-github (v4.7): LDEV-5404 Escaping funny characters that break js...

Ernie Ghiglione — Sun, 30 Jul 2023 13:20:14 +0200

Ernie Ghiglione committed 87c2361 on branch v4.7, v4.8 in lams-github

LDEV-5404 Escaping funny characters that break js

- Monitoring

- Gradebook

· /lams_gradebook/web/common/taglibs.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookCourseLearner.jsp

(-19, +20)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookCourseMonitor.jsp

(-30, +30)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookMonitorContent.jsp

(-57, +57)

| History

| Source

| Diff

· /lams_gradebook/web/releaseLessonMarks.jsp

(-5, +5)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/archivedEmailList5.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/courseNotifications.jsp

(-7, +7)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/lessonNotifications.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/lessonNotifications5.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/scheduledEmailList.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/scheduledEmailList5.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_monitoring/web/gate/conditionGateContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/gate/passwordGateContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/monitor.jsp

(-167, +83)

| History

| Source

| Diff

· /lams_monitoring/web/monitorTour.jsp

(-76, +76)

| History

| Source

| Diff

… 5 more files in changeset.

lams-github (v4.7): LDEV-5083 Remove old monitoring bits where possible...

Marcin Cieslak — Thu, 15 Sep 2022 19:01:53 +0200

Marcin Cieslak committed 35dd470 on branch v4.7, v4.8 in lams-github

LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java

(-3, +1)

| History

| Source

| Diff

· /lams_central/web/css/bootstrap-select.css

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/css/bootstrap-select.min5.css

(-6, +0)

| History

| Source

| Diff

· /lams_central/web/css/x-editable.css

(-13, +15)

| History

| Source

| Diff

· /lams_central/web/css/x-editable5.css

(-665, +0)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/bootstrap-select.js

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/bootstrap-select.min5.js

(-9, +0)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/dialog5.js

(-14, +5)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/openUrls.js

(-32, +3)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/x-editable.js

(-4, +4)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/x-editable5.js

(-7, +0)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/.../gradebook/web/controller/GradebookMonitoringController.java

(-2, +2)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookMonitorContent.jsp

(-91, +139)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookMonitorContent5.jsp

(-852, +0)

| History

| Source

| Diff

… 45 more files in changeset.

lams-github (v4.7): LDEV-5083 Fix missing timeago library in gate status view

Marcin Cieslak — Wed, 17 Aug 2022 10:05:43 +0200

Marcin Cieslak committed ab7ab6a on branch v4.7, v4.8 in lams-github

LDEV-5083 Fix missing timeago library in gate status view

· /lams_monitoring/web/gate/gateStatus5.jsp

(-0, +2)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5083 Rewrite TBL Gates tab and modals to new UI

Marcin Cieslak — Tue, 05 Jul 2022 18:27:01 +0200

Marcin Cieslak committed 89da5ec on branch v4.7, v4.8 in lams-github

LDEV-5083 Rewrite TBL Gates tab and modals to new UI

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/css/components-monitoring.css	(-0, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/web/gate/gateInfo5.jsp	(-0, +36)	\| History	\| Source
· /lams_monitoring/web/gate/gateStatus5.jsp	(-0, +61)	\| History	\| Source
· /lams_monitoring/web/gate/openGateSingleUser5.jsp	(-0, +104)	\| History	\| Source
· /lams_monitoring/web/gate/permissionGateContent5.jsp	(-0, +61)	\| History	\| Source
· /lams_monitoring/web/includes/javascript/monitorLesson5.js	(-0, +11)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor5.jsp	(-0, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/gates5.jsp	(-52, +56)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5315 Refresh lesson & sequence tab in monitoring after gate toggle

Marcin Cieslak — Fri, 27 May 2022 19:30:36 +0200

Marcin Cieslak committed beaa199 on branch v4.7, v4.8 in lams-github

LDEV-5315 Refresh lesson & sequence tab in monitoring after gate toggle

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java	(-3, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/web/gate/gateStatus.jsp	(-0, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-0, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5243 Add "stop at preceding activity" info to gate monitoring

Marcin Cieslak — Fri, 08 Oct 2021 16:24:48 +0200

Marcin Cieslak committed 3556150 on branch v4.7, v4.8 in lams-github

LDEV-5243 Add "stop at preceding activity" info to gate monitoring

· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/gate/gateInfo.jsp	(-0, +6)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5023 Refresh TBL gate tab after gate close

Marcin Cieslak — Sat, 24 Jul 2021 11:00:48 +0200

Marcin Cieslak committed a5e8fed on branch v4.7, v4.8 in lams-github

LDEV-5023 Refresh TBL gate tab after gate close

· /lams_monitoring/web/gate/gateStatus.jsp

(-1, +12)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4391 Turn off auto complete for datetime picker fields...

Marcin Cieslak — Wed, 21 Apr 2021 16:13:17 +0200

Marcin Cieslak committed 3e5d6e6 on branch v4.7, v4.8 in lams-github

LDEV-4391 Turn off auto complete for datetime picker fields

If a text input field is used for datetimepicker, having previously

chosen dates auto filled is annoying and makes it difficult to operate

the picker.

· /lams_central/web/addLesson.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/emailnotifications/additionalSettings.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/gate/scheduleGateContent.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/dateRestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_chat/web/pages/monitoring/daterestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_forum/web/jsps/monitoring/parts/daterestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_lamc/web/monitoring/parts/dateRestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/monitoring/dateRestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_mindmap/web/pages/monitoring/dateRestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_notebook/web/pages/monitoring/daterestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/web/monitoring/parts/daterestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/parts/dateRestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_survey/web/pages/monitoring/daterestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_task/web/pages/monitoring/parts/daterestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_vote/web/monitoring/daterestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_wiki/web/pages/monitoring/daterestriction.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5096 Move "Close" button to gate status page instead of monitoring...

Marcin Cieslak — Thu, 22 Oct 2020 07:38:50 +0200

Marcin Cieslak committed 21012de on branch v4.7, v4.8 in lams-github

LDEV-5096 Move "Close" button to gate status page instead of monitoring

Allow closing all types of gates.

If a schedule gate gets opened, we do not clear its schedule anymore.

The user may have made a mistake when opening the gate and will

immediately close it again. We want the old schedule to remain.

When scheduled open gate job fires, it now checks if the gate is

actually closed. If it is already open, it does nothing.

· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-2, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/OpenScheduleGateJob.java	(-13, +11)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-14, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java	(-6, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/web/gate/gateStatus.jsp	(-0, +11)	\| History	\| Source	\| Diff
· /lams_monitoring/web/gate/permissionGateContent.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-20, +21)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-5, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4886 Automated tests for v4.0

Fri, 05 Jun 2020 13:29:04 +0200

Fiona Malikoff committed 05c00f9 on branch v4.7, v4.8 in lams-github

LDEV-4886 Automated tests for v4.0

· /lams_admin/web/userlist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/usersearchlist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tbl/tbl.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/main.js

(-20, +32)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-3, +5)

| History

| Source

| Diff

· /lams_central/web/passwordChangeContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/passwordChangeOkContent.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/profile/editprofile.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/profile/portrait.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/profile/profile.jsp

(-5, +5)

| History

| Source

| Diff

· /lams_central/web/questions/questionChoice.jsp

(-1, +2)

| History

| Source

| Diff

· /lams_central/web/questions/questionFile.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/gate/gateDescription.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/gate/gateInfo.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/gate/gateStatus.jsp

(-1, +1)

| History

| Source

| Diff

… 5 more files in changeset.

lams-github (): LDEV-4995 Upgrade to bootstrap 4...

Andrey Balan — Sat, 21 Mar 2020 02:47:39 +0100

Andrey Balan committed e2956cb on branch in lams-github

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

· /lams_admin/web/logevent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/orgPasswordChange.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/policies/policies.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/policies/userConsents.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/sysadmin.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/toolcontent/toolcontentlist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/user.jsp

(-5, +5)

| History

| Source

| Diff

· /lams_admin/web/userChangePass.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/userrole.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_admin/web/usersearchlist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties

(-2, +3)

| History

| Source

| Diff

· /lams_central/conf/scss/_lams_variables.scss

(-6, +3)

| History

| Source

| Diff

· /lams_central/conf/scss/_lams_variables_purple.scss

(-6, +4)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java

(-18, +123)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java

(-1, +21)

| History

| Source

| Diff

… 184 more files in changeset.

lams-github (v4.7): LDEV-4989 Password Gate initial implementation

Marcin Cieslak — Mon, 16 Mar 2020 15:44:27 +0100

Marcin Cieslak committed 7116e79 on branch v4.7, v4.8 in lams-github

LDEV-4989 Password Gate initial implementation

· /lams_central/conf/language/lams/ApplicationResources.properties

(-0, +2)

| History

| Source

| Diff

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-0, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

(-1661, +1670)

| History

| Source

| Diff

· /lams_central/web/authoring/authoring.jsp

(-2, +11)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringActivity.js

(-1, +4)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringGeneral.js

(-3, +7)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringProperty.js

(-3, +14)

| History

| Source

| Diff

· /lams_common/conf/language/lams/ApplicationResources.properties

(-0, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200315.sql

(-0, +21)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

(-1, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java

(-6, +16)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/PasswordGateActivity.java

(-0, +110)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java

(-3, +6)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java

(-20, +18)

| History

| Source

| Diff

… 22 more files in changeset.

lams-github (v4.7): LDEV-4932 Add CSRF to monitor and central

Andrey Balan — Tue, 07 Jan 2020 20:42:15 +0100

Andrey Balan committed 40de3af on branch v4.7, v4.8 in lams-github

LDEV-4932 Add CSRF to monitor and central

· /lams_admin/web/user.jsp

(-13, +18)

| History

| Source

| Diff

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-0, +14)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

(-8, +8)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java

(-1, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java

(-3, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java

(-6, +7)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java

(-2, +5)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/orgGroup.js

(-20, +31)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/orgGrouping.js

(-5, +22)

| History

| Source

| Diff

· /lams_central/web/orgGroup.jsp

(-13, +5)

| History

| Source

| Diff

· /lams_central/web/orgGrouping.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/profile/portrait.jsp

(-13, +8)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java

(-1, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java

(-1, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

(-4, +3)

| History

| Source

| Diff

… 36 more files in changeset.

lams-github (): LDEV-4911 Added ids to support automated testing

Tue, 17 Dec 2019 23:41:05 +0100

Fiona Malikoff committed de2950a on branch in lams-github

LDEV-4911 Added ids to support automated testing

· /lams_learning/web/gate/gateDescription.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/gate/gateInfo.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams-github (): LDEV-4911 Adding ides to test monitor starting new lesson

Mon, 02 Dec 2019 07:09:23 +0100

Fiona Malikoff committed 8ef5fde on branch in lams-github

LDEV-4911 Adding ides to test monitor starting new lesson

· /lams_monitoring/web/gate/gateStatus.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/grouping/chosenGrouping.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-2, +3)	\| History	\| Source	\| Diff
· /lams_tool_lamc/web/authoring/editQuestionBox.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_lamc/web/authoring/itemlist.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams-github (): LDEV-4759 Panels are now cards.

Wed, 06 Feb 2019 04:04:33 +0100

Fiona Malikoff committed 70e6fe3 on branch in lams-github

LDEV-4759 Panels are now cards.

· /lams_admin/web/WEB-INF/tags/Alert.tag

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/DefineLater.tag

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/Page.tag

(-36, +18)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/SimplePanel.tag

(-4, +4)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/headItems.tag

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/ldap.jsp

(-11, +11)

| History

| Source

| Diff

· /lams_admin/web/orgPasswordChange.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/cloneStart.jsp

(-16, +16)

| History

| Source

| Diff

· /lams_admin/web/organisation/list.jsp

(-9, +9)

| History

| Source

| Diff

· /lams_admin/web/remove.jsp

(-8, +8)

| History

| Source

| Diff

· /lams_admin/web/statistics.jsp

(-8, +8)

| History

| Source

| Diff

· /lams_admin/web/sysadmin.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/themeManagement.jsp

(-4, +4)

| History

| Source

| Diff

· /lams_admin/web/toolcontent/toolcontentlist.jsp

(-1, +1)

| History

| Source

| Diff

… 492 more files in changeset.

lams-github (v4.7): LDEV-4651 Scheduled gate in scheduled lesson can be viewed/rescheduled.

Tue, 29 Jan 2019 04:14:57 +0100

Fiona Malikoff committed baeb14b on branch v4.7, v4.8 in lams-github

LDEV-4651 Scheduled gate in scheduled lesson can be viewed/rescheduled.

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-17, +43)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java	(-4, +10)	\| History	\| Source	\| Diff
· /lams_monitoring/web/gate/scheduleGateContent.jsp	(-21, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4709 Monitoring gate pages have select/unselect all checkboxes

Wed, 12 Dec 2018 05:06:02 +0100

Fiona Malikoff committed f4b2d15 on branch v4.7, v4.8 in lams-github

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

· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/gate/openGateSingleUser.jsp	(-4, +29)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

Fri, 21 Sep 2018 06:08:34 +0200

Fiona Malikoff committed 54007f9 on branch v4.7, v4.8 in lams-github

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

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

(-9, +9)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

(-4, +2)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/BranchingActivityController.java

(-13, +13)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

(-1, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

(-13, +5)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java

(-2, +2)

| History

| Source

| Diff

· /lams_learning/web/branching/preview.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_learning/web/branching/wait.jsp

(-5, +5)

| History

| Source

| Diff

· /lams_learning/web/gate/conditionGateContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/gate/gateDescription.jsp

(-4, +4)

| History

| Source

| Diff

· /lams_learning/web/gate/gateNext.jsp

(-7, +5)

| History

| Source

| Diff

· /lams_learning/web/gate/permissionGateContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/gate/scheduleGateContent.jsp

(-8, +8)

| History

| Source

| Diff

· /lams_learning/web/gate/synchGateContent.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_learning/web/grouping/choose.jsp

(-1, +1)

| History

| Source

| Diff

… 15 more files in changeset.

lams-github (v4.7): Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration...

Marcin Cieslak — Sat, 15 Sep 2018 07:22:02 +0200

Marcin Cieslak committed 62aaf16 on branch v4.7, v4.8 in lams-github

Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration

Conflicts:

lams_admin/.classpath

lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java

lams_admin/web/WEB-INF/struts-config.xml

lams_admin/web/WEB-INF/tiles-defs.xml

lams_admin/web/config/items.jsp

lams_admin/web/css/admin.scss

lams_admin/web/organisation/courseAdminEdit.jsp

lams_admin/web/organisation/createOrEdit.jsp

lams_admin/web/organisation/list.jsp

lams_admin/web/servermaintain.jsp

lams_admin/web/signupmanagement/add.jsp

lams_admin/web/signupmanagement/list.jsp

lams_admin/web/timezoneServerManagement.jsp

lams_admin/web/user.jsp

lams_admin/web/usersearchlist.jsp

lams_build/lib/lams/lams-admin.jar

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_build/lib/lams/lams-monitoring.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java

lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/TextSearchActionForm.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java

lams_central/web/WEB-INF/struts-config.xml

lams_central/web/editprofile.jsp

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_central/web/lessons.jsp

lams_central/web/main.jsp

lams_central/web/portrait.jsp

lams_central/web/profile.jsp

lams_central/web/signup/singupTab.jsp

lams_central/web/tutorialVideo.jsp

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql

lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

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

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

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

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

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

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

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

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

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

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

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

lams_monitoring/web/gate/scheduleGateContent.jsp

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

lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java

lams_tool_daco/.classpath

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_dimdim/.classpath

lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java

lams_tool_forum/web/jsps/learning/viewtopic.jsp

lams_tool_forum/web/jsps/monitoring/summary.jsp

lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java

lams_tool_lamc/web/authoring/AdvancedContent.jsp

lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp

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

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

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java

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

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/ClearSessionAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java

lams_tool_mindmap/web/pages/authoring/authoring.jsp

lams_tool_mindmap/web/pages/learning/mindmap.jsp

lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/ClearSessionAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java

lams_tool_pixlr/.classpath

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java

lams_tool_preview/.classpath

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java

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

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

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

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

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

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

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

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

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java

lams_tool_sbmt/web/authoring/advance.jsp

lams_tool_sbmt/web/monitoring/mark/mark.jsp

lams_tool_sbmt/web/monitoring/parts/summary.jsp

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

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

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

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java

lams_tool_scribe/.classpath

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/ClearSessionAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ClearSessionAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ClearSessionAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java

lams_tool_videorecorder/.classpath

lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java

lams_tool_vote/.classpath

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java

lams_tool_wookie/.classpath

lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java

· /3rdParty_sources/versions.txt

(-0, +2)

| History

| Source

| Diff

· /lams_admin/.classpath

(-1, +0)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources.properties

(-2, +54)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

(-2, +47)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

(-2, +48)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

(-7, +53)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml

(-1, +4)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

(-51, +38)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java

(-8, +0)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java

(-4, +10)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java

(-43, +7)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java

(-12, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java

(-0, +264)

| History

| Source

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java

(-2, +7)

| History

| Source

| Diff

… 634 more files in changeset.

lams-github (v4.7): LDEV-4440 updated paths to monitoring and central

Wed, 29 Aug 2018 19:12:25 +0200

Joanna Mielczarek committed d662ddf on branch v4.7, v4.8 in lams-github

LDEV-4440 updated paths to monitoring and central

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/emailnotifications/courseNotifications.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/emailnotifications/lessonNotifications.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/gate/gateInfo.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-4, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/tblmonitor.jsp	(-5, +5)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Monitoring - noStruts and no tiles

Fri, 24 Aug 2018 22:16:08 +0200

Joanna Mielczarek committed e962cd6 on branch v4.7, v4.8 in lams-github

LDEV-4440 Monitoring - noStruts and no tiles

· /lams_monitoring/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingController.java

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressController.java

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java

(-1, +0)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXAction.java

(-282, +0)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/.../lams/monitoring/web/GroupBasedBranchingAJAXController.java

(-0, +310)

| History

| Source

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

(-571, +0)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

(-0, +577)

| History

| Source

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

(-57, +52)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/struts-config.xml

(-287, +0)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag

(-5, +5)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag

(-1, +0)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/AuthoringRatingCriteria.tag

(-31, +30)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/CommentsAuthor.tag

(-9, +7)

| History

| Source

| Diff

… 42 more files in changeset.

lams-github (v4.7): LDEV-4440 Migration of monitoring - changes at jsp files

Fri, 24 Aug 2018 17:18:15 +0200

Joanna Mielczarek committed 3eb0caa on branch v4.7, v4.8 in lams-github

LDEV-4440 Migration of monitoring - changes at jsp files

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

(-83, +90)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java

(-34, +37)

| History

| Source

| Diff

· /lams_monitoring/web/complexProgress.jsp

(-55, +90)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/additionalSettings.jsp

(-6, +1)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/archivedEmailList.jsp

(-11, +5)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/courseNotifications.jsp

(-15, +9)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/lessonNotifications.jsp

(-13, +7)

| History

| Source

| Diff

· /lams_monitoring/web/emailnotifications/scheduledEmailList.jsp

(-12, +6)

| History

| Source

| Diff

· /lams_monitoring/web/errorbox.jsp

(-14, +10)

| History

| Source

| Diff

· /lams_monitoring/web/gate/conditionGateContent.jsp

(-34, +64)

| History

| Source

| Diff

· /lams_monitoring/web/gate/gateInfo.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_monitoring/web/gate/gateStatus.jsp

(-12, +12)

| History

| Source

| Diff

· /lams_monitoring/web/gate/openGateSingleUser.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_monitoring/web/gate/permissionGateContent.jsp

(-35, +66)

| History

| Source

| Diff

· /lams_monitoring/web/gate/scheduleGateContent.jsp

(-86, +96)

| History

| Source

| Diff

… 11 more files in changeset.

lams-github (v4.7): LDEV-4651 Schedule gate monitoring works for a scheduled lesson

Mon, 20 Aug 2018 05:51:33 +0200

Fiona Malikoff committed 33c3204 on branch v4.7, v4.8 in lams-github

LDEV-4651 Schedule gate monitoring works for a scheduled lesson

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-0, +10)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java	(-3, +17)	\| History	\| Source	\| Diff
· /lams_monitoring/web/gate/scheduleGateContent.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4538 Timeago converting gates to relative times

Sun, 08 Apr 2018 15:41:33 +0200

Fiona Malikoff committed 193814a on branch v4.7, v4.8 in lams-github

LDEV-4538 Timeago converting gates to relative times

· /lams_monitoring/web/gate/gateStatus.jsp	(-0, +10)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/gates.jsp	(-0, +8)	\| History	\| Source	\| Diff