Fisheye on lams-github/lams_central/web/common

lams-github (v4.7): LDEV-4917 Add Italian to Uppy i18n in central

Ernie Ghiglione — Sun, 27 Aug 2023 12:24:25 +0200

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

LDEV-4917 Add Italian to Uppy i18n in central

· /lams_central/web/common/uppylang.jsp	(-0, +15)	\| History	\| Source
· /lams_central/web/qb/importQuestionsXml.jsp	(-12, +2)	\| History	\| Source	\| Diff
· /lams_central/web/questions/questionFile.jsp	(-13, +2)	\| History	\| Source	\| Diff
· /lams_central/web/toolcontent/import.jsp	(-15, +5)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5404 Escaping funny characters that break js

Ernie Ghiglione — Sat, 29 Jul 2023 12:47:16 +0200

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

LDEV-5404 Escaping funny characters that break js

· /lams_central/web/common/taglibs.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/web/qb/collection.jsp	(-29, +29)	\| History	\| Source	\| Diff

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

Andrey Balan — Wed, 22 Jan 2020 23:50:05 +0100

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

Merge branch 'master' into v4.0

# Conflicts:

# lams_central/web/common/taglibs.jsp

· /lams_central/web/WEB-INF/web.xml	(-0, +5)	\| History	\| Source	\| Diff
· /lams_central/web/common/taglibs.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

Andrey Balan — Wed, 22 Jan 2020 23:40:48 +0100

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

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

· /lams_admin/web/403.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_admin/web/404.jsp

(-1, +0)

| History

| Source

| Diff

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

(-0, +5)

| History

| Source

| Diff

· /lams_admin/web/error.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/login.jsp

(-1, +0)

| History

| Source

| Diff

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

(-0, +5)

| History

| Source

| Diff

· /lams_central/web/ckeditor/plugins/jlatexmath/buttons.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/common/taglibs.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_central/web/error.jsp

(-1, +1)

| History

| Source

| Diff

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

(-1, +5)

| History

| Source

| Diff

· /lams_gradebook/web/common/taglibs.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_learning/web/403.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_learning/web/404.jsp

(-1, +0)

| History

| Source

| Diff

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

(-0, +6)

| History

| Source

| Diff

… 158 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): LDEV-4836 Change authoring to accommodate importing questions from QB

Andrey Balan — Fri, 12 Jul 2019 23:21:06 +0200

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

LDEV-4836 Change authoring to accommodate importing questions from QB

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

(-0, +67)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java

(-104, +472)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

(-1, +6)

| History

| Source

| Diff

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

(-1, +14)

| History

| Source

| Diff

· /lams_central/web/common/taglibs.jsp

(-0, +6)

| History

| Source

· /lams_central/web/css/bootstrap-toggle.css

(-0, +7)

| History

| Source

· /lams_central/web/css/bootstrap-toggle.scss

(-0, +28)

| History

| Source

· /lams_central/web/css/qb-question.css

(-0, +1)

| History

| Source

· /lams_central/web/css/qb-question.scss

(-0, +394)

| History

| Source

· /lams_central/web/includes/javascript/bootstrap-toggle.js

(-0, +9)

| History

| Source

· /lams_central/web/includes/javascript/qb-option.js

(-0, +135)

| History

| Source

· /lams_central/web/includes/javascript/qb-question.js

(-0, +80)

| History

| Source

· /lams_central/web/qb/authoring/addQuestionFooter.jsp

(-0, +29)

| History

| Source

· /lams_central/web/qb/authoring/addQuestionHeader.jsp

(-0, +28)

| History

| Source

· /lams_central/web/qb/authoring/addessay.jsp

(-0, +231)

| History

| Source

… 62 more files in changeset.