Fisheye on lams-github/lams_central/web/qb/stats.jsp

lams-github (): LDEV-5424 remove scriptlets as they are not permitted inside tags (PageMonitor.tag)

Andrey Balan — Thu, 15 Feb 2024 21:30:06 +0100

Andrey Balan committed bce0894 on branch in lams-github

LDEV-5424 remove scriptlets as they are not permitted inside tags (PageMonitor.tag)

· /lams_central/web/qb/stats.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/emailnotifications/courseNotifications.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/emailnotifications/lessonNotifications.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/emailnotifications/lessonNotifications5.jsp	(-1, +1)	\| History	\| Source	\| Diff

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

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

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

LDEV-5404 Escaping funny characters that break js

· /lams_central/web/addLesson.jsp

(-10, +11)

| History

| Source

| Diff

· /lams_central/web/authoring/authoring.jsp

(-124, +122)

| History

| Source

| Diff

· /lams_central/web/authoring/svgGenerator.jsp

(-11, +12)

| History

| Source

| Diff

· /lams_central/web/comments/edit.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/comments/new.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/comments/reply.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/comments/topicview.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_central/web/editLessonIntro.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/errorpages/error.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/forgotPassword.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/forgotPasswordChange.jsp

(-11, +11)

| History

| Source

| Diff

· /lams_central/web/groups.jsp

(-17, +34)

| History

| Source

| Diff

· /lams_central/web/lti/addLesson.jsp

(-5, +4)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-31, +30)

| History

| Source

| Diff

· /lams_central/web/mainTour.jsp

(-101, +50)

| History

| Source

| Diff

… 26 more files in changeset.

lams-github (v4.7): LDEV-5213 Use version-dependent imports for LAMS JS files

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

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

LDEV-5213 Use version-dependent imports for LAMS JS files

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/logevent.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_build/lams_build.eml

(-1, +4)

| History

| Source

| Diff

· /lams_build/lams_build.iml

(-11, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-3, +2)

| History

| Source

| Diff

· /lams_central/web/authoringConfirm.jsp

(-2, +2)

| History

| Source

| Diff

… 324 more files in changeset.

lams-github (v4.7): # WARNING: head commit changed in the meantime...

Marcin Cieslak — Fri, 27 Jan 2023 18:14:06 +0100

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

# WARNING: head commit changed in the meantime

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

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(-1, +3)	\| 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_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java	(-10, +10)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/web.xml	(-1, +4)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(-9, +9)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java	(-1, +9)	\| History	\| Source	\| Diff
· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(-3, +20)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4832 Secure access to editing QB question...

Marcin Cieslak — Mon, 23 Jan 2023 13:20:30 +0100

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

LDEV-4832 Secure access to editing QB question

WEB-006

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(-1, +17)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5329 Remove obsolete configuration items

Marcin Cieslak — Mon, 03 Oct 2022 15:43:44 +0200

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

LDEV-5329 Remove obsolete configuration items

· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/web.xml	(-1, +0)	\| History	\| Source	\| Diff
· /lams_central/web/findUserLessons.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-38, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/openUrls.js	(-13, +7)	\| History	\| Source	\| Diff
· /lams_central/web/launchlearner.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_central/web/loadVars.jsp	(-39, +0)	\| History	\| Source	\| Diff
· /lams_central/web/lti/addLesson.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_central/web/lti/learnerMonitor.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_central/web/profile/lessons.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20221003.sql	(-0, +15)	\| History	\| Source
· /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(-37, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LKC-215 Do not show edit buttons if QB question comes from WA

Marcin Cieslak — Thu, 09 Jun 2022 09:25:38 +0200

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

LKC-215 Do not show edit buttons if QB question comes from WA

· /lams_central/web/qb/stats.jsp

(-9, +11)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5261 Fix popovers in QB and Assessment question stats

Marcin Cieslak — Sat, 27 Nov 2021 08:09:13 +0100

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

LDEV-5261 Fix popovers in QB and Assessment question stats

· /lams_central/web/includes/javascript/popover-tag.js	(-0, +5)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-4, +13)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(-23, +7)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4825 Introduce item analysis tooltips in QB

Marcin Cieslak — Mon, 05 Jul 2021 10:58:35 +0200

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

LDEV-4825 Introduce item analysis tooltips in QB

· /lams_central/conf/language/lams/ApplicationResources.properties	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-4, +8)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4825 Introduce RAG colouring for item analysis in other places

Marcin Cieslak — Mon, 05 Jul 2021 10:53:05 +0200

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

LDEV-4825 Introduce RAG colouring for item analysis in other places

· /lams_central/web/qb/stats.jsp	(-3, +9)	\| History	\| Source	\| Diff
· /lams_tool_lamc/web/monitoring/parts/statsPart.jsp	(-4, +9)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp	(-3, +9)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5059 Add missing labels for Question Bank

Marcin Cieslak — Wed, 05 Aug 2020 16:59:05 +0200

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

LDEV-5059 Add missing labels for Question Bank

· /lams_central/conf/language/lams/ApplicationResources.properties	(-0, +13)	\| History	\| Source	\| Diff
· /lams_central/web/qb/authoring/addmultiplechoice.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_central/web/qb/collectionList.jsp	(-4, +15)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-6, +5)	\| History	\| Source	\| Diff

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

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

Andrey Balan committed e2956cb on branch in lams-github

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

· /lams_admin/web/logevent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/orgPasswordChange.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/policies/policies.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/policies/userConsents.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/sysadmin.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/toolcontent/toolcontentlist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/user.jsp

(-5, +5)

| History

| Source

| Diff

· /lams_admin/web/userChangePass.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/userrole.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_admin/web/usersearchlist.jsp

(-1, +1)

| History

| Source

| Diff

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

(-2, +3)

| History

| Source

| Diff

· /lams_central/conf/scss/_lams_variables.scss

(-6, +3)

| History

| Source

| Diff

· /lams_central/conf/scss/_lams_variables_purple.scss

(-6, +4)

| History

| Source

| Diff

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

(-18, +123)

| History

| Source

| Diff

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

(-1, +21)

| History

| Source

| Diff

… 184 more files in changeset.

lams-github (v4.7): LDEV-4932 Add CSRF to QB bank calls

Andrey Balan — Thu, 09 Jan 2020 23:10:14 +0100

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

LDEV-4932 Add CSRF to QB bank calls

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

(-0, +18)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java

(-2, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java

(-7, +10)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java

(-7, +8)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java

(-1, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java

(-2, +3)

| History

| Source

| Diff

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

(-12, +9)

| History

| Source

| Diff

· /lams_central/web/qb/authoring/addVsa.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_central/web/qb/authoring/addessay.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_central/web/qb/authoring/addmarkhedging.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_central/web/qb/authoring/addmatchingpairs.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_central/web/qb/authoring/addmultiplechoice.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_central/web/qb/authoring/addnumerical.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_central/web/qb/authoring/addordering.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_central/web/qb/authoring/addtruefalse.jsp

(-0, +1)

| History

| Source

| Diff

… 18 more files in changeset.

lams-github (v4.7): Merge branch 'LDEV-4745' into v4.0...

Marcin Cieslak — Fri, 03 Jan 2020 11:44:14 +0100

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

Merge branch 'LDEV-4745' into v4.0

# Conflicts:

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

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

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

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

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

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

(-14, +25)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-91, +176)

| History

| Source

| Diff

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

(-30, +111)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-5, +10)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-41, +81)

| History

| Source

| Diff

· /lams_central/web/authoring/authoring.jsp

(-1, +5)

| History

| Source

| Diff

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

(-13, +28)

| History

| Source

| Diff

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

(-0, +58)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/qb/search.jsp

(-12, +21)

| History

| Source

| Diff

· /lams_central/web/qb/stats.jsp

(-5, +69)

| History

| Source

| Diff

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

(-1, +6)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/.../lams/tool/assessment/assessmentApplicationContext.xml

(-20, +33)

| History

| Source

| Diff

… 5 more files in changeset.

lams-github (v4.7): LDEV-4848 Remove an unnecessary label

Marcin Cieslak — Thu, 21 Nov 2019 12:58:31 +0100

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

LDEV-4848 Remove an unnecessary label

· /lams_central/web/qb/stats.jsp

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

Marcin Cieslak — Wed, 20 Nov 2019 18:40:12 +0100

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

LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4844 Allow manual QB question merging

Marcin Cieslak — Wed, 20 Nov 2019 18:31:49 +0100

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

LDEV-4844 Allow manual QB question merging

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java	(-0, +37)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-4, +68)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(-0, +20)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(-1, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(-2, +28)	\| History	\| Source	\| Diff

lams-github (v4.7): Merge branch 'LDEV-4745' into v4.0...

Marcin Cieslak — Tue, 22 Oct 2019 14:11:33 +0200

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

Merge branch 'LDEV-4745' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

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

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

· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(-2, +4)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(-9, +32)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java	(-3, +14)	\| History	\| Source	\| Diff
· /lams_central/web/qb/search.jsp	(-1, +2)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-2, +11)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../lams/tool/assessment/assessmentApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-76, +336)	\| History	\| Source	\| Diff
· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-147, +377)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4875 Fixes for VSA feature

Andrey Balan — Wed, 09 Oct 2019 23:32:46 +0200

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

LDEV-4875 Fixes for VSA feature

· /lams_central/web/qb/stats.jsp

(-2, +11)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/.../assessment/web/controller/TblMonitoringController.java

(-1, +2)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/authoring/authoring.jsp

(-14, +14)

| History

| Source

| Diff

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

(-18, +15)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

(-18, +27)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/OptionDTO.java

(-13, +42)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java

(-4, +3)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

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

(-49, +54)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/LearningController.java

(-7, +1)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/.../scratchie/web/controller/LearningWebsocketServer.java

(-9, +4)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/MonitoringController.java

(-5, +2)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/TblMonitorController.java

(-5, +2)

| History

| Source

| Diff

· /lams_tool_scratchie/web/pages/authoring/parts/addVsa.jsp

(-16, +12)

| History

| Source

| Diff

… 8 more files in changeset.

lams-github (v4.7): LKC-215 Modify question review flow

Marcin Cieslak — Fri, 13 Sep 2019 16:01:58 +0200

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

LKC-215 Modify question review flow

· /lams_central/web/qb/stats.jsp

(-0, +2)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4848 Internationalise labels in Question Bank

Marcin Cieslak — Fri, 16 Aug 2019 16:07:12 +0200

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

LDEV-4848 Internationalise labels in Question Bank

· /lams_central/conf/language/lams/ApplicationResources.properties	(-0, +67)	\| History	\| Source	\| Diff
· /lams_central/web/qb/collection.jsp	(-28, +32)	\| History	\| Source	\| Diff
· /lams_central/web/qb/collectionList.jsp	(-11, +12)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-44, +49)	\| History	\| Source	\| Diff

lams-github (): LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

Marcin Cieslak — Fri, 16 Aug 2019 14:26:11 +0200

Marcin Cieslak committed 710d8ac on branch in lams-github

LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (): LDEv-4844 Allow manual QB question merging

Marcin Cieslak — Wed, 07 Aug 2019 09:20:42 +0200

Marcin Cieslak committed 21606f1 on branch in lams-github

LDEv-4844 Allow manual QB question merging

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java	(-0, +37)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-4, +69)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(-0, +20)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(-3, +5)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(-2, +27)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4782 Sort lessons by organisation. Include only active lessons.

Marcin Cieslak — Tue, 16 Jul 2019 10:53:15 +0200

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

LDEV-4782 Sort lessons by organisation. Include only active lessons.

· /lams_central/web/qb/stats.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(-2, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4782 Add a link to open lesson monitor on QB stats page

Marcin Cieslak — Tue, 16 Jul 2019 10:34:49 +0200

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

LDEV-4782 Add a link to open lesson monitor on QB stats page

· /lams_central/web/qb/stats.jsp

(-2, +11)

| History

| Source

| Diff

lams-github (v4.7): Merge branch 'LDEV-4834' into LDEV-4745...

Marcin Cieslak — Sat, 13 Jul 2019 10:00:47 +0200

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

Merge branch 'LDEV-4834' into LDEV-4745

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java

lams_central/web/qb/collection.jsp

lams_central/web/qb/stats.jsp

lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(-29, +40)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java	(-254, +253)	\| History	\| Source	\| Diff
· /lams_central/web/qb/collection.jsp	(-526, +566)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-461, +503)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(-471, +488)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(-131, +133)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(-567, +572)	\| History	\| Source	\| Diff
· /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +11)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(-2, +3)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-65, +68)	\| History	\| Source	\| Diff
· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(-38, +44)	\| History	\| Source	\| Diff

lams-github (v4.7): Merge branch 'LDEV-4745' into LDEV-4836

Andrey Balan — Sat, 13 Jul 2019 00:10:51 +0200

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

Merge branch 'LDEV-4745' into LDEV-4836

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(-54, +35)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_central/web/qb/collection.jsp	(-35, +89)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-4, +7)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/AuthoringController.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/AuthoringController.java	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4836 Change authoring to accommodate importing questions from QB

Andrey Balan — Fri, 12 Jul 2019 23:21:06 +0200

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

LDEV-4836 Change authoring to accommodate importing questions from QB

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

(-0, +67)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java

(-104, +472)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

(-1, +6)

| History

| Source

| Diff

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

(-1, +14)

| History

| Source

| Diff

· /lams_central/web/common/taglibs.jsp

(-0, +6)

| History

| Source

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

(-0, +7)

| History

| Source

· /lams_central/web/css/bootstrap-toggle.scss

(-0, +28)

| History

| Source

· /lams_central/web/css/qb-question.css

(-0, +1)

| History

| Source

· /lams_central/web/css/qb-question.scss

(-0, +394)

| History

| Source

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

(-0, +9)

| History

| Source

· /lams_central/web/includes/javascript/qb-option.js

(-0, +135)

| History

| Source

· /lams_central/web/includes/javascript/qb-question.js

(-0, +80)

| History

| Source

· /lams_central/web/qb/authoring/addQuestionFooter.jsp

(-0, +29)

| History

| Source

· /lams_central/web/qb/authoring/addQuestionHeader.jsp

(-0, +28)

| History

| Source

· /lams_central/web/qb/authoring/addessay.jsp

(-0, +231)

| History

| Source

… 62 more files in changeset.

lams-github (v4.7): LDEV-4834 Check if user can manage a QB question...

Marcin Cieslak — Wed, 10 Jul 2019 19:28:18 +0200

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

LDEV-4834 Check if user can manage a QB question

If an user does not have access to a question, i.e. it is not in any

collection he/she sees, then prevent him/her from editing the question's

collections and learning outcomes.

· /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java	(-32, +2)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java	(-86, +107)	\| History	\| Source	\| Diff
· /lams_central/web/qb/stats.jsp	(-4, +43)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java	(-0, +30)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java	(-3, +4)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(-0, +10)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(-131, +133)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(-566, +571)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4828, LDEV-4834 Move management sections to bottom of stats page

Marcin Cieslak — Sat, 06 Jul 2019 09:28:06 +0200

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

LDEV-4828, LDEV-4834 Move management sections to bottom of stats page

· /lams_central/web/qb/stats.jsp

(-54, +55)

| History

| Source

| Diff