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

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): LDEV-5257 Escape parameters to prevent XSS attack...

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

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

LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

· /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

(-2, +2)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/authoring/authoring.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/svgGenerator.jsp

(-1, +1)

| History

| Source

| Diff

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

(-4, +0)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/assessmentQTI.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/mcquestionQTI.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/dialogCloser.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/emailuser.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/extGroups.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/orgGroup.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/orgGrouping.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/passwordChangeContent.jsp

(-1, +1)

| History

| Source

| Diff

… 38 more files in changeset.

lams-github (v4.7): LDEV-5338 Rename paths to reflect grouping flow better

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

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

LDEV-5338 Rename paths to reflect grouping flow better

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/GroupingController.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_central/web/extGroups.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/orgGroup.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/orgGrouping.js	(-4, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java	(-10, +10)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java	(-5, +5)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4932 Start using /common/taglibs.jsp in lams_central

Andrey Balan — Tue, 07 Jan 2020 21:07:14 +0100

Andrey Balan committed 4c2d1f3 on branch v4.7, v4.8 in lams-github

LDEV-4932 Start using /common/taglibs.jsp in lams_central

· /lams_central/web/authoring/authoring.jsp

(-5, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/svgGenerator.jsp

(-6, +2)

| History

| Source

| Diff

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

(-10, +4)

| History

| Source

| Diff

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

(-4, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-6, +1)

| History

| Source

| Diff

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

(-3, +1)

| History

| Source

| Diff

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

(-5, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/assessgradeselector.jsp

(-1, +2)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/assessmcq.jsp

(-5, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/assessment.jsp

(-3, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/assessmentQTI.jsp

(-3, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/assessoption.jsp

(-3, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/assessredooption.jsp

(-3, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/mcoption.jsp

(-3, +1)

| History

| Source

| Diff

… 54 more files in changeset.

lams-github (v4.7): LDEV-4391 Get rid of redundant jQuery UI themes...

Marcin Cieslak — Wed, 21 Nov 2018 12:22:57 +0100

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

LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

· /lams_admin/web/cleanup.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/cleanupPreviewLessons.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/disabledusers.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importGroups.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importexcel.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importresult.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/joblist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/ldap.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/logevent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/loginmaintain.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/lti/ltiConsumer.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/lti/ltiConsumerList.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/orgPasswordChange.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/cloneResult.jsp

(-1, +1)

| History

| Source

| Diff

… 83 more files in changeset.

lams-github (v4.7): LDEV-4440 Fix URLs in course grouping creation

Marcin Cieslak — Mon, 08 Oct 2018 10:20:44 +0200

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

LDEV-4440 Fix URLs in course grouping creation

· /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java	(-8, +5)	\| History	\| Source	\| Diff
· /lams_central/web/extGroups.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/orgGroup.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/orgGrouping.js	(-4, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 <input> tag can't have a closing tag in HTML...

Andrey Balan — Tue, 25 Sep 2018 22:28:41 +0200

Andrey Balan committed 37c404b on branch v4.7, v4.8 in lams-github

LDEV-4440 tag can't have a closing tag in HTML

Also change into

· /lams_admin/web/policies/editPolicy.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/addLesson.jsp	(-1, +2)	\| History	\| Source	\| Diff
· /lams_central/web/authoring/authoring.jsp	(-26, +29)	\| History	\| Source	\| Diff
· /lams_central/web/authoring/template/grouping.jsp	(-6, +6)	\| History	\| Source	\| Diff
· /lams_central/web/extGroups.jsp	(-3, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/authoring.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_chat/web/pages/authoring/basic.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_daco/web/pages/learning/listRecords.jsp	(-12, +15)	\| History	\| Source	\| Diff
· /lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(-11, +13)	\| History	\| Source	\| Diff
· /lams_tool_forum/web/jsps/admin/config.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_forum/web/jsps/authoring/authoring.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_lamc/web/learning/submissionDeadline.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/monitoring/dateRestriction.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_mindmap/web/common/mapjs.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_nb/web/message.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Central migration

Tue, 28 Aug 2018 16:37:06 +0200

MichalKowalski committed 0e9eca8 on branch v4.7, v4.8 in lams-github

LDEV-4440 Central migration

· /lams_build/lib/lams/lams-central.jar

(binary)

| History

| Source

| Diff

· /lams_central/.classpath

(-1, +1)

| History

| Source

| Diff

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

(-40, +49)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java

(-5, +5)

| History

| Source

| Diff

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

(-0, +48)

| History

| Source

| Diff

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

(-0, +1)

| 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/HomeController.java

(-6, +6)

| History

| Source

| Diff

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

(-10, +10)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-2, +6)

| History

| Source

| Diff

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

(-4, +9)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

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

(-9, +13)

| History

| Source

| Diff

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

(-0, +2)

| History

| Source

| Diff

… 38 more files in changeset.

lams-github (v4.7): LDEV-4343 Remove obsolete "style" attribute from CssTag

Andrey Balan — Fri, 12 May 2017 19:27:21 +0200

Andrey Balan committed 2fab2e2 on branch v4.7, v4.8 in lams-github

LDEV-4343 Remove obsolete "style" attribute from CssTag

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

(-9, +0)

| History

| Source

| Diff

· /lams_admin/web/import/status.jsp

(-1, +1)

| History

| Source

| Diff

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

(-24, +1)

| History

| Source

| Diff

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

(-9, +0)

| History

| Source

| Diff

· /lams_central/web/ckeditor/plugins/kaltura/kaltura.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/extGroups.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/orgGroup.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/orgGrouping.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/tutorialVideo.jsp

(-1, +1)

| History

| Source

| Diff

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

(-9, +0)

| History

| Source

| Diff

· /lams_gradebook/web/template.jsp

(-4, +4)

| History

| Source

| Diff

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

(-9, +0)

| History

| Source

| Diff

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

(-9, +0)

| History

| Source

| Diff

· /lams_monitoring/web/previewdeleted.jsp

(-1, +1)

| History

| Source

| Diff

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

(-9, +0)

| History

| Source

| Diff

… 42 more files in changeset.

lams-github (v4.7): LDEV-3621 Ability to import and use groups from integrated server

Andrey Balan — Tue, 24 May 2016 16:28:59 +0200

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

LDEV-3621 Ability to import and use groups from integrated server

· /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	(-79, +52)	\| History	\| Source	\| Diff
· /lams_central/web/extGroups.jsp	(-2, +7)	\| History	\| Source	\| Diff
· /lams_central/web/orgGroup.jsp	(-0, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-2917: Use <!DOCTYPE html> everywhere.

Marcin Cieslak — Tue, 09 Feb 2016 19:53:33 +0100

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

LDEV-2917: Use everywhere.

· /TestHarness4LAMS2/template.html

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/status.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/openidConfig.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/template.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/timezoneServerManagement.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/toolcontent/learningLibraryGroup.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmactualfolder.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmcreatefolder.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmfolders.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmresourceslist.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmresourcetype.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmupload.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/comments/comments.jsp

(-1, +1)

| History

| Source

| Diff

… 156 more files in changeset.

lams-github (v4.7): LDEV-3621 Ability to import and use groups from integrated server

Andrey Balan — Tue, 15 Dec 2015 19:13:14 +0100

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

LDEV-3621 Ability to import and use groups from integrated server

· /lams_admin/.classpath	(-1, +2)	\| History	\| Source	\| Diff
· /lams_admin/conf/xdoclet/struts-forms.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_admin/web/servermaintain.jsp	(-1, +4)	\| History	\| Source	\| Diff
· /lams_central/.classpath	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	(-25, +112)	\| History	\| Source	\| Diff
· /lams_central/web/extGroups.jsp	(-0, +43)	\| History	\| Source
· /lams_common/.classpath	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(-0, +10)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040050.sql	(-0, +12)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java	(-0, +10)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/integration/dto/ExtGroupDTO.java	(-0, +82)	\| History	\| Source
· /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	(-0, +13)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(-9, +170)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/integration/util/GroupInfoFetchException.java	(-0, +61)	\| History	\| Source
· /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	(-0, +1)	\| History	\| Source	\| Diff