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 (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, 31 Dec 2019 19:35:38 +0100

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

LDEV-4932 Add CSRF to monitor and central

* Add CSRF protection to:

- Change lesson status (incl. remove)

- Remove lesson using main.jsp button

- Rename lesson

* Start using /common/taglibs.jsp in lams_central

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

(-0, +7)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-5, +2)

| History

| Source

| Diff

· /lams_central/web/admin.jsp

(-6, +1)

| History

| Source

| Diff

· /lams_central/web/authoringConfirm.jsp

(-7, +1)

| History

| Source

| Diff

· /lams_central/web/common/taglibs.jsp

(-0, +8)

| History

| Source

· /lams_central/web/dialogCloser.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/editLessonIntro.jsp

(-6, +1)

| History

| Source

| Diff

· /lams_central/web/error.jsp

(-5, +2)

| History

| Source

| Diff

· /lams_central/web/errorContent.jsp

(-7, +2)

| History

| Source

| Diff

· /lams_central/web/favoriteOrganisations.jsp

(-5, +1)

| History

| Source

| Diff

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

(-7, +7)

| History

| Source

| Diff

· /lams_central/web/index.jsp

(-5, +1)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-6, +4)

| History

| Source

| Diff

· /lams_central/web/outcome/outcomeEdit.jsp

(-8, +2)

| History

| Source

| Diff

· /lams_central/web/outcome/outcomeManage.jsp

(-8, +3)

| History

| Source

| Diff

… 9 more files in changeset.

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

Marcin Cieslak — Fri, 08 Nov 2019 16:29:17 +0100

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

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_central/web/main.jsp

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_tool_lamc/web/authoring/itemlist.jsp

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

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/TblMonitorController.java

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

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

(-655, +660)

| History

| Source

| Diff

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

(-19, +24)

| History

| Source

| Diff

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

(-16, +23)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-339, +336)

| History

| Source

| Diff

· /lams_central/web/questions/questionChoice.jsp

(-0, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java

(-0, +1)

| History

| Source

| Diff

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

(-305, +307)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-345, +285)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

(-318, +297)

| History

| Source

| Diff

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

(-2, +3)

| History

| Source

| Diff

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

(-0, +2)

| History

| Source

| Diff

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

(-293, +212)

| History

| Source

| Diff

… 13 more files in changeset.

lams-github (v4.7): Merge branch 'master' into develop

Andrey Balan — Mon, 14 Oct 2019 12:36:44 +0200

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

Merge branch 'master' into develop

· /lams_central/web/main.jsp

(-0, +3)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4873 Revert LAMS copyright label removal

Andrey Balan — Mon, 14 Oct 2019 11:38:10 +0200

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

LDEV-4873 Revert LAMS copyright label removal

· /lams_central/web/login.jsp	(-1, +5)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-0, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): Merge branch 'master' into develop

Sun, 13 Oct 2019 09:02:03 +0200

Fiona Malikoff committed 720805a on branch v4.7, v4.8 in lams-github

Merge branch 'master' into develop

· /lams_central/web/main.jsp

(-2, +2)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4877 Bootstrap tourist replaced tour for Bootstrap 3.4.1

Sun, 13 Oct 2019 08:42:53 +0200

Fiona Malikoff committed 6f1fed4 on branch v4.7, v4.8 in lams-github

LDEV-4877 Bootstrap tourist replaced tour for Bootstrap 3.4.1

· /lams_central/web/css/bootstrap-tour.min.css	(-22, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/bootstrap-tourist.min.css	(-0, +25)	\| History	\| Source
· /lams_central/web/includes/javascript/bootstrap-tour.min.js	(-22, +0)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/bootstrap-tourist.min.js	(-0, +12)	\| History	\| Source
· /lams_central/web/main.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/web/mainTour.jsp	(-3, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitorTour.jsp	(-32, +42)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/sequence.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): Merge branch 'master' into develop...

Andrey Balan — Fri, 11 Oct 2019 22:46:38 +0200

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

Merge branch 'master' into develop

Conflicts:

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

· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(-0, +2)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-6, +0)	\| 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	(-102, +48)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4873 Remove version numbering from login and main pages...

Andrey Balan — Fri, 11 Oct 2019 22:42:02 +0200

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

LDEV-4873 Remove version numbering from login and main pages

And add it instead to sysadmin.jsp

· /lams_admin/web/sysadmin.jsp	(-16, +27)	\| History	\| Source	\| Diff
· /lams_central/web/login.jsp	(-11, +4)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-6, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4828 Add QB collections link on index page

Marcin Cieslak — Wed, 05 Jun 2019 10:17:34 +0200

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

LDEV-4828 Add QB collections link on index page

· /lams_central/conf/language/lams/ApplicationResources.properties	(-884, +885)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java	(-302, +306)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/openUrls.js	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-331, +339)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4788 All learning outcomes are now global

Marcin Cieslak — Wed, 13 Mar 2019 14:20:54 +0100

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

LDEV-4788 All learning outcomes are now global

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

(-6, +0)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-226, +15)

| History

| Source

| Diff

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

(-9, +0)

| History

| Source

| Diff

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

(-9, +0)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-4, +3)

| History

| Source

| Diff

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

(-9, +8)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-3, +1)

| History

| Source

| Diff

· /lams_central/web/outcome/outcomeEdit.jsp

(-39, +10)

| History

| Source

| Diff

· /lams_central/web/outcome/outcomeManage.jsp

(-48, +21)

| History

| Source

| Diff

· /lams_central/web/outcome/scaleEdit.jsp

(-21, +7)

| History

| Source

| Diff

· /lams_central/web/outcome/scaleManage.jsp

(-32, +16)

| History

| Source

| Diff

… 7 more files in changeset.

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

Marcin Cieslak — Thu, 18 Oct 2018 22:59:38 +0200

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

Merge remote-tracking branch 'origin/LDEV-4644'

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/lib/lams/lams.jar

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

lams_central/web/WEB-INF/struts-config.xml

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java

lams_gradebook/web/gradebookMonitor.jsp

lams_monitoring/conf/language/lams/ApplicationResources.properties

· /lams_admin/conf/language/lams/ApplicationResources.properties	(-1, +5)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources.properties	(-1, +43)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(-11, +21)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(-0, +6)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/struts-config.xml	(-3, +31)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-0, +4)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(-1, +28)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-2, +39)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java	(-2, +7)	\| History	\| Source	\| Diff
· /lams_gradebook/web/gradebookMonitor.jsp	(-74, +127)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-1, +4)	\| History	\| Source	\| Diff
· /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(-1, +4)	\| History	\| Source	\| Diff
· /lams_central/web/css/outcome.css	(-27, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration...

Marcin Cieslak — Sat, 15 Sep 2018 07:22:02 +0200

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

Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration

Conflicts:

lams_admin/.classpath

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

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java

lams_admin/web/WEB-INF/struts-config.xml

lams_admin/web/WEB-INF/tiles-defs.xml

lams_admin/web/config/items.jsp

lams_admin/web/css/admin.scss

lams_admin/web/organisation/courseAdminEdit.jsp

lams_admin/web/organisation/createOrEdit.jsp

lams_admin/web/organisation/list.jsp

lams_admin/web/servermaintain.jsp

lams_admin/web/signupmanagement/add.jsp

lams_admin/web/signupmanagement/list.jsp

lams_admin/web/timezoneServerManagement.jsp

lams_admin/web/user.jsp

lams_admin/web/usersearchlist.jsp

lams_build/lib/lams/lams-admin.jar

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_build/lib/lams/lams-monitoring.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java

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

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

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

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

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

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

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

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java

lams_central/web/WEB-INF/struts-config.xml

lams_central/web/editprofile.jsp

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_central/web/lessons.jsp

lams_central/web/main.jsp

lams_central/web/portrait.jsp

lams_central/web/profile.jsp

lams_central/web/signup/singupTab.jsp

lams_central/web/tutorialVideo.jsp

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

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql

lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java

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

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java

lams_monitoring/web/gate/scheduleGateContent.jsp

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.java

lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java

lams_tool_daco/.classpath

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_dimdim/.classpath

lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java

lams_tool_forum/web/jsps/learning/viewtopic.jsp

lams_tool_forum/web/jsps/monitoring/summary.jsp

lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java

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

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java

lams_tool_lamc/web/authoring/AdvancedContent.jsp

lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningStarterAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/ClearSessionAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java

lams_tool_mindmap/web/pages/authoring/authoring.jsp

lams_tool_mindmap/web/pages/learning/mindmap.jsp

lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/ClearSessionAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java

lams_tool_pixlr/.classpath

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java

lams_tool_preview/.classpath

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java

lams_tool_sbmt/web/authoring/advance.jsp

lams_tool_sbmt/web/monitoring/mark/mark.jsp

lams_tool_sbmt/web/monitoring/parts/summary.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/ClearSessionAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java

lams_tool_scribe/.classpath

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/ClearSessionAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ClearSessionAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ClearSessionAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java

lams_tool_videorecorder/.classpath

lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java

lams_tool_vote/.classpath

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java

lams_tool_wookie/.classpath

lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java

· /3rdParty_sources/versions.txt

(-0, +2)

| History

| Source

| Diff

· /lams_admin/.classpath

(-1, +0)

| History

| Source

| Diff

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

(-2, +54)

| History

| Source

| Diff

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

(-2, +47)

| History

| Source

| Diff

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

(-2, +48)

| History

| Source

| Diff

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

(-7, +53)

| History

| Source

| Diff

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

(-1, +4)

| History

| Source

| Diff

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

(-51, +38)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

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

(-4, +10)

| History

| Source

| Diff

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

(-43, +7)

| History

| Source

| Diff

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

(-12, +1)

| History

| Source

| Diff

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

(-0, +264)

| History

| Source

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

(-1, +1)

| History

| Source

| Diff

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

(-2, +7)

| History

| Source

| Diff

… 634 more files in changeset.

lams-github (v4.7): Merge learning outcomes LDEV-4644 into lams31

Marcin Cieslak — Sun, 09 Sep 2018 20:10:25 +0200

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

Merge learning outcomes LDEV-4644 into lams31

· /lams_admin/conf/language/lams/ApplicationResources.properties	(-0, +6)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources.properties	(-1, +43)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(-6, +18)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(-0, +6)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/struts-config.xml	(-1, +30)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-0, +4)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(-1, +28)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-8, +108)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-1, +4)	\| History	\| Source	\| Diff
· /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(-1, +4)	\| History	\| Source	\| Diff
· /lams_central/web/css/outcome.css	(-27, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/outcome.scss	(-45, +0)	\| History	\| Source	\| Diff