Index: 3rdParty_sources/versions.txt =================================================================== diff -u -r4436ad48ebfcbce1f25ad39db54f55c32873afc1 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- 3rdParty_sources/versions.txt (.../versions.txt) (revision 4436ad48ebfcbce1f25ad39db54f55c32873afc1) +++ 3rdParty_sources/versions.txt (.../versions.txt) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -13,15 +13,15 @@ Apache HttpCore 4.4.4 -Apache POI 4.1.2 +Apache POI 5.1.3 Commons Digester 2.1 Commons Fileupload 1.3.3 Commons Lang 2.6 -Commons IO 2.5 +Commons IO 2.11 Commons Validator 1.6 Index: idea_project/.idea/ant.xml =================================================================== diff -u -rca20c9e86fd4c5ed7bbbfd7e8e571955cbbe7436 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- idea_project/.idea/ant.xml (.../ant.xml) (revision ca20c9e86fd4c5ed7bbbfd7e8e571955cbbe7436) +++ idea_project/.idea/ant.xml (.../ant.xml) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -45,5 +45,6 @@ + \ No newline at end of file Index: idea_project/.idea/libraries/3rdParty.xml =================================================================== diff -u -re98540848441375f30de49a3557a5c9b0e7bea99 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- idea_project/.idea/libraries/3rdParty.xml (.../3rdParty.xml) (revision e98540848441375f30de49a3557a5c9b0e7bea99) +++ idea_project/.idea/libraries/3rdParty.xml (.../3rdParty.xml) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -1,44 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -47,10 +9,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + \ No newline at end of file Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java =================================================================== diff -u -rfd131067cd0d56f83e3f9675277248bca41e259e -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java (.../UserRolesSaveController.java) (revision fd131067cd0d56f83e3f9675277248bca41e259e) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java (.../UserRolesSaveController.java) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -136,7 +136,7 @@ userManagementService.save(user); } - if (userRolesForm.isAddToLessons()) { + if (userRolesForm.isAddToLessons() && !orgId.equals(1)) { for (String roleIdString : roles) { Integer roleId = Integer.valueOf(roleIdString); if (roleId.equals(Role.ROLE_LEARNER) || roleId.equals(Role.ROLE_MONITOR)) { Index: lams_build/3rdParty.userlibraries =================================================================== diff -u -r4436ad48ebfcbce1f25ad39db54f55c32873afc1 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_build/3rdParty.userlibraries (.../3rdParty.userlibraries) (revision 4436ad48ebfcbce1f25ad39db54f55c32873afc1) +++ lams_build/3rdParty.userlibraries (.../3rdParty.userlibraries) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -1,14 +1,14 @@ - - - - - - - - + + + + + + + + @@ -51,4 +51,4 @@ - + \ No newline at end of file Index: lams_build/build.xml =================================================================== diff -u -r4436ad48ebfcbce1f25ad39db54f55c32873afc1 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_build/build.xml (.../build.xml) (revision 4436ad48ebfcbce1f25ad39db54f55c32873afc1) +++ lams_build/build.xml (.../build.xml) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -399,6 +399,10 @@ + + + + + + + + + + + @@ -581,7 +593,23 @@ - + + + + + + + + + + + + + + + @@ -1019,4 +1047,4 @@ - + \ No newline at end of file Index: lams_build/liblist.txt =================================================================== diff -u -r4436ad48ebfcbce1f25ad39db54f55c32873afc1 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_build/liblist.txt (.../liblist.txt) (revision 4436ad48ebfcbce1f25ad39db54f55c32873afc1) +++ lams_build/liblist.txt (.../liblist.txt) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -2,14 +2,15 @@ Folder Library Version License Vendor Description -apache-poi poi-4.1.2.jar 4.1.2 Apache License 2.0 Apache the Java API for Microsoft Documents - poi-ooxml-4.1.2.jar - poi-ooxml-schemas-4.1.2.jar - poi-scratchpad-4.1.2.jar - xmlbeans-3.1.0.jar 3.1.0 +apache-poi poi-5.2.3.jar 5.2.3 Apache License 2.0 Apache the Java API for Microsoft Documents + poi-ooxml-5.2.3.jar + poi-ooxml-full-5.2.3.jar + poi-scratchpad-5.2.3.jar + xmlbeans-5.1.1.jar 3.1.0 -apache-tika tika-core-1.24.jar 1.24 Apache License 2.0 Apache a content analysis toolkit that detects and extracts metadata and text from over a thousand different file types - tika-parsers-1.24.jar +apache-tika tika-core-2.7.0.jar 2.7.0 Apache License 2.0 Apache a content analysis toolkit that detects and extracts metadata and text from over a thousand different file types + tika-parsers-standard-package-2.7.0.jar + tika-parser-microsoft-module-2.7.0.jar autopatch autopatch-1.4.2-lams.jar 1.4.2-lams Apache License Tacit Knowledge automated Java patching system discovery-1.0.5-lams.jar 1.0.5-lams @@ -41,7 +42,8 @@ commons-fileupload-1.3.3.jar 1.3.3 Apache Software License 1.1 The Apache Software Foundation File upload component for Java servlets commons-validator-1.6.jar 1.6 Apache License 2.0 The Apache Software Foundation Commons Validator commons-discovery-0.5.jar 0.5 Apache License 2.0 The Apache Software Foundation - commons-compress-1.19.jar 1.19 Apache License 2.0 The Apache Software Foundation Defines an API for working with ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE, lz4, Brotli, Zstandard, DEFLATE64 and Z files + commons-compress-1.23.jar 1.23 Apache License 2.0 The Apache Software Foundation Defines an API for working with ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE, lz4, Brotli, Zstandard, DEFLATE64 and Z files + commons-io-2.11.0.jar 2.11 Apache License 2.0 The Apache Software Foundation jlatexmath jlatexmath-1.0.8.jar 1.0.8 GPL scilab.org A Java API to render LaTeX @@ -83,4 +85,4 @@ xstream xstream-1.4.11.jar 1.4.11 XML serializer -yuicompressor yuicompressor-2.4.9 2.4.9 BSD License YUI CSS and JS minifier +yuicompressor yuicompressor-2.4.9 2.4.9 BSD License YUI CSS and JS minifier \ No newline at end of file Index: lams_central/.classpath =================================================================== diff -u -re98540848441375f30de49a3557a5c9b0e7bea99 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_central/.classpath (.../.classpath) (revision e98540848441375f30de49a3557a5c9b0e7bea99) +++ lams_central/.classpath (.../.classpath) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -7,36 +7,36 @@ - + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - + \ No newline at end of file Index: lams_central/lams_central.eml =================================================================== diff -u -re7b29886c3fc2a5edef72022a8df8b1833ac6b47 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_central/lams_central.eml (.../lams_central.eml) (revision e7b29886c3fc2a5edef72022a8df8b1833ac6b47) +++ lams_central/lams_central.eml (.../lams_central.eml) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -3,8 +3,9 @@ + - + Index: lams_common/.classpath =================================================================== diff -u -re98540848441375f30de49a3557a5c9b0e7bea99 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_common/.classpath (.../.classpath) (revision e98540848441375f30de49a3557a5c9b0e7bea99) +++ lams_common/.classpath (.../.classpath) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -7,48 +7,48 @@ - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file Index: lams_common/lams_common.eml =================================================================== diff -u -re7b29886c3fc2a5edef72022a8df8b1833ac6b47 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_common/lams_common.eml (.../lams_common.eml) (revision e7b29886c3fc2a5edef72022a8df8b1833ac6b47) +++ lams_common/lams_common.eml (.../lams_common.eml) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -1,6 +1,9 @@ - + + + + Index: lams_contentrepository/.classpath =================================================================== diff -u -re98540848441375f30de49a3557a5c9b0e7bea99 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_contentrepository/.classpath (.../.classpath) (revision e98540848441375f30de49a3557a5c9b0e7bea99) +++ lams_contentrepository/.classpath (.../.classpath) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -8,19 +8,19 @@ - + - - + + - - - + + + \ No newline at end of file Index: lams_learning/.classpath =================================================================== diff -u -re98540848441375f30de49a3557a5c9b0e7bea99 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_learning/.classpath (.../.classpath) (revision e98540848441375f30de49a3557a5c9b0e7bea99) +++ lams_learning/.classpath (.../.classpath) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -5,21 +5,21 @@ - - - - - + + + + + - - - - - - + + + + + + Index: lams_tool_imscc/.classpath =================================================================== diff -u -re98540848441375f30de49a3557a5c9b0e7bea99 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_tool_imscc/.classpath (.../.classpath) (revision e98540848441375f30de49a3557a5c9b0e7bea99) +++ lams_tool_imscc/.classpath (.../.classpath) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -4,17 +4,17 @@ - - - - + + + + - - - + + + Index: lams_tool_whiteboard/.classpath =================================================================== diff -u -re98540848441375f30de49a3557a5c9b0e7bea99 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_tool_whiteboard/.classpath (.../.classpath) (revision e98540848441375f30de49a3557a5c9b0e7bea99) +++ lams_tool_whiteboard/.classpath (.../.classpath) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -4,20 +4,20 @@ - - - + + + - - - - - - - + + + + + + + Index: lams_tool_zoom/.classpath =================================================================== diff -u -re98540848441375f30de49a3557a5c9b0e7bea99 -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 --- lams_tool_zoom/.classpath (.../.classpath) (revision e98540848441375f30de49a3557a5c9b0e7bea99) +++ lams_tool_zoom/.classpath (.../.classpath) (revision f5d27dea6e5752fec029c67db67a5b7df49e10e8) @@ -8,24 +8,24 @@ - + - - - - + + + + - - - - - + + + + + \ No newline at end of file