Fisheye on lams-github/lams_central/web/main.jsp

lams-github (v4.8): LDEV-5436 Add comma in username in profile button

Marcin Cieslak — Thu, 14 Mar 2024 11:04:59 +0100

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

LDEV-5436 Add comma in username in profile button

· /lams_central/web/main.jsp

(-1, +1)

| History

| Source

| Diff

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 adjust growlUI message on login

Ernie Ghiglione — Mon, 01 Jan 2024 18:57:02 +0100

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

LDEV-5397 adjust growlUI message on login

· /lams_central/web/main.jsp

(-2, +2)

| History

| Source

| Diff

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

Marcin Cieslak — Tue, 26 Sep 2023 11:31:04 +0200

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

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

# Conflicts:

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

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

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

# lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp

· /lams_central/conf/language/lams/ApplicationResources.properties	(-10, +25)	\| History	\| Source	\| Diff
· /lams_central/web/css/components.css	(-1, +22)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-31, +30)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-60, +45)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-169, +93)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(-27, +18)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-277, +275)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(-18, +19)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(-19, +20)	\| History	\| Source	\| Diff

lams-github (v4.7): SP-9 Add learner view

Marcin Cieslak — Thu, 10 Aug 2023 12:46:10 +0200

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

SP-9 Add learner view

· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(-4, +2)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java	(-14, +16)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/openUrls.js	(-1, +5)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-2, +10)	\| 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): Merge remote-tracking branch 'origin/v4.6' into v4.7

Marcin Cieslak — Fri, 06 Jan 2023 18:20:25 +0100

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

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

· /lams_admin/conf/language/lams/ApplicationResources.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources.properties	(-0, +3)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(-39, +36)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java	(-1, +2)	\| History	\| Source	\| Diff
· /lams_central/web/css/_main_base.scss	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-0, +20)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-1, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java	(-31, +37)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5354 Show growl-like message on course URL copy to clipboard

Marcin Cieslak — Fri, 06 Jan 2023 15:32:17 +0100

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

LDEV-5354 Show growl-like message on course URL copy to clipboard

· /lams_central/web/group.jsp	(-3, +0)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-4, +15)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-2, +4)	\| 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): Merge remote-tracking branch 'origin/LDEV-5302' into v4.7...

Marcin Cieslak — Wed, 21 Sep 2022 10:57:12 +0200

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

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java

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

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

lams_admin/web/user.jsp

lams_central/conf/language/lams/ApplicationResources_zh_CN.properties

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

lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

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

(-21, +24)

| History

| Source

| Diff

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

(-21, +21)

| History

| Source

| Diff

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

(-21, +21)

| History

| Source

| Diff

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

(-21, +21)

| History

| Source

| Diff

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

(-21, +21)

| History

| Source

| Diff

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

(-7, +9)

| History

| Source

| Diff

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

(-21, +29)

| History

| Source

| Diff

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

(-1, +35)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +38)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/import/importexcel.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/organisation/list.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/user.jsp

(-17, +18)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 44 more files in changeset.

lams-github (v4.7): LDEV-5083 Load latest version of LAMS JS scripts on main page

Marcin Cieslak — Thu, 15 Sep 2022 20:34:28 +0200

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

LDEV-5083 Load latest version of LAMS JS scripts on main page

· /lams_central/web/main.jsp

(-4, +4)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5302 Rename sysadmin role to appadmin

Marcin Cieslak — Mon, 21 Mar 2022 10:09:14 +0100

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

LDEV-5302 Rename sysadmin role to appadmin

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

(-21, +21)

| History

| Source

| Diff

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

(-9, +9)

| History

| Source

| Diff

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

(-11, +11)

| History

| Source

| Diff

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

(-12, +12)

| History

| Source

| Diff

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

(-21, +21)

| History

| Source

| Diff

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

(-21, +21)

| History

| Source

| Diff

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

(-21, +21)

| History

| Source

| Diff

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

(-12, +12)

| History

| Source

| Diff

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

(-12, +12)

| History

| Source

| Diff

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

(-12, +12)

| History

| Source

| Diff

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

(-12, +12)

| History

| Source

| Diff

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

(-12, +12)

| History

| Source

| Diff

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

(-11, +11)

| History

| Source

| Diff

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

(-11, +11)

| History

| Source

| Diff

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

(-21, +21)

| History

| Source

| Diff

… 167 more files in changeset.

lams-github (v4.7): LDEV-5258 Retrieve correct time zone offset

Marcin Cieslak — Sat, 20 Nov 2021 14:37:11 +0100

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

LDEV-5258 Retrieve correct time zone offset

· /lams_central/web/main.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(-1, +9)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5213 Replace volatile JS imports with their non-cached version

Marcin Cieslak — Tue, 22 Jun 2021 14:37:01 +0200

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

LDEV-5213 Replace volatile JS imports with their non-cached version

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

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/policies/policies.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/toolcontent/toolcontentlist.jsp

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/authoring.jsp

(-7, +7)

| History

| Source

| Diff

· /lams_central/web/lti/addLesson.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/orgGroup.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/orgGrouping.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/outcome/outcomeEdit.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/outcome/outcomeManage.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/outcome/scaleEdit.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/outcome/scaleManage.jsp

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookCourseMonitor.jsp

(-1, +1)

| History

| Source

| Diff

… 79 more files in changeset.

lams-github (v4.7): LDEV-5103 Change Question Bank icon on index page for consistency

Marcin Cieslak — Thu, 05 Nov 2020 11:13:43 +0100

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

LDEV-5103 Change Question Bank icon on index page for consistency

· /lams_central/web/main.jsp

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4886 Automated tests for v4.0

Fri, 05 Jun 2020 13:29:04 +0200

Fiona Malikoff committed 05c00f9 on branch v4.7, v4.8 in lams-github

LDEV-4886 Automated tests for v4.0

· /lams_admin/web/userlist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/usersearchlist.jsp

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-20, +32)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-3, +5)

| History

| Source

| Diff

· /lams_central/web/passwordChangeContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/passwordChangeOkContent.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/profile/editprofile.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/profile/portrait.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/profile/profile.jsp

(-5, +5)

| History

| Source

| Diff

· /lams_central/web/questions/questionChoice.jsp

(-1, +2)

| History

| Source

| Diff

· /lams_central/web/questions/questionFile.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/gate/gateDescription.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/gate/gateInfo.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/gate/gateStatus.jsp

(-1, +1)

| History

| Source

| Diff

… 5 more files in changeset.

lams-github (): LDEV-4995 Increase lesson name font-size...

Andrey Balan — Tue, 14 Apr 2020 18:03:24 +0200

Andrey Balan committed da4e557 on branch in lams-github

LDEV-4995 Increase lesson name font-size

Also move CSS rules to .css file.

· /lams_central/web/css/_main_base.scss	(-0, +214)	\| History	\| Source	\| Diff
· /lams_central/web/css/defaultHTML_main.scss	(-2, +1)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-216, +0)	\| History	\| Source	\| Diff

lams-github (): LDEV-4995 Fix sticky footer

Andrey Balan — Tue, 07 Apr 2020 11:29:11 +0200

Andrey Balan committed 5c7818c on branch in lams-github

LDEV-4995 Fix sticky footer

· /lams_central/web/css/_main_base.scss	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (): LDEV-4995 Improve index page...

Andrey Balan — Tue, 07 Apr 2020 03:24:58 +0200

Andrey Balan committed 6e03312 on branch in lams-github

LDEV-4995 Improve index page

* Add paging

* Sticky footer

* Cosmetic CSS improvements

· /lams_central/web/css/_main_base.scss	(-26, +12)	\| History	\| Source	\| Diff
· /lams_central/web/css/defaultHTML_main.scss	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-3, +174)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-194, +29)	\| History	\| Source	\| Diff

lams-github (): LDEV-4995 Introduce "fa-spin" icon back

Andrey Balan — Sat, 04 Apr 2020 03:02:06 +0200

Andrey Balan committed 3c6cdee on branch in lams-github

LDEV-4995 Introduce "fa-spin" icon back

· /lams_central/web/includes/javascript/main.js	(-6, +2)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-5, +1)	\| History	\| Source	\| Diff

lams-github (): LDEV-4995 Improvements to the index page...

Andrey Balan — Sat, 04 Apr 2020 02:28:33 +0200

Andrey Balan committed f9b8348 on branch in lams-github

LDEV-4995 Improvements to the index page

* Make vertical scroller work properly even for orgs with lengthy names

* Vertically align fa-chevron-circle icon

* Remove "fa-spin". fadeOut, fadeIn the page instead

· /lams_central/web/css/_main_base.scss	(-2, +6)	\| History	\| Source	\| Diff
· /lams_central/web/css/defaultHTML_main.scss	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/jquery.slimscroll.js	(-208, +865)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-30, +29)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-2, +5)	\| History	\| Source	\| Diff

lams-github (): LDEV-4995 Improvements to the index page...

Andrey Balan — Fri, 03 Apr 2020 03:42:03 +0200

Andrey Balan committed 81a68a7 on branch in lams-github

LDEV-4995 Improvements to the index page

* Fix offcanvas bar search and organisation tablesorter markup in case

of big amount of available organisations

* Optimise DB queries

* Introduce hasContributeActivities Lesson's flag

* Show "fa-spin" when loading an organisation

· /lams_central/conf/scss/_lams_variables.scss

(-2, +2)

| History

| Source

| Diff

· /lams_central/conf/scss/_lams_variables_purple.scss

(-1, +1)

| History

| Source

| Diff

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

(-43, +11)

| History

| Source

| Diff

· /lams_central/web/css/_main_base.scss

(-14, +15)

| History

| Source

| Diff

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

(-1, +9)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-3, +2)

| History

| Source

| Diff

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

(-1, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/index/IndexLessonBean.java

(-3, +13)

| History

| Source

| Diff

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

(-3, +18)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java

(-0, +11)

| History

| Source

| Diff

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

(-2, +10)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java

(-0, +10)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java

(-2, +9)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java

(-2, +0)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

… 5 more files in changeset.

lams-github (): LDEV-4995 Improvements to the index page...

Andrey Balan — Tue, 31 Mar 2020 02:34:51 +0200

Andrey Balan committed 9c400fc on branch in lams-github

LDEV-4995 Improvements to the index page

* Fix favorite organisations markup

* Fix cards height

* Email notifications buttons moved under "Three dots" menu

* Hide reorder buttons for any order other than "Default" one

* Reintroduce chart labels

· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/css/_main_base.scss	(-6, +9)	\| History	\| Source	\| Diff
· /lams_central/web/favoriteOrganisations.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_central/web/groupContents.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-3, +3)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-39, +20)	\| History	\| Source	\| Diff

lams-github (): LDEV-4995 Hide charts on a smaller devices in a list view mode

Andrey Balan — Fri, 27 Mar 2020 22:15:19 +0100

Andrey Balan committed 614e3f4 on branch in lams-github

LDEV-4995 Hide charts on a smaller devices in a list view mode

· /lams_central/web/main.jsp

(-0, +4)

| History

| Source

| Diff

lams-github (): LDEV-4995 Keep datatable buttons on one line even for smaller devices

Andrey Balan — Fri, 27 Mar 2020 16:37:37 +0100

Andrey Balan committed 088e35d on branch in lams-github

LDEV-4995 Keep datatable buttons on one line even for smaller devices

· /lams_central/web/main.jsp

(-7, +2)

| History

| Source

| Diff

lams-github (): LDEV-4995 Further development of index page

Andrey Balan — Fri, 27 Mar 2020 03:43:18 +0100

Andrey Balan committed 71efef7 on branch in lams-github

LDEV-4995 Further development of index page

· /lams_central/conf/scss/_lams_variables.scss	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/css/_main_base.scss	(-18, +10)	\| History	\| Source	\| Diff
· /lams_central/web/css/defaultHTML_main.scss	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/css/images/trianglify_1.png	(binary)	\| History	\| Source
· /lams_central/web/css/images/trianglify_10.png	(binary)	\| History	\| Source
· /lams_central/web/css/images/trianglify_2.png	(binary)	\| History	\| Source
· /lams_central/web/css/images/trianglify_3.png	(binary)	\| History	\| Source
· /lams_central/web/css/images/trianglify_4.png	(binary)	\| History	\| Source
· /lams_central/web/css/images/trianglify_5.png	(binary)	\| History	\| Source
· /lams_central/web/css/images/trianglify_6.png	(binary)	\| History	\| Source
· /lams_central/web/css/images/trianglify_7.png	(binary)	\| History	\| Source
· /lams_central/web/css/images/trianglify_8.png	(binary)	\| History	\| Source
· /lams_central/web/css/images/trianglify_9.png	(binary)	\| History	\| Source
· /lams_central/web/group.jsp	(-6, +4)	\| History	\| Source	\| Diff
· /lams_central/web/groupContents.jsp	(-51, +63)	\| History	\| Source	\| Diff
· /lams_central/web/groupHeader.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-94, +161)	\| History	\| Source	\| Diff

lams-github (): LDEV-4995 Move reordering icons to the end of the line

Andrey Balan — Sat, 21 Mar 2020 13:47:38 +0100

Andrey Balan committed 11f1660 on branch in lams-github

LDEV-4995 Move reordering icons to the end of the line

· /lams_central/web/groupContents.jsp	(-5, +6)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-6, +8)	\| History	\| Source	\| Diff

lams-github (): LDEV-4995 Show exclamation sign button properly

Andrey Balan — Sat, 21 Mar 2020 03:22:11 +0100

Andrey Balan committed fdc0dab on branch in lams-github

LDEV-4995 Show exclamation sign button properly

· /lams_central/web/groupContents.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-1, +0)	\| 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): Merge branch 'master' into v4.0...

Andrey Balan — Thu, 09 Jan 2020 08:59:33 +0100

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

Merge branch 'master' into v4.0

# Conflicts:

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

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

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

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

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

(-2, +3)

| History

| Source

| Diff

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

(-2, +3)

| History

| Source

| Diff

· /lams_admin/web/user.jsp

(-16, +21)

| History

| Source

| Diff

· /lams_admin/web/userChangePass.jsp

(-1, +2)

| History

| Source

| Diff

· /lams_build/build.xml

(-1, +9)

| History

| Source

| Diff

· /lams_build/conf/j2ee/jboss-deployment-structure.xml

(-0, +1)

| History

| Source

| Diff

· /lams_build/liblist.txt

(-0, +3)

| History

| Source

| Diff

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

(-0, +237)

| History

| Source

· /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

(-5, +6)

| History

| Source

| Diff

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

(-2, +3)

| History

| Source

| Diff

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

(-1, +35)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-7, +4)

| History

| Source

| Diff

· /lams_central/web/authoring/authoring.jsp

(-9, +6)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/assessmcq.jsp

(-5, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/assessment.jsp

(-3, +1)

| History

| Source

| Diff

… 80 more files in changeset.