Fisheye on lams-github/lams_tool_eadventure

lams-github (): LDEV-5440 Use version 3 of JSP and JSTL and their schemas...

Marcin Cieslak — Fri, 05 Apr 2024 13:12:59 +0200

Marcin Cieslak committed b129e5e on branch in lams-github

LDEV-5440 Use version 3 of JSP and JSTL and their schemas

Make IntelliJ understand the Web aspect of LAMS projects.

· /lams_admin/.classpath

(-0, +2)

| History

| Source

| Diff

· /lams_admin/lams_admin.eml

(-5, +2)

| History

| Source

| Diff

· /lams_admin/lams_admin.iml

(-1, +17)

| History

| Source

| Diff

· /lams_admin/web/403.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/404.jsp

(-4, +2)

| History

| Source

| Diff

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

(-4, +3)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-5, +3)

| History

| Source

| Diff

… 2088 more files in changeset.

lams-github (): LDEV-5440 Reintroduce more strict security rules in web.xml

Marcin Cieslak — Sun, 31 Mar 2024 21:28:40 +0200

Marcin Cieslak committed cdc594d on branch in lams-github

LDEV-5440 Reintroduce more strict security rules in web.xml

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 24 more files in changeset.

lams-github (): LDEV-5440 Fix file uploads

Marcin Cieslak — Sun, 31 Mar 2024 13:31:51 +0200

Marcin Cieslak committed 5a79df0 on branch in lams-github

LDEV-5440 Fix file uploads

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/toolcontent/import.jsp

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-3, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 24 more files in changeset.

lams-github (): LDEV-5440 Fix multipart config in web.xml files

Marcin Cieslak — Wed, 27 Mar 2024 11:54:52 +0100

Marcin Cieslak committed 52b0be8 on branch in lams-github

LDEV-5440 Fix multipart config in web.xml files

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/zipfile/ZipFileUtil.java

(-35, +37)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

… 21 more files in changeset.

lams-github (): LDEV-5440 Configure file uploads in Spring servlet

Marcin Cieslak — Tue, 26 Mar 2024 11:19:11 +0100

Marcin Cieslak committed f5c1bfb on branch in lams-github

LDEV-5440 Configure file uploads in Spring servlet

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

… 20 more files in changeset.

lams-github (): LDEV-5440 Update web.xml version

Marcin Cieslak — Wed, 20 Mar 2024 12:30:50 +0100

Marcin Cieslak committed 44cc1e3 on branch in lams-github

LDEV-5440 Update web.xml version

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

(-4, +4)

| History

| Source

| Diff

· /lams_bb_integration/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

(-2, +2)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

… 26 more files in changeset.

lams-github (): LDEV-5440 Use WF 31 Final instead of Beta

Marcin Cieslak — Tue, 20 Feb 2024 11:32:58 +0100

Marcin Cieslak committed 1b6b84b on branch in lams-github

LDEV-5440 Use WF 31 Final instead of Beta

· /lams_admin/.classpath

(-2, +2)

| History

| Source

| Diff

· /lams_admin/lams_admin.eml

(-1, +1)

| History

| Source

| Diff

· /lams_build/build.xml

(-8, +0)

| History

| Source

| Diff

· /lams_build/lib/apache-poi/log4j-api-2.20.0.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/apache-poi/log4j-core-2.20.0.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/apache-poi/logging.module.xml

(-28, +0)

| History

| Source

| Diff

· /lams_build/liblist.txt

(-1, +1)

| History

| Source

| Diff

· /lams_central/.classpath

(-2, +2)

| History

| Source

| Diff

· /lams_central/lams_central.eml

(-1, +1)

| History

| Source

| Diff

· /lams_common/.classpath

(-4, +4)

| History

| Source

| Diff

· /lams_common/lams_common.eml

(-1, +1)

| History

| Source

| Diff

· /lams_contentrepository/.classpath

(-2, +2)

| History

| Source

| Diff

· /lams_gradebook/.classpath

(-2, +2)

| History

| Source

| Diff

· /lams_gradebook/lams_gradebook.eml

(-1, +1)

| History

| Source

| Diff

· /lams_learning/.classpath

(-2, +2)

| History

| Source

| Diff

… 56 more files in changeset.

lams-github (): LDEV-5440 Rewrite config files and library references

Marcin Cieslak — Mon, 15 Jan 2024 16:11:42 +0100

Marcin Cieslak committed a1064a5 on branch in lams-github

LDEV-5440 Rewrite config files and library references

· /idea_project/.idea/misc.xml

(-1, +2)

| History

| Source

| Diff

· /lams_admin/.classpath

(-12, +12)

| History

| Source

| Diff

· /lams_admin/lams_admin.eml

(-4, +4)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-5, +5)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/CleanupPreviewLessonsController.java

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

… 941 more files in changeset.

lams-github (v4.7): LDEV-5431 Reset activity completion on force uncomplete in Monitor

Marcin Cieslak — Thu, 21 Dec 2023 09:42:06 +0100

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

LDEV-5431 Reset activity completion on force uncomplete in Monitor

· /lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java

(-16, +16)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

(-7, +7)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java

(-51, +67)

| History

| Source

| Diff

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

(-542, +542)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-10, +9)

| History

| Source

| Diff

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

(-18, +38)

| History

| Source

| Diff

· /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java

(-7, +8)

| History

| Source

| Diff

· /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

(-45, +52)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

(-37, +51)

| History

| Source

| Diff

· /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java

(-7, +9)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

(-10, +20)

| History

| Source

| Diff

· /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java

(-9, +10)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

(-66, +78)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java

(-7, +8)

| History

| Source

| Diff

… 24 more files in changeset.

lams-github (v4.8): LDEV-5386 Modify config files for LAMS v4.8

Marcin Cieslak — Tue, 09 May 2023 15:29:28 +0200

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

LDEV-5386 Modify config files for LAMS v4.8

· /idea_project/.idea/runConfigurations/WildFly.xml

(-1, +1)

| History

| Source

| Diff

· /lams_admin/.classpath

(-11, +11)

| History

| Source

| Diff

· /lams_admin/lams_admin.eml

(-12, +12)

| History

| Source

| Diff

· /lams_central/.classpath

(-18, +18)

| History

| Source

| Diff

· /lams_central/lams_central.eml

(-16, +16)

| History

| Source

| Diff

· /lams_common/.classpath

(-31, +31)

| History

| Source

| Diff

· /lams_common/lams_common.eml

(-11, +11)

| History

| Source

| Diff

· /lams_contentrepository/.classpath

(-6, +6)

| History

| Source

| Diff

· /lams_gradebook/.classpath

(-7, +7)

| History

| Source

| Diff

· /lams_gradebook/lams_gradebook.eml

(-6, +6)

| History

| Source

| Diff

· /lams_learning/.classpath

(-11, +11)

| History

| Source

| Diff

· /lams_learning/lams_learning.eml

(-8, +8)

| History

| Source

| Diff

· /lams_monitoring/.classpath

(-7, +7)

| History

| Source

| Diff

· /lams_monitoring/lams_monitoring.eml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_assessment/.classpath

(-10, +10)

| History

| Source

| Diff

… 52 more files in changeset.

lams-github (v4.7): LDEV-5386 Library management

Marcin Cieslak — Wed, 26 Apr 2023 08:02:07 +0200

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

LDEV-5386 Library management

· /idea_project/.idea/libraries/3rdParty.xml

(-50, +50)

| History

| Source

| Diff

· /idea_project/.idea/runConfigurations/WildFly.xml

(-1, +1)

| History

| Source

| Diff

· /lams_admin/.classpath

(-11, +11)

| History

| Source

| Diff

· /lams_admin/lams_admin.eml

(-4, +4)

| History

| Source

| Diff

· /lams_central/.classpath

(-18, +18)

| History

| Source

| Diff

· /lams_central/lams_central.eml

(-16, +16)

| History

| Source

| Diff

· /lams_common/.classpath

(-31, +31)

| History

| Source

| Diff

· /lams_common/lams_common.eml

(-11, +11)

| History

| Source

| Diff

· /lams_contentrepository/.classpath

(-7, +7)

| History

| Source

| Diff

· /lams_gradebook/.classpath

(-7, +7)

| History

| Source

| Diff

· /lams_gradebook/lams_gradebook.eml

(-6, +6)

| History

| Source

| Diff

· /lams_learning/.classpath

(-11, +11)

| History

| Source

| Diff

· /lams_learning/lams_learning.eml

(-8, +8)

| History

| Source

| Diff

· /lams_monitoring/.classpath

(-8, +8)

| History

| Source

| Diff

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

(-2, +3)

| History

| Source

| Diff

… 56 more files in changeset.

lams-github (v4.7): LDEV-5386 IntelliJ configuration file maintenance

Marcin Cieslak — Mon, 24 Apr 2023 09:34:52 +0200

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

LDEV-5386 IntelliJ configuration file maintenance

· /idea_project/.idea/encodings.xml

(-0, +6)

| History

| Source

· /idea_project/.idea/libraries/3rdParty.xml

(-46, +46)

| History

| Source

| Diff

· /idea_project/.idea/modules.xml

(-45, +45)

| History

| Source

| Diff

· /idea_project/.idea/vcs.xml

(-1, +7)

| History

| Source

| Diff

· /lams_admin/.classpath

(-9, +9)

| History

| Source

| Diff

· /lams_admin/lams_admin.eml

(-4, +4)

| History

| Source

| Diff

· /lams_bb_integration/.classpath

(-12, +12)

| History

| Source

| Diff

· /lams_bb_integration/lams_bb_integration.eml

(-12, +15)

| History

| Source

| Diff

· /lams_central/.classpath

(-18, +18)

| History

| Source

| Diff

· /lams_central/lams_central.eml

(-16, +16)

| History

| Source

| Diff

· /lams_common/.classpath

(-31, +31)

| History

| Source

| Diff

· /lams_common/lams_common.eml

(-11, +11)

| History

| Source

| Diff

· /lams_contentrepository/.classpath

(-7, +7)

| History

| Source

| Diff

· /lams_gradebook/.classpath

(-7, +7)

| History

| Source

| Diff

· /lams_gradebook/lams_gradebook.eml

(-6, +6)

| History

| Source

| Diff

… 58 more files in changeset.

lams-github (v4.7): LDEV-5386 Add per moduule IntelliJ configuration files

Marcin Cieslak — Mon, 17 Apr 2023 14:14:01 +0200

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

LDEV-5386 Add per moduule IntelliJ configuration files

· /3rdParty_sources/3rdParty_sources.iml

(-0, +9)

| History

| Source

· /lams_admin/lams_admin.eml

(-0, +19)

| History

| Source

· /lams_admin/lams_admin.iml

(-0, +2)

| History

| Source

· /lams_bb_integration/lams_bb_integration.eml

(-0, +41)

| History

| Source

· /lams_bb_integration/lams_bb_integration.iml

(-0, +2)

| History

| Source

· /lams_build/lams_build.eml

(-0, +4)

| History

| Source

· /lams_build/lams_build.iml

(-0, +12)

| History

| Source

· /lams_central/lams_central.eml

(-0, +31)

| History

| Source

· /lams_central/lams_central.iml

(-0, +2)

| History

| Source

· /lams_common/lams_common.eml

(-0, +40)

| History

| Source

· /lams_common/lams_common.iml

(-0, +13)

| History

| Source

· /lams_contentrepository/lams_contentrepository.eml

(-0, +7)

| History

| Source

· /lams_contentrepository/lams_contentrepository.iml

(-0, +2)

| History

| Source

· /lams_gradebook/lams_gradebook.eml

(-0, +25)

| History

| Source

· /lams_gradebook/lams_gradebook.iml

(-0, +2)

| History

| Source

… 73 more files in changeset.

lams-github (v4.7): LDEV-5386 Clean up .classpath files to make them compatible with IntelliJ

Marcin Cieslak — Mon, 17 Apr 2023 14:08:44 +0200

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

LDEV-5386 Clean up .classpath files to make them compatible with IntelliJ

· /lams_admin/.classpath

(-2, +2)

| History

| Source

| Diff

· /lams_bb_integration/.classpath

(-13, +13)

| History

| Source

| Diff

· /lams_central/.classpath

(-8, +8)

| History

| Source

| Diff

· /lams_common/.classpath

(-2, +1)

| History

| Source

| Diff

· /lams_gradebook/.classpath

(-7, +7)

| History

| Source

| Diff

· /lams_learning/.classpath

(-8, +8)

| History

| Source

| Diff

· /lams_tool_assessment/.classpath

(-3, +2)

| History

| Source

| Diff

· /lams_tool_bbb/.classpath

(-1, +0)

| History

| Source

| Diff

· /lams_tool_chat/.classpath

(-5, +3)

| History

| Source

| Diff

· /lams_tool_daco/.classpath

(-3, +3)

| History

| Source

| Diff

· /lams_tool_doku/.classpath

(-7, +9)

| History

| Source

| Diff

· /lams_tool_eadventure/.classpath

(-5, +3)

| History

| Source

| Diff

· /lams_tool_gmap/.classpath

(-1, +0)

| History

| Source

| Diff

· /lams_tool_images/.classpath

(-2, +2)

| History

| Source

| Diff

· /lams_tool_imscc/.classpath

(-8, +7)

| History

| Source

| Diff

… 19 more files in changeset.

lams-github (v4.7): LDEV-5259 Manually create parent application context...

Marcin Cieslak — Mon, 29 Nov 2021 22:18:30 +0100

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

LDEV-5259 Manually create parent application context

Previous attempt to reproduce BeanFactoryLocater was an overkill. A

simple singleton parent application context is sufficient.

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

(-8, +0)

| History

| Source

| Diff

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

(-1, +0)

| History

| Source

| Diff

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

(-31, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml

(-29, +30)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/BeanFactoryLocator.java

(-74, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/BeanFactoryReference.java

(-57, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/BootstrapException.java

(-53, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/ContextSingletonBeanFactoryLocator.java

(-168, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/SingletonBeanFactoryLocator.java

(-562, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/web/filter/LamsContextLoaderListener.java

(-24, +11)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

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

(-13, +0)

| History

| Source

| Diff

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

(-13, +0)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

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

(-9, +0)

| History

| Source

| Diff

… 31 more files in changeset.

lams-github (v4.7): LDEV-5259 Use MVC initialisation via annotation...

Marcin Cieslak — Mon, 29 Nov 2021 21:10:06 +0100

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

LDEV-5259 Use MVC initialisation via annotation

Manually triggering controller scanning by adding an annotation handler

bean does not register all useful support beans. If

is used in spring-servlet.xml, all support beans

are registered via WebMvcConfigurer.

need to be added because we

use .do suffix for Spring actions and suffix was turned off for Spring

5.3

https://github.com/spring-projects/spring-framework/issues/24179

· /lams_admin/web/WEB-INF/spring-servlet.xml

(-11, +14)

| History

| Source

| Diff

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

(-8, +11)

| History

| Source

| Diff

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

(-23, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/AbstractUrlMethodNameResolver.java

(-118, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/AnnotationMethodHandlerAdapter.java

(-1297, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/DefaultAnnotationHandlerMapping.java

(-288, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/HandlerMethodInvocationException.java

(-44, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/HandlerMethodInvoker.java

(-901, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/HandlerMethodResolver.java

(-172, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/InternalPathMethodNameResolver.java

(-129, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/MethodNameResolver.java

(-47, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/NoSuchRequestHandlingMethodException.java

(-87, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/ServletAnnotationMappingUtils.java

(-166, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/SourceHttpMessageConverter.java

(-295, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/WebUtils.java

(-51, +0)

| History

| Source

| Diff

… 37 more files in changeset.

lams-github (v4.7): LDEV-5259 Manually start controller annotation detection

Marcin Cieslak — Tue, 23 Nov 2021 12:24:47 +0100

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

LDEV-5259 Manually start controller annotation detection

· /lams_admin/web/WEB-INF/spring-servlet.xml

(-4, +4)

| History

| Source

| Diff

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

(-9, +10)

| History

| Source

| Diff

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

(-0, +33)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/spring-servlet.xml

(-4, +4)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/spring-servlet.xml

(-4, +4)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/spring-servlet.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_assessment/web/WEB-INF/spring-servlet.xml

(-10, +11)

| History

| Source

| Diff

· /lams_tool_bbb/web/WEB-INF/spring-servlet.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/spring-servlet.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_daco/web/WEB-INF/spring-servlet.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_dimdim/web/WEB-INF/spring-servlet.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_doku/web/WEB-INF/spring-servlet.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_eadventure/web/WEB-INF/spring-servlet.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_forum/web/WEB-INF/spring-servlet.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/spring-servlet.xml

(-4, +4)

| History

| Source

| Diff

… 24 more files in changeset.

lams-github (v4.7): LDEV-5259 Reintroduce BeanFactoryLocator mechanism back to LAMS...

Marcin Cieslak — Tue, 23 Nov 2021 12:23:57 +0100

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

LDEV-5259 Reintroduce BeanFactoryLocator mechanism back to LAMS

It was removed for Spring 5

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml

(-29, +8)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/context/AbstractUrlMethodNameResolver.java

(-0, +118)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/context/AnnotationMethodHandlerAdapter.java

(-0, +1297)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/context/BeanFactoryLocator.java

(-0, +74)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/context/BeanFactoryReference.java

(-0, +57)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/context/BootstrapException.java

(-0, +53)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/context/ContextSingletonBeanFactoryLocator.java

(-0, +168)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/context/DefaultAnnotationHandlerMapping.java

(-0, +288)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/context/HandlerMethodInvocationException.java

(-0, +44)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/context/HandlerMethodInvoker.java

(-0, +901)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/context/HandlerMethodResolver.java

(-0, +172)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/context/InternalPathMethodNameResolver.java

(-0, +129)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/context/MethodNameResolver.java

(-0, +47)

| History

| Source

… 44 more files in changeset.

lams-github (v4.7): LDEV-5250 Do not set obsolete PedPlanner URL when adding a tool...

Marcin Cieslak — Fri, 29 Oct 2021 16:01:23 +0200

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

LDEV-5250 Do not set obsolete PedPlanner URL when adding a tool

It causes problems when a tool is deployed after server starts for the

first time and PedPlanner tables are already gone via Autopatch.

· /lams_tool_chat/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_dimdim/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_doku/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_eadventure/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_forum/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_imscc/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_lamc/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_laqa/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_larsrc/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_mindmap/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_nb/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_notebook/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_sbmt/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_scratchie/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_scribe/db/sql/tool_insert.sql

(-2, +0)

| History

| Source

| Diff

… 4 more files in changeset.

lams-github (v4.7): LDEV-5156 Fix schema info in web.xml files

Marcin Cieslak — Tue, 23 Feb 2021 12:28:43 +0100

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

LDEV-5156 Fix schema info in web.xml files

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

(-2, +2)

| History

| Source

| Diff

· /lams_bb_integration/WEB-INF/web.xml

(-2, +4)

| History

| Source

| Diff

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

(-7, +8)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

… 23 more files in changeset.

lams-github (v4.7): LDEV-5058 Allow tool adding both on fresh build and afterwards...

Marcin Cieslak — Mon, 10 Aug 2020 06:49:26 +0200

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

LDEV-5058 Allow tool adding both on fresh build and afterwards

As a column got removed from a LAMS core table, we need to make sure

that all scenarios work well: an upgrade from previous version, a fresh

build and adding extra tools afterwards.

· /lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql

(-2, +2)

| History

| Source

| Diff

· /lams_build/librarypackages/chatscribe/toolActivity1_insert.sql

(-2, +2)

| History

| Source

| Diff

· /lams_build/librarypackages/chatscribe/toolActivity2_insert.sql

(-2, +2)

| History

| Source

| Diff

· /lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql

(-2, +2)

| History

| Source

| Diff

· /lams_build/librarypackages/forumscribe/toolActivity1_insert.sql

(-2, +2)

| History

| Source

| Diff

· /lams_build/librarypackages/forumscribe/toolActivity2_insert.sql

(-2, +2)

| History

| Source

| Diff

· /lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql

(-2, +2)

| History

| Source

| Diff

· /lams_build/librarypackages/shareresourcesforum/toolActivity1_insert.sql

(-2, +2)

| History

| Source

| Diff

· /lams_build/librarypackages/shareresourcesforum/toolActivity2_insert.sql

(-2, +2)

| History

| Source

| Diff

· /lams_common/db/sql/create_lams_11_tables.sql

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/db/sql/activity_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_bbb/db/sql/activity_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_chat/db/sql/activity_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_daco/db/sql/activity_insert.sql

(-2, +0)

| History

| Source

| Diff

· /lams_tool_dimdim/db/sql/activity_insert.sql

(-2, +0)

| History

| Source

| Diff

… 27 more files in changeset.

lams-github (v4.7): LDEV-4997 Renormalize line endings with git

Marcin Cieslak — Mon, 11 May 2020 12:14:27 +0200

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

LDEV-4997 Renormalize line endings with git

· /3rdParty_sources/commons-io/org/apache/commons/io/Charsets.java

(-192, +192)

| History

| Source

| Diff

· /3rdParty_sources/commons-io/org/apache/commons/io/serialization/package.html

(-24, +24)

| History

| Source

| Diff

· /3rdParty_sources/commons-validator/org/apache/.../routines/checkdigit/ModulusTenCheckDigit.java

(-243, +243)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/MappingNotFoundException.java

(-76, +76)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/QueryParameterException.java

(-39, +39)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/TypeMismatchException.java

(-23, +23)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/CollectionId.java

(-41, +41)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/Fetch.java

(-26, +26)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/FetchMode.java

(-28, +28)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/FetchProfile.java

(-57, +57)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/FilterJoinTable.java

(-45, +45)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/FilterJoinTables.java

(-26, +26)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/ForeignKey.java

(-37, +37)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/Generated.java

(-30, +30)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/GenerationTime.java

(-39, +39)

| History

| Source

| Diff

… 406 more files in changeset.

lams-github (v4.7): LDEV-4999 Fix monitor role detection when updating learner mark

Marcin Cieslak — Tue, 21 Apr 2020 12:07:28 +0200

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

LDEV-4999 Fix monitor role detection when updating learner mark

· /3rdParty_sources/commons-io/org/apache/commons/io/Charsets.java

(-192, +192)

| History

| Source

| Diff

· /3rdParty_sources/commons-io/org/apache/commons/io/serialization/package.html

(-24, +24)

| History

| Source

| Diff

· /3rdParty_sources/commons-validator/org/apache/.../routines/checkdigit/ModulusTenCheckDigit.java

(-243, +243)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/MappingNotFoundException.java

(-76, +76)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/QueryParameterException.java

(-39, +39)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/TypeMismatchException.java

(-23, +23)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/CollectionId.java

(-41, +41)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/Fetch.java

(-26, +26)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/FetchMode.java

(-28, +28)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/FetchProfile.java

(-57, +57)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/FilterJoinTable.java

(-45, +45)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/FilterJoinTables.java

(-26, +26)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/ForeignKey.java

(-37, +37)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/Generated.java

(-30, +30)

| History

| Source

| Diff

· /3rdParty_sources/hibernate-core/org/hibernate/annotations/GenerationTime.java

(-39, +39)

| History

| Source

| Diff

… 449 more files in changeset.

lams-github (v4.7): LDEV-4900 Update Gradebook marks of non-leaders on leader finish...

Andrey Balan — Tue, 12 Nov 2019 20:32:23 +0100

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

LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

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

(-1, +9)

| History

| Source

| Diff

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

(-78, +79)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml

(-1, +0)

| History

| Source

| Diff

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

(-0, +6)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java

(-0, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

(-0, +8)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java

(-41, +72)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml

(-1, +1)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-56, +25)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java

(-11, +0)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerFullService.java

(-5, +13)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

(-50, +87)

| History

| Source

| Diff

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

(-5, +2)

| History

| Source

| Diff

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

(-2, +1)

| History

| Source

| Diff

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

(-3, +1)

| History

| Source

| Diff

… 46 more files in changeset.

lams-github (v4.7): LDEV-4691 Make Hibernate a part of LAMS libraries...

Marcin Cieslak — Wed, 17 Oct 2018 09:58:29 +0200

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

LDEV-4691 Make Hibernate a part of LAMS libraries

WildFly 14 provides Hibernate 5.3. Migrating LAMS from 5.0.10 will

require some effort. For now we provide our own version of Hibernate to

keep compatible.

· /lams_build/3rdParty.userlibraries

(-0, +1)

| History

| Source

| Diff

· /lams_build/build.xml

(-0, +10)

| History

| Source

| Diff

· /lams_build/build_base.xml

(-5, +4)

| History

| Source

| Diff

· /lams_build/lib/hibernate/hibernate-core-5.0.10.Final.jar

(binary)

| History

| Source

· /lams_build/lib/hibernate/hibernate-entitymanager-5.0.10.Final.jar

(binary)

| History

| Source

· /lams_build/lib/hibernate/hibernate-envers-5.0.10.Final.jar

(binary)

| History

| Source

· /lams_build/lib/hibernate/hibernate-java8-5.0.10.Final.jar

(binary)

| History

| Source

· /lams_build/lib/hibernate/hibernate.module.xml

(-0, +55)

| History

| Source

· /lams_central/.classpath

(-5, +0)

| History

| Source

| Diff

· /lams_common/.classpath

(-5, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java

(-1, +1)

| History

| Source

| Diff

· /lams_contentrepository/.classpath

(-5, +0)

| History

| Source

| Diff

· /lams_gradebook/.classpath

(-5, +0)

| History

| Source

| Diff

· /lams_learning/.classpath

(-5, +0)

| History

| Source

| Diff

· /lams_tool_assessment/.classpath

(-5, +0)

| History

| Source

| Diff

… 30 more files in changeset.

lams-github (v4.7): LDEV-4691 Update libraries provided by WildFly

Marcin Cieslak — Wed, 17 Oct 2018 08:58:40 +0200

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

LDEV-4691 Update libraries provided by WildFly

· /TestHarness4LAMS2/.classpath

(-7, +7)

| History

| Source

| Diff

· /lams_admin/.classpath

(-6, +6)

| History

| Source

| Diff

· /lams_build/deploy-tool/deploy.bat

(-1, +1)

| History

| Source

| Diff

· /lams_build/deploy-tool/deploy.sh

(-1, +1)

| History

| Source

| Diff

· /lams_build/deploy-tool/lib/commons-io-2.4.jar

(binary)

| History

| Source

| Diff

· /lams_build/deploy-tool/lib/commons-io-2.5.jar

(binary)

| History

| Source

· /lams_build/deploy-tool/lib/lams-tool-deploy.jar

(binary)

| History

| Source

| Diff

· /lams_central/.classpath

(-16, +17)

| History

| Source

| Diff

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

(-1, +3)

| History

| Source

| Diff

· /lams_common/.classpath

(-20, +21)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java

(-1, +1)

| History

| Source

| Diff

· /lams_contentrepository/.classpath

(-3, +4)

| History

| Source

| Diff

· /lams_gradebook/.classpath

(-5, +6)

| History

| Source

| Diff

· /lams_learning/.classpath

(-8, +8)

| History

| Source

| Diff

· /lams_monitoring/.classpath

(-5, +5)

| History

| Source

| Diff

… 33 more files in changeset.

lams-github (v4.7): LDEV-4440 Switch controllers to use @Autowired service beans...

Andrey Balan — Thu, 04 Oct 2018 13:35:44 +0200

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

LDEV-4440 Switch controllers to use @Autowired service beans

Also in cases when service bean in Controller has the same name as in

applicationContext, @Qualifier(..) can be removed. Which was done almost

in all cases, except for messageService due to "messageService" name

seems to be more preferable than adminMessageService,

centralMessageService and so on. Thus they were kept as before:

@Autowired

@Qualifier("centralMessageService")

private MessageService messageService;

· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/CleanupPreviewLessonsController.java

(-44, +13)

| History

| Source

| Diff

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

(-13, +4)

| History

| Source

| Diff

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

(-29, +15)

| History

| Source

| Diff

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

(-31, +12)

| History

| Source

| Diff

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

(-16, +3)

| History

| Source

| Diff

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

(-21, +13)

| History

| Source

| Diff

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

(-16, +3)

| History

| Source

| Diff

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

(-11, +5)

| History

| Source

| Diff

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

(-55, +22)

| History

| Source

| Diff

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

(-29, +8)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/LtiConsumerManagementController.java

(-33, +7)

| History

| Source

| Diff

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

(-26, +7)

| History

| Source

| Diff

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

(-19, +17)

| History

| Source

| Diff

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

(-34, +15)

| History

| Source

| Diff

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

(-38, +31)

| History

| Source

| Diff

… 168 more files in changeset.

lams-github (v4.7): LDEV-4440 All projects start using solely 3rdParty.userlibraries

Andrey Balan — Fri, 21 Sep 2018 19:22:49 +0200

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

LDEV-4440 All projects start using solely 3rdParty.userlibraries

· /lams_admin/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_build/3rdParty.userlibraries

(-2, +0)

| History

| Source

| Diff

· /lams_build/noStruts.userlibraries

(-37, +0)

| History

| Source

| Diff

· /lams_central/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_gradebook/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_learning/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_tool_chat/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_tool_daco/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_tool_dimdim/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_tool_eadventure/.classpath

(-4, +1)

| History

| Source

| Diff

· /lams_tool_forum/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_tool_imscc/.classpath

(-1, +1)

| History

| Source

| Diff

… 21 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): Merge remote-tracking branch 'origin/master' into lams31...

Marcin Cieslak — Sun, 09 Sep 2018 19:55:53 +0200

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

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_admin/.classpath

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

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

lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java

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/rest/RestServlet.java

lams_central/src/java/org/lamsfoundation/lams/rest/ToolRestManager.java

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

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

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_common/.classpath

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

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

lams_gradebook/.classpath

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/.classpath

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

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java

lams_monitoring/.classpath

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

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

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

lams_tool_assessment/.classpath

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

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

lams_tool_bbb/.classpath

lams_tool_chat/.classpath

lams_tool_doku/.classpath

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

lams_tool_eadventure/.classpath

lams_tool_forum/.classpath

lams_tool_images/.classpath

lams_tool_kaltura/.classpath

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

lams_tool_lamc/.classpath

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

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

lams_tool_laqa/.classpath

lams_tool_larsrc/.classpath

lams_tool_leader/.classpath

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

lams_tool_nb/.classpath

lams_tool_notebook/.classpath

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

lams_tool_sbmt/.classpath

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

lams_tool_scratchie/.classpath

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

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

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

lams_tool_spreadsheet/.classpath

lams_tool_survey/.classpath

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

lams_tool_task/.classpath

lams_tool_vote/.classpath

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

lams_tool_wiki/.classpath

· /lams_admin/.classpath

(-1, +0)

| History

| Source

| Diff

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

(-7, +3)

| History

| Source

| Diff

· /lams_build/conf/standalone.xml

(-1, +1)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/.classpath

(-4, +0)

| History

| Source

| Diff

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

(-21, +19)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

(-272, +28)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java

(-0, +142)

| History

| Source

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

(-19, +24)

| History

| Source

| Diff

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

(-6, +16)

| History

| Source

| Diff

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

(-17, +22)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/rest/RestServlet.java

(-6, +6)

| History

| Source

| Diff

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

(-6, +4)

| History

| Source

| Diff

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

(-9, +10)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

… 89 more files in changeset.