Fisheye on lams-github/lams_learning/web/grouping

lams-github (v4.8): LDEV-5397 Redesign page with group results to make it similar to the page where learner chooses a group

Andrey Balan — Tue, 19 Mar 2024 00:10:01 +0100

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

LDEV-5397 Redesign page with group results to make it similar to the page where learner chooses a group

· /lams_learning/web/grouping/show.jsp

(-35, +30)

| History

| Source

| Diff

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

Marcin Cieslak — Thu, 29 Feb 2024 12:32:58 +0100

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

Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

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

(-1, +1)

| History

| Source

| Diff

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

(-8, +7)

| History

| Source

| Diff

· /lams_learning/web/grouping/choose.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-2, +2)

| History

| Source

| Diff

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

(-9, +2)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/gate/gateStatus.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/includes/javascript/monitorLesson.js

(-2, +2)

| History

| Source

| Diff

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

(-12, +9)

| History

| Source

| Diff

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

(-4, +3)

| History

| Source

| Diff

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

(-5, +5)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-2, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 20 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): LDEV-5397 make rule more spicific otherwise it affects change portrait dialog

Andrey Balan — Mon, 08 Jan 2024 21:59:34 +0100

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

LDEV-5397 make rule more spicific otherwise it affects change portrait dialog

· /lams_learning/web/grouping/choose.jsp

(-1, +1)

| History

| Source

| Diff

lams-github (v4.8): LDEV-5397 Enhanced mobile experience

Ernie Ghiglione — Sun, 07 Jan 2024 21:32:55 +0100

Ernie Ghiglione committed 21aea11 on branch v4.8 in lams-github

LDEV-5397 Enhanced mobile experience

· /lams_central/web/css/components.scss	(-0, +17)	\| History	\| Source	\| Diff
· /lams_central/web/images/css/check.png	(binary)	\| History	\| Source
· /lams_learning/web/css/components-learner.scss	(-7, +57)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/includes/css/assessment.scss	(-2, +14)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/learning.jsp	(-8, +10)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results.jsp	(-3, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(-3, +21)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/learning.jsp	(-4, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/results.jsp	(-0, +10)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/scratchies.jsp	(-3, +3)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 button not spelled properly

Ernie Ghiglione — Wed, 20 Dec 2023 16:02:14 +0100

Ernie Ghiglione committed a377aa4 on branch v4.8 in lams-github

LDEV-5397 button not spelled properly

· /lams_learning/web/grouping/show.jsp

(-3, +3)

| History

| Source

| Diff

lams-github (v4.8): LDEV-5397 remove .table-responsive as it creates horizaontal scrollbar in certain cases on FF

Andrey Balan — Wed, 20 Dec 2023 01:39:38 +0100

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

LDEV-5397 remove .table-responsive as it creates horizaontal scrollbar in certain cases on FF

· /lams_learning/web/discussion/learner.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-48, +46)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-28, +26)	\| History	\| Source	\| Diff
· /lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(-3, +1)	\| History	\| Source	\| Diff
· /lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_lamc/web/learning/ViewAnswers.jsp	(-34, +31)	\| History	\| Source	\| Diff
· /lams_tool_preview/web/pages/learning/hedging.jsp	(-6, +3)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 make sure all buttons have proper "type" attribute

Andrey Balan — Wed, 20 Dec 2023 01:24:02 +0100

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

LDEV-5397 make sure all buttons have proper "type" attribute

· /lams_learning/web/grouping/choose.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/grouping/wait.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/optionsActivity.jsp

(-1, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_tool_mindmap/web/pages/learning/singleMindmap.jsp

(-1, +3)

| History

| Source

| Diff

· /lams_tool_nb/web/learnerContent.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_tool_preview/web/pages/learning/rubrics.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_preview/web/pages/learning/rubricsPivot.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_sbmt/web/learner/sbmtlearner.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_tool_scratchie/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

… 10 more files in changeset.

lams-github (v4.8): LDEV-5397 Improve offcanvas progress bar + various other fixes as mentioned in the JIRA's comment...

Andrey Balan — Fri, 15 Dec 2023 17:20:14 +0100

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

LDEV-5397 Improve offcanvas progress bar + various other fixes as mentioned in the JIRA's comment

* Improved offcanvas progress bar:

icon for not completed activity should a hollow square, not a full one;

gate icons: hourglass icons replaced with locks;

support for long activity names;

tooltips on icon hover explaining what it means, for example “current activity”;

improved CSS

* Teams table should have maximum width and/or highlight on hover

* “Burning questions” button should have standard size (not small) and have the same primary colour as “Justification” button

* In burning questions summary the title does not have sufficient contrast

* In Chat the font should have standard and not reduced size

* In Daco there is an empty alert

* In Task List (and Share Resources) button to complete an item should say something like “Mark as completed” or “Complete” instead of “Completed”

* Admin pages: restored background colour to ghostly white

· /lams_admin/web/css/admin.scss	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/tags/PageLearner.tag	(-4, +13)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/tags/Rating5.tag	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/web/css/bootstrap5.custom.scss	(-0, +4)	\| History	\| Source	\| Diff
· /lams_learning/web/css/components-learner.scss	(-5, +17)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/learnerPage.js	(-25, +51)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_chat/web/includes/css/chat.scss	(-1, +0)	\| History	\| Source	\| Diff
· /lams_tool_daco/web/pages/learning/addRecord.jsp	(-14, +16)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/web/pages/learning/learning.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(-1, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/questionlist.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/scratchies.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_task/web/pages/learning/learning.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_task/web/pages/learning/parts/itemlist.jsp	(-1, +2)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 redesign "choose branch page". add modal confirmation dialog...

Andrey Balan — Wed, 13 Dec 2023 22:41:19 +0100

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

LDEV-5397 redesign "choose branch page". add modal confirmation dialog

* add onhover effect to choose group page

· /lams_learning/web/grouping/choose.jsp	(-27, +29)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-89, +116)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 standartize the way modal-dialogs look like

Andrey Balan — Wed, 13 Dec 2023 16:16:39 +0100

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

LDEV-5397 standartize the way modal-dialogs look like

· /lams_learning/web/grouping/choose.jsp	(-3, +6)	\| History	\| Source	\| Diff
· /lams_tool_leader/web/pages/learning/leaderselection.jsp	(-3, +3)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 bootstrap5 Grouping, Branching, Optional activities

Andrey Balan — Thu, 19 Oct 2023 22:25:05 +0200

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

LDEV-5397 bootstrap5 Grouping, Branching, Optional activities

· /lams_central/web/WEB-INF/tags/Alert5.tag	(-5, +11)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/tags/PageLearner.tag	(-1, +3)	\| History	\| Source	\| Diff
· /lams_central/web/css/components.scss	(-1, +11)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/BranchingActivityController.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tags/Alert5.tag	(-7, +17)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tags/PageLearner.tag	(-1, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/branching/preview.jsp	(-115, +91)	\| History	\| Source	\| Diff
· /lams_learning/web/branching/wait.jsp	(-31, +16)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-61, +63)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-62, +30)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-32, +25)	\| History	\| Source	\| Diff
· /lams_learning/web/lessonComplete.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-68, +56)	\| History	\| Source	\| Diff

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): LDEV-5219 Use versioned JS import for gate check JS file

Marcin Cieslak — Thu, 15 Jul 2021 18:21:06 +0200

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

LDEV-5219 Use versioned JS import for gate check JS file

· /lams_learning/web/grouping/show.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/optionsActivity.jsp

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_tool_chat/web/pages/learning/notebook.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_chat/web/pages/learning/parts/finishButton.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/learning/notebook.jsp

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/web/jsps/learning/notebook.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/web/jsps/learning/viewforum.jsp

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 41 more files in changeset.

lams-github (v4.7): LDEV-5219 Check gate after Grouping activity

Marcin Cieslak — Thu, 15 Jul 2021 18:08:59 +0200

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

LDEV-5219 Check gate after Grouping activity

· /lams_learning/web/grouping/show.jsp

(-2, +7)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4718 Fix plugin race condition by manually disabling buttons

Marcin Cieslak — Mon, 28 Sep 2020 20:35:41 +0200

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

LDEV-4718 Fix plugin race condition by manually disabling buttons

· /lams_learning/web/grouping/choose.jsp

(-3, +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-4874 Restrict displaying names for students that are not within student's group

Andrey Balan — Fri, 11 Oct 2019 19:43:54 +0200

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

LDEV-4874 Restrict displaying names for students that are not within student's group

· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(-0, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20191010.sql	(-0, +10)	\| History	\| Source
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java	(-14, +16)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(-101, +49)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-31, +28)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-45, +48)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-4, +2)	\| History	\| Source	\| Diff

lams-github (): LDEV-4759 DateTimePicker and Accordians updated

Thu, 14 Feb 2019 03:00:26 +0100

Fiona Malikoff committed a9f5e7f on branch in lams-github

LDEV-4759 DateTimePicker and Accordians updated

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

(-5, +5)

| History

| Source

| Diff

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

(-9, +9)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-8, +6)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-0, +14)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/disabledusers.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/groupStatistics.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/ldap.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/createOrEdit.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/policies/editPolicy.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/policies/policyTable.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/signupmanagement/add.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/signupmanagement/list.jsp

(-1, +1)

| History

| Source

| Diff

… 377 more files in changeset.

lams-github (): LDEV-4759 Panels are now cards.

Wed, 06 Feb 2019 04:04:33 +0100

Fiona Malikoff committed 70e6fe3 on branch in lams-github

LDEV-4759 Panels are now cards.

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

(-1, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-36, +18)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/ldap.jsp

(-11, +11)

| History

| Source

| Diff

· /lams_admin/web/orgPasswordChange.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/cloneStart.jsp

(-16, +16)

| History

| Source

| Diff

· /lams_admin/web/organisation/list.jsp

(-9, +9)

| History

| Source

| Diff

· /lams_admin/web/remove.jsp

(-8, +8)

| History

| Source

| Diff

· /lams_admin/web/statistics.jsp

(-8, +8)

| History

| Source

| Diff

· /lams_admin/web/sysadmin.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/themeManagement.jsp

(-4, +4)

| History

| Source

| Diff

· /lams_admin/web/toolcontent/toolcontentlist.jsp

(-1, +1)

| History

| Source

| Diff

… 492 more files in changeset.

lams-github (): LDEV-4759 Authoring and monitoring tabs working

Fri, 01 Feb 2019 03:38:51 +0100

Fiona Malikoff committed d432ad1 on branch in lams-github

LDEV-4759 Authoring and monitoring tabs working

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

(-2, +5)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-36, +27)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

· /lams_admin/web/css/admin.scss

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/userChangePass.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/usersearchlist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/conf/scss/_lams_variables.scss

(-4, +17)

| History

| Source

| Diff

· /lams_central/conf/scss/material-kit/_responsive.scss

(-1, +6)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

… 301 more files in changeset.

lams-github (v4.7): LDEV-4718 Block group confirm modal from closing when choice is made

Marcin Cieslak — Thu, 29 Nov 2018 20:20:35 +0100

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

LDEV-4718 Block group confirm modal from closing when choice is made

· /lams_learning/web/grouping/choose.jsp

(-4, +15)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

Fri, 21 Sep 2018 06:08:34 +0200

Fiona Malikoff committed 54007f9 on branch v4.7, v4.8 in lams-github

LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

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

(-9, +9)

| History

| Source

| Diff

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

(-4, +2)

| History

| Source

| Diff

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

(-13, +13)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-13, +5)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java

(-2, +2)

| History

| Source

| Diff

· /lams_learning/web/branching/preview.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_learning/web/branching/wait.jsp

(-5, +5)

| History

| Source

| Diff

· /lams_learning/web/gate/conditionGateContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/gate/gateDescription.jsp

(-4, +4)

| History

| Source

| Diff

· /lams_learning/web/gate/gateNext.jsp

(-7, +5)

| History

| Source

| Diff

· /lams_learning/web/gate/permissionGateContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/gate/scheduleGateContent.jsp

(-8, +8)

| History

| Source

| Diff

· /lams_learning/web/gate/synchGateContent.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_learning/web/grouping/choose.jsp

(-1, +1)

| History

| Source

| Diff

… 15 more files in changeset.

lams-github (v4.7): LDEV-4440 Portrait fix

Fri, 31 Aug 2018 11:13:21 +0200

MichalKowalski committed 0098ee9 on branch v4.7, v4.8 in lams-github

LDEV-4440 Portrait fix

· /lams_build/lib/lams/lams-central.jar	(binary)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams-learning.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(-32, +34)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/authoring/template/comms.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/openUrls.js	(-8, +8)	\| History	\| Source	\| Diff
· /lams_central/web/portrait.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Learning notebook

Wed, 22 Aug 2018 11:34:59 +0200

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

LDEV-4440 Learning notebook

· /lams_build/lib/lams/lams-gradebook.jar	(binary)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams-learning.jar	(binary)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/notebook/view.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/notebook/viewall.jsp	(-6, +9)	\| History	\| Source	\| Diff
· /lams_learning/web/notebook/viewalljournals.jsp	(-2, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Learning notebook

Tue, 21 Aug 2018 15:32:38 +0200

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

LDEV-4440 Learning notebook

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Grouping fixes

Tue, 21 Aug 2018 14:44:33 +0200

MichalKowalski committed 580d890 on branch v4.7, v4.8 in lams-github

LDEV-4440 Grouping fixes

· /lams_build/lib/lams/lams-gradebook.jar	(binary)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams-learning.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql	(-0, +59)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/.../gradebook/web/controller/GradebookMonitoringController.java	(-3, +2)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(-6, +7)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/groupWaitLayout.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/notebook/addnew.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/notebook/viewall.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Learning server start

Fri, 17 Aug 2018 12:26:22 +0200

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

LDEV-4440 Learning server start

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

(binary)

| History

| Source

| Diff

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

(binary)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/branching/preview.jsp

(-98, +118)

| History

| Source

| Diff

· /lams_learning/web/branching/wait.jsp

(-21, +38)

| History

| Source

| Diff

· /lams_learning/web/close.jsp

(-34, +54)

| History

| Source

| Diff

· /lams_learning/web/gate/conditionGateContent.jsp

(-22, +53)

| History

| Source

| Diff

· /lams_learning/web/gate/permissionGateContent.jsp

(-22, +54)

| History

| Source

| Diff

· /lams_learning/web/gate/scheduleGateContent.jsp

(-39, +71)

| History

| Source

| Diff

· /lams_learning/web/gate/synchGateContent.jsp

(-11, +40)

| History

| Source

| Diff

· /lams_learning/web/grouping/choose.jsp

(-82, +100)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-85, +105)

| History

| Source

| Diff

· /lams_learning/web/grouping/wait.jsp

(-27, +38)

| History

| Source

| Diff

· /lams_learning/web/lessonComplete.jsp

(-171, +190)

| History

| Source

| Diff

… 11 more files in changeset.

lams-github (v4.7): LDEV-4440 Learning

Thu, 16 Aug 2018 15:59:29 +0200

MichalKowalski committed 1f7150d on branch v4.7, v4.8 in lams-github

LDEV-4440 Learning

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

(-17, +15)

| History

| Source

| Diff

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

(-13, +11)

| History

| Source

| Diff

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

(-11, +13)

| History

| Source

| Diff

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

(-12, +11)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/web/controller/DisplayOptionsActivityController.java

(-17, +13)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/web/controller/DisplayParallelActivityController.java

(-14, +12)

| History

| Source

| Diff

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

(-11, +11)

| History

| Source

| Diff

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

(-19, +17)

| History

| Source

| Diff

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

(-28, +20)

| History

| Source

| Diff

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

(-454, +0)

| History

| Source

| Diff

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

(-0, +480)

| History

| Source

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

(-97, +0)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/web/controller/LessonCompleteActivityController.java

(-0, +112)

| History

| Source

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

(-133, +0)

| History

| Source

| Diff

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

(-0, +143)

| History

| Source

… 41 more files in changeset.

lams-github (v4.7): LDEV-4507 Use DTOs instead of entities as page attributes...

Marcin Cieslak — Tue, 06 Feb 2018 15:55:30 +0100

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

LDEV-4507 Use DTOs instead of entities as page attributes

It seems that using entities as page attributes outside a transaction

causes undesired effect. Portrait tag fetches data from DB and existing

entities, including group participants, get flushed from session. It

overwrites changes made by learners being added to a group.

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java	(-0, +17)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserBasicDTO.java	(-0, +68)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(-15, +9)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-7, +7)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-3, +3)	\| History	\| Source	\| Diff