Fisheye on lams-github/lams_admin/web/user.jsp

lams-github (v4.8): LDEV-5397 switch to Bootstrap Validation CSS classes

Andrey Balan — Tue, 09 Jan 2024 20:00:19 +0100

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

LDEV-5397 switch to Bootstrap Validation CSS classes

· /lams_admin/web/integration/ltiConsumer.jsp	(-1, +2)	\| History	\| Source	\| Diff
· /lams_admin/web/integration/servermaintain.jsp	(-2, +3)	\| History	\| Source	\| Diff
· /lams_admin/web/orgPasswordChange.jsp	(-15, +4)	\| History	\| Source	\| Diff
· /lams_admin/web/policies/editPolicy.jsp	(-6, +18)	\| History	\| Source	\| Diff
· /lams_admin/web/user.jsp	(-20, +31)	\| History	\| Source	\| Diff
· /lams_admin/web/userChangePass.jsp	(-44, +38)	\| History	\| Source	\| Diff
· /lams_central/web/profile/editprofile.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/web/pages/learning/addfile.jsp	(-4, +3)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/web/pages/learning/addurl.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams-github (v4.8): Merge remote-tracking branch 'origin/v4.7' into LDEV-5397...

Marcin Cieslak — Mon, 18 Dec 2023 08:15:56 +0100

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

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

# Conflicts:

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

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

# lams_admin/web/timezoneManagement.jsp

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

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

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

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

# lams_tool_larsrc/conf/language/lams/ApplicationResources_de_DE.properties

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

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

# lams_tool_preview/conf/language/lams/ApplicationResources_de_DE.properties

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_survey/conf/language/lams/ApplicationResources_de_DE.properties

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

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

· /lams_admin/web/config/editconfig.jsp	(-1, +11)	\| History	\| Source	\| Diff
· /lams_admin/web/integration/ltiConsumer.jsp	(-4, +2)	\| History	\| Source	\| Diff
· /lams_admin/web/user.jsp	(-4, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/css/components-monitoring.css	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_doku/conf/language/lams/ApplicationResources.properties	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_mindmap/conf/language/lams/ApplicationResources.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/learning.jsp	(-18, +20)	\| History	\| Source	\| Diff
· /lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5426 Switch from custom time zones to built-in Java ones

Marcin Cieslak — Fri, 15 Dec 2023 12:05:34 +0100

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

LDEV-5426 Switch from custom time zones to built-in Java ones

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-3, +0)

| History

| Source

| Diff

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

(-27, +3)

| History

| Source

| Diff

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

(-6, +4)

| History

| Source

| Diff

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

(-8, +14)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/LtiConsumerManagementController.java

(-27, +9)

| History

| Source

| Diff

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

(-78, +0)

| History

| Source

| Diff

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

(-28, +10)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-1, +11)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumer.jsp

(-4, +2)

| History

| Source

| Diff

· /lams_admin/web/timezoneManagement.jsp

(-65, +0)

| History

| Source

| Diff

· /lams_admin/web/user.jsp

(-4, +2)

| History

| Source

| Diff

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

(-29, +9)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java

(-15, +12)

| History

| Source

| Diff

… 26 more files in changeset.

lams-github (v4.8): LDEV-5397 import bootstrap5.scss into components.scss...

Andrey Balan — Tue, 21 Nov 2023 21:44:59 +0100

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

LDEV-5397 import bootstrap5.scss into components.scss

* Subsequently import components.scss into components-learner.scss

* It will allow using bootstrap5 CSS rules in components CSS classes

· /lams_admin/web/appadmin.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/cleanup.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/cleanupPreviewLessons.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/disabledusers.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importGroups.jsp

(-4, +3)

| History

| Source

| Diff

· /lams_admin/web/import/importexcel.jsp

(-4, +3)

| History

| Source

| Diff

· /lams_admin/web/import/importresult.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/import/status.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumer.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumerList.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/serverlist.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/servermaintain.jsp

(-3, +1)

| History

| Source

| Diff

· /lams_admin/web/logevent.jsp

(-3, +2)

| History

| Source

| Diff

· /lams_admin/web/loginmaintain.jsp

(-2, +1)

| History

| Source

| Diff

… 35 more files in changeset.

lams-github (v4.7): LDEV-4078 Group manager should be able to save user details

Marcin Cieslak — Fri, 08 Sep 2023 11:22:44 +0200

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

LDEV-4078 Group manager should be able to save user details

· /lams_admin/web/user.jsp

(-4, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5388 Reintroduce user create date to their edit form

Marcin Cieslak — Mon, 01 May 2023 08:11:17 +0200

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

LDEV-5388 Reintroduce user create date to their edit form

· /lams_admin/web/user.jsp

(-486, +486)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5348 Adding padding left and right

Ernie Ghiglione — Sat, 31 Dec 2022 20:52:40 +0100

Ernie Ghiglione committed 4dfac2d on branch v4.7, v4.8 in lams-github

LDEV-5348 Adding padding left and right

· /lams_admin/web/appadmin.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/cleanup.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/cleanupPreviewLessons.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importGroups.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importexcel.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importresult.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/status.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumer.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumerList.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/serverlist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/servermaintain.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/logevent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/loginmaintain.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/policies/editPolicy.jsp

(-1, +1)

| History

| Source

| Diff

… 11 more files in changeset.

lams-github (v4.7): DEV-4078 Fix missing Change Password button

Marcin Cieslak — Fri, 30 Dec 2022 19:32:04 +0100

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

DEV-4078 Fix missing Change Password button

· /lams_admin/web/user.jsp

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5348 General UI improvements for admin

Ernie Ghiglione — Tue, 22 Nov 2022 02:50:59 +0100

Ernie Ghiglione committed 2edfce7 on branch v4.7, v4.8 in lams-github

LDEV-5348 General UI improvements for admin

· /lams_admin/web/appadmin.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/cleanup.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/cleanupPreviewLessons.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importGroups.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/import/importexcel.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/import/importresult.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/import/status.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumer.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumerList.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/serverlist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/servermaintain.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/logevent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/loginmaintain.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/policies/editPolicy.jsp

(-1, +1)

| History

| Source

| Diff

… 11 more files in changeset.

lams-github (v4.7): LDEV-5330 Merge changes made for tags

Marcin Cieslak — Thu, 29 Sep 2022 14:58:24 +0200

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

LDEV-5330 Merge changes made for tags

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

(-1, +1)

| History

| Source

| Diff

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

(-0, +43)

| History

| Source

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

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-1, +5)

| History

| Source

| Diff

· /lams_admin/web/cleanup.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/import/importexcel.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/orgPasswordChange.jsp

(-4, +4)

| History

| Source

| Diff

· /lams_admin/web/signupmanagement/list.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/user.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/userChangePass.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/usersearchlist.jsp

(-26, +29)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 191 more files in changeset.

lams-github (v4.7): LDEV-5330 Merge changes made for sysadmin...

Marcin Cieslak — Thu, 29 Sep 2022 13:52:04 +0200

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

LDEV-5330 Merge changes made for sysadmin

It included upgrading to Bootstrap 5 and using UI guidelines set for

Monitoring UI.

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

(-3, +3)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-0, +3)

| History

| Source

| Diff

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

(-0, +4)

| History

| Source

| Diff

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

(-0, +2)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserListDTO.java

(-0, +9)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserOrgForm.java

(-0, +10)

| History

| Source

| Diff

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

(-0, +534)

| History

| Source

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

(-0, +53)

| History

| Source

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

(-0, +105)

| History

| Source

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

(-2, +14)

| History

| Source

| Diff

· /lams_admin/web/appadmin.jsp

(-26, +37)

| History

| Source

| Diff

· /lams_admin/web/cleanup.jsp

(-84, +80)

| History

| Source

| Diff

· /lams_admin/web/cleanupPreviewLessons.jsp

(-10, +15)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-56, +73)

| History

| Source

| Diff

… 177 more files in changeset.

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-4078 Group manager should be able to save user details

Marcin Cieslak — Mon, 13 Jun 2022 14:40:48 +0200

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

LDEV-4078 Group manager should be able to save user details

· /lams_admin/web/user.jsp

(-14, +12)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5303 Increase max length for passwords...

Ernie Ghiglione — Tue, 29 Mar 2022 16:23:13 +0200

Ernie Ghiglione committed 5450d5a on branch v4.7, v4.8 in lams-github

LDEV-5303 Increase max length for passwords

Increase max length for passwords to 50 characters

· /lams_admin/web/orgPasswordChange.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_admin/web/user.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_admin/web/userChangePass.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_central/web/passwordChangeContent.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_central/web/signup/singupTab.jsp	(-3, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5302 Appadmins need to have 2FA on...

Marcin Cieslak — Thu, 24 Mar 2022 17:49:43 +0100

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

LDEV-5302 Appadmins need to have 2FA on

Only sysadmin can turn off 2FA to appadmins

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(-6, +17)	\| History	\| Source	\| Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(-13, +35)	\| History	\| Source	\| Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java	(-3, +13)	\| History	\| Source	\| Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(-1, +7)	\| History	\| Source	\| Diff
· /lams_admin/web/user.jsp	(-1, +1)	\| 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-4078 Only sysadmin can change other users' passwords

Marcin Cieslak — Sun, 17 Oct 2021 11:35:24 +0200

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

LDEV-4078 Only sysadmin can change other users' passwords

· /lams_admin/web/user.jsp

(-12, +14)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4440 Reintroduce history-aware Cancel button on Edit User form

Marcin Cieslak — Mon, 11 Oct 2021 17:28:02 +0200

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

LDEV-4440 Reintroduce history-aware Cancel button on Edit User form

· /lams_admin/web/user.jsp

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5178 Check for common and breached passwords

Marcin Cieslak — Tue, 16 Feb 2021 14:00:47 +0100

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

LDEV-5178 Check for common and breached passwords

· /3rdParty_sources/passpol/com/codahale/passpol/BreachDatabase.java

(-0, +115)

| History

| Source

· /3rdParty_sources/passpol/com/codahale/passpol/HaveIBeenPwned.java

(-0, +77)

| History

| Source

· /3rdParty_sources/passpol/com/codahale/passpol/PasswordPolicy.java

(-0, +113)

| History

| Source

· /3rdParty_sources/passpol/com/codahale/passpol/PasswordSet.java

(-0, +62)

| History

| Source

· /3rdParty_sources/passpol/com/codahale/passpol/Status.java

(-0, +31)

| History

| Source

· /3rdParty_sources/versions.txt

(-0, +2)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importexcel.jsp

(-0, +3)

| History

| Source

| Diff

· /lams_admin/web/orgPasswordChange.jsp

(-0, +3)

| History

| Source

| Diff

· /lams_admin/web/user.jsp

(-1, +3)

| History

| Source

| Diff

· /lams_admin/web/userChangePass.jsp

(-1, +3)

| History

| Source

| Diff

· /lams_build/3rdParty.userlibraries

(-5, +6)

| History

| Source

| Diff

· /lams_build/build.xml

(-0, +8)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

· /lams_build/lib/passpol/passpol-0.7.1-SNAPSHOT.jar

(binary)

| History

| Source

… 7 more files in changeset.

lams-github (v4.7): LDEV-5178 Add password check for not being same as user details

Marcin Cieslak — Tue, 16 Feb 2021 13:04:44 +0100

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

LDEV-5178 Add password check for not being same as user details

· /lams_admin/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(-3, +12)	\| History	\| Source	\| Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java	(-0, +3)	\| History	\| Source	\| Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(-10, +10)	\| History	\| Source	\| Diff
· /lams_admin/web/import/importexcel.jsp	(-0, +3)	\| History	\| Source	\| Diff
· /lams_admin/web/orgPasswordChange.jsp	(-0, +4)	\| History	\| Source	\| Diff
· /lams_admin/web/user.jsp	(-0, +5)	\| History	\| Source	\| Diff
· /lams_admin/web/userChangePass.jsp	(-0, +8)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java	(-11, +14)	\| History	\| Source	\| Diff
· /lams_central/web/forgotPasswordChange.jsp	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/web/passwordChangeContent.jsp	(-0, +3)	\| History	\| Source	\| Diff
· /lams_central/web/signup/singupTab.jsp	(-0, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/signup/service/ISignupService.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java	(-1, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/ValidationUtil.java	(-0, +31)	\| History	\| Source	\| Diff

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

Marcin Cieslak — Thu, 26 Mar 2020 11:59:17 +0100

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

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

Conflicts:

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

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserForm.java	(-0, +11)	\| History	\| Source	\| Diff
· /lams_admin/web/user.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java	(-0, +10)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(-4, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-14, +25)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/MonitoringController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/summary.jsp	(-6, +19)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Add missing create date to user edit form in sysadmin

Marcin Cieslak — Mon, 23 Mar 2020 16:52:22 +0100

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

LDEV-4440 Add missing create date to user edit form in sysadmin

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserForm.java	(-0, +11)	\| History	\| Source	\| Diff
· /lams_admin/web/user.jsp	(-2, +2)	\| History	\| Source	\| Diff

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.

lams-github (v4.7): LDEV-4932 Add CSRF to monitor and central

Andrey Balan — Tue, 07 Jan 2020 20:42:15 +0100

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

LDEV-4932 Add CSRF to monitor and central

· /lams_admin/web/user.jsp

(-13, +18)

| History

| Source

| Diff

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

(-0, +14)

| History

| Source

| Diff

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

(-8, +8)

| History

| Source

| Diff

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

(-1, +0)

| History

| Source

| Diff

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

(-3, +1)

| History

| Source

| Diff

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

(-6, +7)

| History

| Source

| Diff

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

(-2, +5)

| History

| Source

| Diff

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

(-20, +31)

| History

| Source

| Diff

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

(-5, +22)

| History

| Source

| Diff

· /lams_central/web/orgGroup.jsp

(-13, +5)

| History

| Source

| Diff

· /lams_central/web/orgGrouping.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/profile/portrait.jsp

(-13, +8)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

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

(-4, +3)

| History

| Source

| Diff

… 36 more files in changeset.

lams-github (v4.7): LDEV-4932 Adding CSRF to Admin...

Ernie Ghiglione — Tue, 31 Dec 2019 23:36:23 +0100

Ernie Ghiglione committed 1ef1213 on branch v4.7, v4.8 in lams-github

LDEV-4932 Adding CSRF to Admin

Adding it to:

- User roles

- Create course

- Clone lessons

- assign roles in courses

- global roles

- change password for course

- change user pass

- delete all lessons

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

(-1, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumer.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/serverlist.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_admin/web/integration/servermaintain.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/loginmaintain.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/orgPasswordChange.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/cloneStart.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/createOrEdit.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/deleteAllLessons.jsp

(-1, +2)

| History

| Source

| Diff

· /lams_admin/web/organisation/list.jsp

(-4, +4)

| History

| Source

| Diff

· /lams_admin/web/policies/editPolicy.jsp

(-1, +1)

| History

| Source

| Diff

… 9 more files in changeset.

lams-github (v4.7): LDEV-4932 Adding CSRF protection to admin...

Ernie Ghiglione — Tue, 31 Dec 2019 03:06:54 +0100

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

LDEV-4932 Adding CSRF protection to admin

- Adding user add/edit/remove/disable

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(-7, +8)	\| History	\| Source	\| Diff
· /lams_admin/web/disabledusers.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_admin/web/remove.jsp	(-8, +5)	\| History	\| Source	\| Diff
· /lams_admin/web/user.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_admin/web/usersearchlist.jsp	(-7, +3)	\| History	\| Source	\| Diff
· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-0, +5)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4906 Fix saving/editing users

Andrey Balan — Mon, 18 Nov 2019 13:33:04 +0100

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

LDEV-4906 Fix saving/editing users

· /lams_admin/web/user.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_admin/web/userChangePass.jsp	(-1, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4748 Remove obsolete changeStyle.js

Andrey Balan — Wed, 09 Jan 2019 00:29:55 +0100

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

LDEV-4748 Remove obsolete changeStyle.js

· /lams_admin/web/cleanup.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/cleanupPreviewLessons.jsp

(-50, +48)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-3, +0)

| History

| Source

| Diff

· /lams_admin/web/disabledusers.jsp

(-3, +2)

| History

| Source

| Diff

· /lams_admin/web/import/importGroups.jsp

(-8, +4)

| History

| Source

| Diff

· /lams_admin/web/import/importexcel.jsp

(-3, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importresult.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/import/status.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/joblist.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/ldap.jsp

(-9, +6)

| History

| Source

| Diff

· /lams_admin/web/logevent.jsp

(-15, +11)

| History

| Source

| Diff

· /lams_admin/web/loginmaintain.jsp

(-2, +0)

| History

| Source

| Diff

· /lams_admin/web/lti/ltiConsumer.jsp

(-8, +4)

| History

| Source

| Diff

· /lams_admin/web/lti/ltiConsumerList.jsp

(-5, +2)

| History

| Source

| Diff

· /lams_admin/web/orgPasswordChange.jsp

(-5, +2)

| History

| Source

| Diff

… 35 more files in changeset.

lams-github (v4.7): LDEV-4391 Get rid of redundant jQuery UI themes...

Marcin Cieslak — Wed, 21 Nov 2018 12:22:57 +0100

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

LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

· /lams_admin/web/cleanup.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/cleanupPreviewLessons.jsp

(-1, +1)

| 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/import/importGroups.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importexcel.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importresult.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/joblist.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/ldap.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/logevent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/loginmaintain.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/lti/ltiConsumer.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/lti/ltiConsumerList.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/orgPasswordChange.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/cloneResult.jsp

(-1, +1)

| History

| Source

| Diff

… 83 more files in changeset.

lams-github (v4.7): LDEV-4440 fix various Spring MVC related issues

Andrey Balan — Fri, 28 Sep 2018 21:36:44 +0200

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

LDEV-4440 fix various Spring MVC related issues

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java	(-52, +14)	\| History	\| Source	\| Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/SignupManagementForm.java	(-0, +10)	\| History	\| Source	\| Diff
· /lams_admin/web/cleanupPreviewLessons.jsp	(-1, +2)	\| History	\| Source	\| Diff
· /lams_admin/web/remove.jsp	(-11, +19)	\| History	\| Source	\| Diff
· /lams_admin/web/signupmanagement/add.jsp	(-5, +7)	\| History	\| Source	\| Diff
· /lams_admin/web/user.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_admin/web/usersearchlist.jsp	(-1, +1)	\| History	\| Source	\| Diff