Fisheye on lams-github/lams_tool_laqa/src

lams-github (v4.8): LDEV-5446 Ensure that UUIDs are unique but retained on import

Marcin Cieslak — Fri, 16 Feb 2024 13:36:45 +0100

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

LDEV-5446 Ensure that UUIDs are unique but retained on import

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(-18, +21)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20240216.sql	(-1, +7)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/AuthoringController.java	(-0, +2)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5442 switch learning to the new star rating widget

Andrey Balan — Sat, 27 Jan 2024 01:11:46 +0100

Andrey Balan committed 169520b on branch v4.8 in lams-github

LDEV-5442 switch learning to the new star rating widget

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

(-9, +21)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-8, +3)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-14, +13)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/learning/galleryWalk.jsp

(-8, +4)

| History

| Source

| Diff

· /lams_tool_images/web/includes/css/jquery.rating.css

(-14, +0)

| History

| Source

| Diff

· /lams_tool_images/web/includes/javascript/jquery.rating.1.1.js

(-166, +0)

| History

| Source

| Diff

· /lams_tool_images/web/pages/learning/learning.jsp

(-36, +33)

| History

| Source

| Diff

· /lams_tool_images/web/pages/learning/parts/commentsarea.jsp

(-8, +3)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java

(-2, +3)

| History

| Source

| Diff

· /lams_tool_laqa/web/learning/LearnerRep.jsp

(-91, +58)

| History

| Source

| Diff

· /lams_tool_laqa/web/learning/ratingStarsDisabled.jsp

(-22, +0)

| History

| Source

| Diff

· /lams_tool_larsrc/web/pages/itemreview/itemContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_larsrc/web/pages/learning/learning.jsp

(-7, +3)

| History

| Source

| Diff

… 7 more files in changeset.

lams-github (v4.8): LDEV-5436 Project-wide user sorting by last then first name

Marcin Cieslak — Tue, 09 Jan 2024 09:41:35 +0100

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

LDEV-5436 Project-wide user sorting by last then first name

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-11, +12)

| History

| Source

| Diff

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

(-11, +11)

| History

| Source

| Diff

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

(-15, +13)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/organisation/parts/selectLearners.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/parts/selectStaff.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/user/basiclist.jsp

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-9, +8)

| History

| Source

| Diff

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

(-8, +7)

| History

| Source

| Diff

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

(-8, +10)

| History

| Source

| Diff

· /lams_central/web/emailuser.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/findUserLessons.jsp

(-1, +1)

| History

| Source

| Diff

… 136 more files in changeset.

lams-github (v4.8): Merge branch 'LDEV-5397' into v4.8...

Andrey Balan — Wed, 27 Dec 2023 22:09:23 +0100

Andrey Balan committed 0356b71 on branch v4.8 in lams-github

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

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

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

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

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

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

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

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

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

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

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

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

· /lams_learning/web/includes/javascript/learnerPage.js

(-24, +7)

| History

| Source

| Diff

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

(-29, +24)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java

(-22, +0)

| History

| Source

| Diff

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

(-114, +31)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java

(-69, +0)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java

(-1, +0)

| History

| Source

| Diff

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

(-31, +0)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp

(-31, +0)

| History

| Source

| Diff

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

(-55, +2)

| History

| Source

| Diff

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

(-90, +20)

| History

| Source

| Diff

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

(-95, +19)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary5.jsp

(-8, +0)

| History

| Source

| Diff

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

(-54, +2)

| History

| Source

| Diff

· /lams_tool_images/src/java/org/lamsfoundation/.../tool/imageGallery/service/ImageGalleryServiceImpl.java

(-82, +23)

| History

| Source

| Diff

· /lams_tool_imscc/src/java/org/.../tool/commonCartridge/service/CommonCartridgeServiceImpl.java

(-80, +17)

| History

| Source

| Diff

… 20 more files in changeset.

lams-github (v4.8): LDEV-5425 Remove "End of activity" notebook from all tools

Andrey Balan — Wed, 27 Dec 2023 21:04:44 +0100

Andrey Balan committed 52a6369 on branch v4.8 in lams-github

LDEV-5425 Remove "End of activity" notebook from *all* tools

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

(-188, +121)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-42, +30)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-107, +0)

| History

| Source

| Diff

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

(-67, +0)

| History

| Source

| Diff

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

(-71, +10)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

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

(-40, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20231221.sql

(-0, +15)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java

(-51, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java

(-106, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java

(-204, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookConstants.java

(-11, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java

(-250, +0)

| History

| Source

| Diff

… 505 more files in changeset.

lams-github (v4.7): LDEV-5433 Squash DB patches and update versions

Marcin Cieslak — Fri, 22 Dec 2023 16:00:37 +0100

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

LDEV-5433 Squash DB patches and update versions

· /lams_build/common.properties

(-1, +1)

| History

| Source

| Diff

· /lams_common/db/sql/create_lams_11_tables.sql

(-1388, +1540)

| History

| Source

| Diff

· /lams_common/db/sql/create_quartz_table.sql

(-116, +128)

| History

| Source

| Diff

· /lams_common/db/sql/insert_lams_config_data.sql

(-7, +3)

| History

| Source

| Diff

· /lams_common/db/sql/insert_lams_users.sql

(-1, +2)

| History

| Source

| Diff

· /lams_common/db/sql/insert_types_data.sql

(-11, +12)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20220126.sql

(-35, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20220201.sql

(-17, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20220210.sql

(-15, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20220411.sql

(-15, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20220503.sql

(-15, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20220528.sql

(-20, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20220920.sql

(-15, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20221003.sql

(-15, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20221118.sql

(-19, +0)

| History

| Source

| Diff

… 93 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-5397 bootstrap5 Voting

Andrey Balan — Wed, 25 Oct 2023 00:58:40 +0200

Andrey Balan committed b9f40a0 on branch v4.8 in lams-github

LDEV-5397 bootstrap5 Voting

· /lams_central/web/css/components.scss

(-2, +5)

| History

| Source

| Diff

· /lams_learning/web/branching/preview.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java

(-2, +10)

| History

| Source

| Diff

· /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java

(-2, +10)

| History

| Source

| Diff

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

(-7, +17)

| History

| Source

| Diff

· /lams_tool_vote/web/WEB-INF/tags/PageLearner.tag

(-35, +57)

| History

| Source

| Diff

· /lams_tool_vote/web/WEB-INF/tags/WaitForLeader.tag

(-1, +1)

| History

| Source

| Diff

· /lams_tool_vote/web/learning/AllNominations.jsp

(-117, +96)

| History

| Source

| Diff

· /lams_tool_vote/web/learning/AnswersContent.jsp

(-78, +65)

| History

| Source

| Diff

· /lams_tool_vote/web/learning/ExitLearning.jsp

(-75, +35)

| History

| Source

| Diff

· /lams_tool_vote/web/learning/IndividualLearnerResults.jsp

(-102, +73)

| History

| Source

| Diff

· /lams_tool_vote/web/learning/Notebook.jsp

(-66, +8)

| History

| Source

| Diff

· /lams_tool_vote/web/learning/RevisitedAllNominations.jsp

(-98, +58)

| History

| Source

| Diff

… 3 more files in changeset.

lams-github (v4.8): LDEV-5397 migrate defineLater tag and jsps to bootstrap 5

Andrey Balan — Sun, 13 Aug 2023 00:11:37 +0200

Andrey Balan committed a21e768 on branch v4.8 in lams-github

LDEV-5397 migrate defineLater tag and jsps to bootstrap 5

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

(-17, +12)

| History

| Source

| Diff

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

(-17, +12)

| History

| Source

| Diff

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

(-17, +12)

| History

| Source

| Diff

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

(-17, +12)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/DefineLater.tag

(-17, +12)

| History

| Source

| Diff

· /lams_tool_assessment/web/WEB-INF/tags/DefineLater.tag

(-17, +12)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/tags/DefineLater.tag

(-17, +12)

| History

| Source

| Diff

· /lams_tool_daco/web/WEB-INF/tags/DefineLater.tag

(-17, +12)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/.../tool/dokumaran/web/controller/LearningController.java

(-3, +3)

| History

| Source

| Diff

· /lams_tool_doku/web/WEB-INF/tags/DefineLater.tag

(-17, +12)

| History

| Source

| Diff

· /lams_tool_forum/web/WEB-INF/tags/DefineLater.tag

(-17, +12)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag

(-17, +12)

| History

| Source

| Diff

· /lams_tool_images/web/WEB-INF/tags/DefineLater.tag

(-17, +12)

| History

| Source

| Diff

· /lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag

(-17, +12)

| History

| Source

| Diff

· /lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag

(-17, +12)

| History

| Source

| Diff

… 28 more files in changeset.

lams-github (v4.8): LDEV-5397 Improvements and fixes to Submit Files and Q&A tools

Marcin Cieslak — Mon, 12 Jun 2023 07:19:40 +0200

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

LDEV-5397 Improvements and fixes to Submit Files and Q&A tools

· /lams_central/web/includes/javascript/dialog5.js	(-1, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/css/components-learner.css	(-8, +6)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/learning/AnswersContent.jsp	(-177, +177)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(-35, +35)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(-106, +106)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/learning/LearnerRep.jsp	(-421, +419)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/web/learner/sbmtlearner.jsp	(-163, +160)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5398 Allow adding QB collections on the fly in other parts of authoring

Marcin Cieslak — Mon, 22 May 2023 19:26:44 +0200

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

LDEV-5398 Allow adding QB collections on the fly in other parts of authoring

· /lams_central/web/includes/javascript/qb-question.js	(-30, +75)	\| History	\| Source	\| Diff
· /lams_central/web/qb/authoring/addQuestionFooter.jsp	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/web/qb/authoring/addQuestionHeader.jsp	(-19, +26)	\| History	\| Source	\| Diff
· /lams_central/web/qb/authoring/addessay.jsp	(-213, +221)	\| History	\| Source	\| Diff
· /lams_central/web/qb/authoring/addtruefalse.jsp	(-107, +114)	\| History	\| Source	\| Diff
· /lams_central/web/questions/questionChoice.jsp	(-4, +1)	\| History	\| Source	\| Diff
· /lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java	(-27, +14)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/authoring/newQuestionBox.jsp	(-125, +138)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/authoring/parts/addItemFooter.jsp	(-10, +62)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5328 Squash DB patches and update versions

Marcin Cieslak — Wed, 21 Sep 2022 07:56:58 +0200

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

LDEV-5328 Squash DB patches and update versions

· /lams_build/common.properties

(-1, +1)

| History

| Source

| Diff

· /lams_common/build.xml

(-1, +1)

| History

| Source

| Diff

· /lams_common/db/sql/create_lams_11_tables.sql

(-498, +544)

| History

| Source

| Diff

· /lams_common/db/sql/create_quartz_table.sql

(-224, +179)

| History

| Source

| Diff

· /lams_common/db/sql/insert_lams_config_data.sql

(-12, +114)

| History

| Source

| Diff

· /lams_common/db/sql/insert_lams_users.sql

(-48, +124)

| History

| Source

| Diff

· /lams_common/db/sql/insert_types_data.sql

(-235, +259)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

(-17, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190126.sql

(-15, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190201.sql

(-17, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190226.sql

(-16, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190313.sql

(-23, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190520.sql

(-15, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190721.sql

(-17, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

(-848, +0)

| History

| Source

| Diff

… 140 more files in changeset.

lams-github (v4.7): LDEV-5250 Remove Pedagogical Planner integration with core LAMS

Marcin Cieslak — Sun, 17 Oct 2021 16:53:46 +0200

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

LDEV-5250 Remove Pedagogical Planner integration with core LAMS

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

(-12, +0)

| History

| Source

| Diff

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

(-11, +0)

| History

| Source

| Diff

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

(-17, +0)

| History

| Source

| Diff

· /lams_central/web/loadVars.jsp

(-3, +0)

| History

| Source

| Diff

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

(-1, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20211017.sql

(-0, +19)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java

(-19, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java

(-14, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/PlannerActivityMetadataDTO.java

(-118, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java

(-11, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.java

(-145, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerActivitySpringForm.java

(-110, +0)

| History

| Source

| Diff

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

(-11, +0)

| History

| Source

| Diff

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

(-15, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java

(-14, +0)

| History

| Source

| Diff

… 53 more files in changeset.

lams-github (v4.7): LDEV-4411 Stop using collection cache for now...

Marcin Cieslak — Thu, 07 Oct 2021 10:44:18 +0200

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

LDEV-4411 Stop using collection cache for now

Cache annotations were commented out so we can come back to them easily

in the future.

Collection cache is not detecting changes made to entities. When a new

entity is added, collection cache does not see the change.

Properly tweaking concurrency strategy does not seem possible at the

moment, so we just turn it off.

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java

(-2, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java

(-5, +5)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java

(-4, +4)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java

(-3, +3)

| History

| Source

| Diff

· /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Forum.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java

(-1, +1)

| History

| Source

| Diff

… 15 more files in changeset.

lams-github (v4.7): LDEV-5248, LDEV-4411 Mark some collections as cacheable...

Marcin Cieslak — Mon, 27 Sep 2021 09:45:31 +0200

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

LDEV-5248, LDEV-4411 Mark some collections as cacheable

Similar to query cache, the collection cache makes sense if the table

which collection elements map to do not change often. Each modification

to table content invalidates the given collection cache.

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java

(-2, +5)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java

(-2, +5)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java

(-1, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java

(-0, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java

(-3, +6)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java

(-1, +4)

| History

| Source

| Diff

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

(-0, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java

(-4, +10)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java

(-1, +2)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/model/AssessmentQuestionResult.java

(-4, +0)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java

(-4, +0)

| History

| Source

| Diff

· /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java

(-8, +9)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java

(-1, +4)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Forum.java

(-4, +7)

| History

| Source

| Diff

· /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java

(-0, +3)

| History

| Source

| Diff

… 17 more files in changeset.

lams-github (v4.7): LDEV-5248, LDEV-4411 Mark some queries as cacheable...

Marcin Cieslak — Fri, 24 Sep 2021 09:50:15 +0200

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

LDEV-5248, LDEV-4411 Mark some queries as cacheable

Query cache makes sense if tables which the query reference does not

change often. Each modification to table content invalidates the given

query's cache. Also each set of query parameters is a different cache

entry, so if there are various parameter values the cache overhead can

generate more load than benefit.

· /lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java

(-0, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java

(-17, +23)

| History

| Source

| Diff

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

(-10, +9)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java

(-1, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java

(-1, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java

(-5, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java

(-14, +7)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/.../learningdesign/dao/hibernate/BranchActivityEntryDAO.java

(-5, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java

(-13, +14)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java

(-2, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java

(-2, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java

(-1, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java

(-4, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java

(-9, +11)

| History

| Source

| Diff

… 82 more files in changeset.

lams-github (v4.7): LDEV-5209 Allow seeing other leaders' answers in Q&A

Marcin Cieslak — Mon, 24 May 2021 18:38:10 +0200

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

LDEV-5209 Allow seeing other leaders' answers in Q&A

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java	(-18, +38)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java	(-3, +10)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/authoring/AdvancedContent.jsp	(-15, +1)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/learning/LearnerRep.jsp	(-2, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5138 In Q&A do not check for leader if leader selection is not set

Marcin Cieslak — Mon, 12 Apr 2021 12:28:56 +0200

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

LDEV-5138 In Q&A do not check for leader if leader selection is not set

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

(-13, +15)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5138 If leader entered activity, any learner can set him as leader

Marcin Cieslak — Wed, 24 Mar 2021 18:23:32 +0100

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

LDEV-5138 If leader entered activity, any learner can set him as leader

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-1, +6)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(-2, +6)	\| History	\| Source	\| Diff
· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(-2, +6)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(-2, +6)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(-2, +9)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-2, +6)	\| History	\| Source	\| Diff
· /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java	(-2, +6)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4884 Generate new UUID for new QB question version...

Marcin Cieslak — Wed, 17 Feb 2021 22:27:40 +0100

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

LDEV-4884 Generate new UUID for new QB question version

UUID has to identify uniquely an exact version, not only the question in

general.

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(-0, +3)	\| History	\| Source	\| Diff
· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java	(-0, +3)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/AuthoringController.java	(-0, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5143 Allow promoting to leader a learner who did not reach activity

Marcin Cieslak — Fri, 29 Jan 2021 21:11:05 +0100

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

LDEV-5143 Allow promoting to leader a learner who did not reach activity

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

(-8, +18)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java

(-0, +12)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/monitoring/summary.jsp

(-2, +2)

| History

| Source

| Diff

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

(-2, +14)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/.../tool/dokumaran/web/controller/MonitoringController.java

(-0, +12)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

(-6, +15)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java

(-5, +0)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java

(-0, +15)

| History

| Source

| Diff

· /lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

(-2, +2)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

· /lams_tool_leader/src/java/org/.../leaderselection/web/controller/MonitoringController.java

(-3, +10)

| History

| Source

| Diff

· /lams_tool_leader/web/pages/monitoring/changeLeaderDialog.jsp

(-0, +5)

| History

| Source

| Diff

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

(-7, +17)

| History

| Source

| Diff

· /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java

(-0, +15)

| History

| Source

| Diff

… 7 more files in changeset.

lams-github (v4.7): LDEV-5143 Do not allow changing Q&A leader after response was submitted

Marcin Cieslak — Thu, 28 Jan 2021 16:56:22 +0100

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

LDEV-5143 Do not allow changing Q&A leader after response was submitted

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(-0, +6)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java	(-1, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

Marcin Cieslak — Mon, 25 Jan 2021 11:28:58 +0100

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

LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

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

(-1, +6)

| 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

(-14, +19)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

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

(-0, +3)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GroupDTO.java

(-21, +20)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml

(-0, +2)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java

(-7, +4)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

(-0, +50)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java

(-1, +14)

| History

| Source

| Diff

· /lams_tool_laqa/web/learning/AnswersContent.jsp

(-0, +10)

| History

| Source

| Diff

· /lams_tool_laqa/web/learning/LearnerRep.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

(-0, +32)

| History

| Source

| Diff

· /lams_tool_laqa/web/monitoring/SummaryContent.jsp

(-1, +9)

| History

| Source

| Diff

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

(-0, +3)

| History

| Source

| Diff

… 19 more files in changeset.

lams-github (v4.7): LDEV-5138 Set leader only on his activity entry, not on any user entry

Marcin Cieslak — Sat, 19 Dec 2020 18:57:08 +0100

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

LDEV-5138 Set leader only on his activity entry, not on any user entry

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-12, +4)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-11, +3)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/.../tool/dokumaran/web/controller/LearningController.java

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-13, +3)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueUsr.java

(-4, +4)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

(-11, +3)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java

(-1, +2)

| History

| Source

| Diff

… 12 more files in changeset.

lams-github (v4.7): LDEV-5114 Add "Add as new version" button to Q&A

Marcin Cieslak — Wed, 18 Nov 2020 18:49:51 +0100

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

LDEV-5114 Add "Add as new version" button to Q&A

· /lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java	(-4, +11)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/authoring/newQuestionBox.jsp	(-3, +25)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5070 Remove a temporary workaround introduced in LDEV-4841

Marcin Cieslak — Mon, 31 Aug 2020 17:39:46 +0200

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

LDEV-5070 Remove a temporary workaround introduced in LDEV-4841

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java

(-2, +2)

| History

| Source

| Diff

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

Marcin Cieslak — Tue, 28 Jul 2020 09:09:33 +0200

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

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../lams/tool/assessment/assessmentApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_preview/src/java/org/.../peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java	(-2, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5057 Use UTF-8 as default encoding for message sources

Marcin Cieslak — Tue, 28 Jul 2020 09:04:47 +0200

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

LDEV-5057 Use UTF-8 as default encoding for message sources

· /lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

(-1, +3)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

· /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_images/src/java/org/.../lams/tool/imageGallery/imageGalleryApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

… 19 more files in changeset.

lams-github (v4.7): LDEV-5050 Control if question is required from Q&A authoring

Marcin Cieslak — Fri, 10 Jul 2020 17:26:41 +0200

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

LDEV-5050 Control if question is required from Q&A authoring

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java	(-0, +15)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/authoring/BasicContent.jsp	(-0, +21)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/authoring/itemlist.jsp	(-0, +7)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/authoring/newQuestionBox.jsp	(-6, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4847 Fix importing QB question with existing UUID

Marcin Cieslak — Fri, 10 Jul 2020 16:45:26 +0200

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

LDEV-4847 Fix importing QB question with existing UUID

· /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	(-2, +17)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(-6, +10)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-0, +2)	\| History	\| Source	\| Diff

Fisheye on lams-github/lams_tool_laqa/src

lams-github (v4.8): LDEV-5446 Ensure that UUIDs are unique but retained on import

lams-github (v4.8): LDEV-5442 switch learning to the new star rating widget

lams-github (v4.8): LDEV-5436 Project-wide user sorting by last then first name

lams-github (v4.8): Merge branch 'LDEV-5397' into v4.8...

lams-github (v4.8): LDEV-5425 Remove "End of activity" notebook from *all* tools

lams-github (v4.7): LDEV-5433 Squash DB patches and update versions

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

lams-github (v4.8): LDEV-5397 bootstrap5 Voting

lams-github (v4.8): LDEV-5397 migrate defineLater tag and jsps to bootstrap 5

lams-github (v4.8): LDEV-5397 Improvements and fixes to Submit Files and Q&A tools

lams-github (v4.7): LDEV-5398 Allow adding QB collections on the fly in other parts of authoring

lams-github (v4.7): LDEV-5328 Squash DB patches and update versions

lams-github (v4.7): LDEV-5250 Remove Pedagogical Planner integration with core LAMS

lams-github (v4.7): LDEV-4411 Stop using collection cache for now...

lams-github (v4.7): LDEV-5248, LDEV-4411 Mark some collections as cacheable...

lams-github (v4.7): LDEV-5248, LDEV-4411 Mark some queries as cacheable...

lams-github (v4.7): LDEV-5209 Allow seeing other leaders' answers in Q&A

lams-github (v4.7): LDEV-5138 In Q&A do not check for leader if leader selection is not set

lams-github (v4.7): LDEV-5138 If leader entered activity, any learner can set him as leader

lams-github (v4.7): LDEV-4884 Generate new UUID for new QB question version...

lams-github (v4.7): LDEV-5143 Allow promoting to leader a learner who did not reach activity

lams-github (v4.7): LDEV-5143 Do not allow changing Q&A leader after response was submitted

lams-github (v4.7): LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

lams-github (v4.7): LDEV-5138 Set leader only on his activity entry, not on any user entry

lams-github (v4.7): LDEV-5114 Add "Add as new version" button to Q&A

lams-github (v4.7): LDEV-5070 Remove a temporary workaround introduced in LDEV-4841

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

lams-github (v4.7): LDEV-5057 Use UTF-8 as default encoding for message sources

lams-github (v4.7): LDEV-5050 Control if question is required from Q&A authoring

lams-github (v4.7): LDEV-4847 Fix importing QB question with existing UUID

lams-github (v4.8): LDEV-5425 Remove "End of activity" notebook from all tools