Fisheye on lams-github/lams_central/web/groups.jsp

lams-github (): LDEV-5424 rename Page5.tag->PageAdmin.tag

Andrey Balan — Thu, 08 Feb 2024 22:50:26 +0100

Andrey Balan committed ca098d6 on branch in lams-github

LDEV-5424 rename Page5.tag->PageAdmin.tag

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

(-467, +0)

| History

| Source

| Diff

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

(-0, +84)

| History

| Source

· /lams_admin/web/WEB-INF/tlds/lams/lams.tld

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/appadmin.jsp

(-8, +3)

| History

| Source

| Diff

· /lams_admin/web/cleanup.jsp

(-10, +6)

| History

| Source

| Diff

· /lams_admin/web/cleanupPreviewLessons.jsp

(-13, +5)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-18, +12)

| History

| Source

| Diff

· /lams_admin/web/disabledusers.jsp

(-14, +5)

| History

| Source

| Diff

· /lams_admin/web/import/importGroups.jsp

(-17, +9)

| History

| Source

| Diff

· /lams_admin/web/import/importexcel.jsp

(-19, +10)

| History

| Source

| Diff

· /lams_admin/web/import/importresult.jsp

(-6, +2)

| History

| Source

| Diff

· /lams_admin/web/import/status.jsp

(-6, +2)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumer.jsp

(-12, +9)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumerList.jsp

(-12, +6)

| History

| Source

| Diff

· /lams_admin/web/integration/serverlist.jsp

(-10, +6)

| History

| Source

| Diff

… 57 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-5337 Add "return to monitoring button" to Team Setup screen

Marcin Cieslak — Sat, 09 Sep 2023 08:31:01 +0200

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

LDEV-5337 Add "return to monitoring button" to Team Setup screen

· /lams_central/web/groups.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/orgGrouping.js	(-39, +40)	\| History	\| Source	\| Diff
· /lams_central/web/orgGrouping.jsp	(-131, +141)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java	(-4, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-2, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/teams.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5337 Inform which learners were skipped during grouping upload

Marcin Cieslak — Sat, 26 Aug 2023 15:35:39 +0200

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

LDEV-5337 Inform which learners were skipped during grouping upload

· /lams_central/conf/language/lams/ApplicationResources.properties	(-2, +3)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(-2, +4)	\| History	\| Source	\| Diff
· /lams_central/web/groups.jsp	(-4, +3)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/groups.js	(-1, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-125, +133)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java	(-23, +26)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5337 Hide Import button until grouping XLS is selected

Marcin Cieslak — Fri, 18 Aug 2023 11:59:52 +0200

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

LDEV-5337 Hide Import button until grouping XLS is selected

· /lams_central/web/groups.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/groups.js	(-0, +5)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5337 Hide Import button until grouping XLS is selected

Marcin Cieslak — Fri, 18 Aug 2023 11:59:52 +0200

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

LDEV-5337 Hide Import button until grouping XLS is selected

· /lams_central/web/groups.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/groups.js	(-0, +5)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5337 Add "return to monitoring button" to Team Setup screen

Marcin Cieslak — Fri, 18 Aug 2023 11:31:06 +0200

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

LDEV-5337 Add "return to monitoring button" to Team Setup screen

· /lams_central/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/web/groups.jsp	(-0, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java	(-22, +26)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/teams.jsp	(-328, +328)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5337 Add "return to monitoring button" to Team Setup screen

Marcin Cieslak — Fri, 18 Aug 2023 11:31:06 +0200

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

LDEV-5337 Add "return to monitoring button" to Team Setup screen

· /lams_central/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/web/groups.jsp	(-0, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java	(-22, +26)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/teams.jsp	(-328, +328)	\| History	\| Source	\| Diff

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

Ernie Ghiglione — Sat, 29 Jul 2023 17:33:20 +0200

Ernie Ghiglione committed 54a3c30 on branch v4.7, v4.8 in lams-github

LDEV-5404 Escaping funny characters that break js

· /lams_central/web/addLesson.jsp

(-10, +11)

| History

| Source

| Diff

· /lams_central/web/authoring/authoring.jsp

(-124, +122)

| History

| Source

| Diff

· /lams_central/web/authoring/svgGenerator.jsp

(-11, +12)

| History

| Source

| Diff

· /lams_central/web/comments/edit.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/comments/new.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/comments/reply.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/comments/topicview.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_central/web/editLessonIntro.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/errorpages/error.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/forgotPassword.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/forgotPasswordChange.jsp

(-11, +11)

| History

| Source

| Diff

· /lams_central/web/groups.jsp

(-17, +34)

| History

| Source

| Diff

· /lams_central/web/lti/addLesson.jsp

(-5, +4)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-31, +30)

| History

| Source

| Diff

· /lams_central/web/mainTour.jsp

(-101, +50)

| History

| Source

| Diff

… 26 more files in changeset.

lams-github (v4.7): LDEV-5338 Make group boxes align to top when list of learners is long

Marcin Cieslak — Tue, 11 Jul 2023 08:32:21 +0200

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

LDEV-5338 Make group boxes align to top when list of learners is long

· /lams_central/web/groups.jsp

(-136, +136)

| History

| Source

| Diff

lams-github (v4.7): Merge remote-tracking branch 'origin/LDEV-5357' into v4.7...

Marcin Cieslak — Mon, 30 Jan 2023 16:53:55 +0100

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

Merge remote-tracking branch 'origin/LDEV-5357' into v4.7

Conflicts:

lams_admin/web/userChangePass.jsp

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

lams_central/web/WEB-INF/web.xml

lams_central/web/authoring/authoring.jsp

lams_central/web/authoring/svgGenerator.jsp

lams_central/web/extGroups.jsp

lams_central/web/orgGroup.jsp

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

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

lams_monitoring/web/grouping/chosenGrouping.jsp

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

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/organisation/deleteAllLessons.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/userChangePass.jsp

(-1, +1)

| History

| Source

| Diff

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

(-20, +4)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/web.xml

(-3, +5)

| History

| Source

| Diff

· /lams_central/web/authoring/authoring.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/authoring/svgGenerator.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/extGroups.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/groups.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/orgGrouping.jsp

(-3, +3)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /lams_gradebook/web/releaseLessonMarks.jsp

(-1, +1)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-2, +1)

| History

| Source

| Diff

… 30 more files in changeset.

lams-github (v4.7): Merge remote-tracking branch 'origin/v4.6' into v4.7...

Marcin Cieslak — Sat, 17 Dec 2022 14:21:14 +0100

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

Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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

lams_central/web/includes/javascript/orgGroup.js

lams_central/web/orgGroup.jsp

lams_central/web/orgGrouping.jsp

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

· /lams_central/src/java/org/lamsfoundation/lams/web/GroupingController.java	(-16, +8)	\| History	\| Source	\| Diff
· /lams_central/web/groups.jsp	(-49, +34)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/groups.js	(-105, +94)	\| History	\| Source	\| Diff
· /lams_central/web/orgGrouping.jsp	(-9, +9)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/web.xml	(-1, +15)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5338 Rename JS and CSS files to reflect changes in classes

Marcin Cieslak — Mon, 14 Nov 2022 15:01:47 +0100

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

LDEV-5338 Rename JS and CSS files to reflect changes in classes

· /lams_central/build.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/web.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/css/groups.css	(-0, +66)	\| History	\| Source
· /lams_central/web/css/orgGroup.css	(-66, +0)	\| History	\| Source	\| Diff
· /lams_central/web/groups.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/groups.js	(-0, +833)	\| History	\| Source
· /lams_central/web/includes/javascript/orgGroup.js	(-833, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5338 Allow modifications to all kinds of groupings

Marcin Cieslak — Mon, 14 Nov 2022 14:58:37 +0100

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

LDEV-5338 Allow modifications to all kinds of groupings

· /lams_central/web/groups.jsp	(-6, +0)	\| History	\| Source	\| Diff
· /lams_central/web/orgGrouping.jsp	(-0, +13)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java	(-3, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5338 Rename file to reflect its purpose better

Marcin Cieslak — Mon, 14 Nov 2022 11:50:53 +0100

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

LDEV-5338 Rename file to reflect its purpose better

· /lams_central/src/java/org/lamsfoundation/lams/web/GroupingController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/groups.jsp	(-0, +296)	\| History	\| Source
· /lams_central/web/orgGroup.jsp	(-296, +0)	\| History	\| Source	\| Diff