From 4cb6b0559da9d160f414c31c57b215941f1a4572 Mon Sep 17 00:00:00 2001 From: brianbrix Date: Fri, 28 Aug 2026 16:32:12 +0300 Subject: [PATCH 1/7] AMP-31202 : Add privacy policy and code of conduct --- .../ampTemplate/layout/loginWidget3.jsp | 4 ++ .../ampTemplate/layout/publicPortalLogin.jsp | 4 ++ .../WEB-INF/jsp/aim/view/userRegistration.jsp | 5 +++ amp/src/main/webapp/code-of-conduct.html | 43 ++++++++++++++++++ amp/src/main/webapp/privacy-policy.html | 44 +++++++++++++++++++ 5 files changed, 100 insertions(+) create mode 100644 amp/src/main/webapp/code-of-conduct.html create mode 100644 amp/src/main/webapp/privacy-policy.html diff --git a/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp b/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp index 41d350ab601..ed30c3acd7a 100644 --- a/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp +++ b/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp @@ -61,6 +61,10 @@ +

+ By signing in, you acknowledge the + Privacy Policy. +

diff --git a/amp/TEMPLATE/ampTemplate/layout/publicPortalLogin.jsp b/amp/TEMPLATE/ampTemplate/layout/publicPortalLogin.jsp index dd4b13dd6b5..c3ab20de195 100644 --- a/amp/TEMPLATE/ampTemplate/layout/publicPortalLogin.jsp +++ b/amp/TEMPLATE/ampTemplate/layout/publicPortalLogin.jsp @@ -65,6 +65,10 @@ var loginFailed = function(data, status) {

Member Login

+

diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/userRegistration.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/userRegistration.jsp index dad6815aa12..ba401f427b2 100644 --- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/userRegistration.jsp +++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/userRegistration.jsp @@ -223,6 +223,11 @@ Please do not attempt to use the Notification Email as user login.

Account information / about you
+
+ To create an AMP account, you provide account information such as your name and email address. + Read the Privacy Policy + before registering. By submitting this form, you confirm that the information you provide may be used to create and administer your AMP account. +
diff --git a/amp/src/main/webapp/code-of-conduct.html b/amp/src/main/webapp/code-of-conduct.html new file mode 100644 index 00000000000..35d5423df5c --- /dev/null +++ b/amp/src/main/webapp/code-of-conduct.html @@ -0,0 +1,43 @@ + + + + + + AMP Code of Conduct + + + +
+

Return to AMP

+

AMP Code of Conduct

+ +

We want the AMP project to be welcoming, professional, and constructive for everyone.

+ +

Expected behaviour

+
    +
  • Be respectful and considerate of other people and their backgrounds.
    • +
  • Use inclusive language and focus feedback on the work, not the person.
    • +
  • Keep discussions relevant, factual, and suitable for a professional project.
    • +
  • Respect privacy and do not publish personal or confidential information.
    • +
+ +

Unacceptable behaviour

+

Harassment, discrimination, intimidation, threats, personal attacks, unwanted sexual attention, and deliberate disruption are not acceptable. This applies to GitHub issues, pull requests, discussions, reviews, and other project spaces.

+ +

Reporting

+

Report a concern to info@developmentgateway.org. Include the relevant link, a short description, and supporting evidence. Reports will be reviewed by Development Gateway staff and handled as confidentially as practical. Do not use public project discussions to report sensitive details.

+ +

Enforcement

+

Project maintainers may remove comments, close discussions, restrict participation, or take other appropriate action when this Code of Conduct is violated. Serious or repeated violations may be referred to the appropriate organisational or legal process.

+ +

This page is the web version of the repository Code of Conduct.

+
+ + diff --git a/amp/src/main/webapp/privacy-policy.html b/amp/src/main/webapp/privacy-policy.html new file mode 100644 index 00000000000..5be058bc03f --- /dev/null +++ b/amp/src/main/webapp/privacy-policy.html @@ -0,0 +1,44 @@ + + + + + + AMP Privacy Policy + + + +
+

Return to AMP

+

AMP Privacy Policy

+

Last updated: August 2022

+ +

This notice explains how the Aid Management Platform (AMP) may process information when you use an AMP deployment. The organisation operating your deployment may provide additional project-specific instructions.

+ +

Information AMP may process

+

AMP may process account and authentication information, including your username, email address, name, organisation, and password credentials. Passwords are used for authentication and must not be stored or shared in plain text.

+

Depending on the deployment and enabled workflow, AMP may also process contact information such as names, job functions, organisation, office address, email address, telephone number, fax number, and relationships between contacts and aid activities. Activity, audit, and system records may also contain information supplied by users.

+ +

Why information is used

+

Information is used to create and manage user accounts, control access to workspaces, support aid-management workflows, provide reports and integrations, communicate service information, and protect the security and integrity of the deployment.

+ +

Access and sharing

+

Access is limited according to authentication, roles, workspace permissions, and administrative controls. Information should only be shared when authorised by the applicable project agreement, with appropriate pseudonymisation, or with the necessary consent. AMP data must not be published or shared through public reports unless that release is authorised.

+ +

Retention and security

+

The deployment operator should retain personal information only as long as necessary for the applicable project or legal requirements, and should apply appropriate controls to databases, file stores, logs, exports, and backups. Users may contact the deployment administrator about account access, correction, deactivation, or deletion requests.

+ +

Questions or concerns

+

Contact the AMP deployment administrator or project manager. If you cannot reach them, contact info@developmentgateway.org.

+ +

This page is the AMP-specific notice. The broader Development Gateway policy is available in the repository at docs/PRIVACY.md.

+
+ + From 65a9b9561cab87887749139c95172335c779593d Mon Sep 17 00:00:00 2001 From: brianbrix Date: Fri, 28 Aug 2026 17:06:54 +0300 Subject: [PATCH 2/7] AMP-31202 : Converted all three submodule URLs to https --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 47135e73d6e..6dd784f502f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate"] path = amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate - url = git@github.com:devgateway/amp-boilerplate.git + url = https://github.com/devgateway/amp-boilerplate.git [submodule "amp/TEMPLATE/ampTemplate/node_modules/amp-translate"] path = amp/TEMPLATE/ampTemplate/node_modules/amp-translate - url = git@github.com:devgateway/amp-translate.git + url = https://github.com/devgateway/amp-translate.git [submodule "amp/TEMPLATE/ampTemplate/node_modules/amp-filter"] path = amp/TEMPLATE/ampTemplate/node_modules/amp-filter - url = git@github.com:devgateway/amp-filter.git + url = https://github.com/devgateway/amp-filter.git From b976c3218d1ff43411e4d8a1cb4bae9ddedf681e Mon Sep 17 00:00:00 2001 From: brianbrix Date: Fri, 28 Aug 2026 17:15:17 +0300 Subject: [PATCH 3/7] =?UTF-8?q?AMP-31202=20:=20Removed=20legacy=20?= =?UTF-8?q?=E2=80=9CConfidential=20and=20Proprietary=E2=80=9D=20/=20NDA=20?= =?UTF-8?q?headers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add license metadata to pom.xml --- amp/pom.xml | 7 +++++++ .../viewmanager/reposimpl/TemplateViewConfigImpl.java | 8 +++----- .../kernel/viewmanager/reposimpl/ViewConfigImpl.java | 8 +++----- .../digijava/module/common/action/PaginationAction.java | 8 +++----- .../org/digijava/module/common/action/PaginationForm.java | 8 +++----- .../org/digijava/module/common/dbentity/ItemStatus.java | 8 +++----- .../org/digijava/module/common/dbentity/ModuleTeaser.java | 8 +++----- .../digijava/module/common/exception/BBCodeException.java | 8 +++----- .../org/digijava/module/common/util/BBCodeParser.java | 8 +++----- .../org/digijava/module/common/util/DateTimeUtil.java | 8 +++----- .../digijava/module/common/util/ModuleEmailManager.java | 8 +++----- .../java/org/digijava/module/common/util/ModuleUtil.java | 8 +++----- .../java/org/digijava/module/editor/taglib/EditTag.java | 8 +++----- .../java/org/digijava/module/um/form/AddUserForm.java | 8 +++----- .../org/digijava/module/um/form/UserRegisterForm.java | 8 +++----- amp/src/main/java/org/digijava/module/um/util/DbUtil.java | 8 +++----- 16 files changed, 52 insertions(+), 75 deletions(-) diff --git a/amp/pom.xml b/amp/pom.xml index cb9831d9485..f60b34c4227 100644 --- a/amp/pom.xml +++ b/amp/pom.xml @@ -6,6 +6,13 @@ 4.0-SNAPSHOT war Aid Management Platform + + + GNU General Public License v3.0 + https://www.gnu.org/licenses/gpl-3.0.html + repo + + 6.29.0 8.5.73 diff --git a/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/TemplateViewConfigImpl.java b/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/TemplateViewConfigImpl.java index 57a6fd6048e..9fe1c7f3213 100644 --- a/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/TemplateViewConfigImpl.java +++ b/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/TemplateViewConfigImpl.java @@ -31,12 +31,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * -* Confidential and Proprietary, Subject to the Non-Disclosure -* Agreement, Version 2.0, between the Development Gateway -* Foundation, Inc and the Recipient -- Copyright 2001-2004 Development -* Gateway Foundation, Inc. +* Copyright 2001-2004 Development Gateway Foundation, Inc. * -* Unauthorized Disclosure Prohibited. +* Licensed under the GNU General Public License version 3; see the repository +* LICENSE file for the full terms. * *************************************************************************/ diff --git a/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/ViewConfigImpl.java b/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/ViewConfigImpl.java index a1e3416f4bd..36e6d2b44d3 100644 --- a/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/ViewConfigImpl.java +++ b/amp/src/main/java/org/digijava/kernel/viewmanager/reposimpl/ViewConfigImpl.java @@ -31,12 +31,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * -* Confidential and Proprietary, Subject to the Non-Disclosure -* Agreement, Version 2.0, between the Development Gateway -* Foundation, Inc and the Recipient -- Copyright 2001-2004 Development -* Gateway Foundation, Inc. +* Copyright 2001-2004 Development Gateway Foundation, Inc. * -* Unauthorized Disclosure Prohibited. +* Licensed under the GNU General Public License version 3; see the repository +* LICENSE file for the full terms. * *************************************************************************/ diff --git a/amp/src/main/java/org/digijava/module/common/action/PaginationAction.java b/amp/src/main/java/org/digijava/module/common/action/PaginationAction.java index c060d093a2a..98c08e383d7 100644 --- a/amp/src/main/java/org/digijava/module/common/action/PaginationAction.java +++ b/amp/src/main/java/org/digijava/module/common/action/PaginationAction.java @@ -7,12 +7,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. + * Copyright 2001-2004 Development Gateway Foundation, Inc. * - * Unauthorized Disclosure Prohibited. + * Licensed under the GNU General Public License version 3; see the repository + * LICENSE file for the full terms. * *************************************************************************/ package org.digijava.module.common.action; diff --git a/amp/src/main/java/org/digijava/module/common/action/PaginationForm.java b/amp/src/main/java/org/digijava/module/common/action/PaginationForm.java index ee13a13d559..d37c166416d 100644 --- a/amp/src/main/java/org/digijava/module/common/action/PaginationForm.java +++ b/amp/src/main/java/org/digijava/module/common/action/PaginationForm.java @@ -7,12 +7,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. + * Copyright 2001-2004 Development Gateway Foundation, Inc. * - * Unauthorized Disclosure Prohibited. + * Licensed under the GNU General Public License version 3; see the repository + * LICENSE file for the full terms. * *************************************************************************/ package org.digijava.module.common.action; diff --git a/amp/src/main/java/org/digijava/module/common/dbentity/ItemStatus.java b/amp/src/main/java/org/digijava/module/common/dbentity/ItemStatus.java index 8367e529147..57790d3bfb6 100644 --- a/amp/src/main/java/org/digijava/module/common/dbentity/ItemStatus.java +++ b/amp/src/main/java/org/digijava/module/common/dbentity/ItemStatus.java @@ -7,12 +7,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * -* Confidential and Proprietary, Subject to the Non-Disclosure -* Agreement, Version 1.0, between the Development Gateway -* Foundation, Inc and the Recipient -- Copyright 2001-2004 Development -* Gateway Foundation, Inc. +* Copyright 2001-2004 Development Gateway Foundation, Inc. * -* Unauthorized Disclosure Prohibited. +* Licensed under the GNU General Public License version 3; see the repository +* LICENSE file for the full terms. * *************************************************************************/ diff --git a/amp/src/main/java/org/digijava/module/common/dbentity/ModuleTeaser.java b/amp/src/main/java/org/digijava/module/common/dbentity/ModuleTeaser.java index 5a207df0f67..a7a537b25e8 100644 --- a/amp/src/main/java/org/digijava/module/common/dbentity/ModuleTeaser.java +++ b/amp/src/main/java/org/digijava/module/common/dbentity/ModuleTeaser.java @@ -7,12 +7,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * -* Confidential and Proprietary, Subject to the Non-Disclosure -* Agreement, Version 1.0, between the Development Gateway -* Foundation, Inc and the Recipient -- Copyright 2001-2004 Development -* Gateway Foundation, Inc. +* Copyright 2001-2004 Development Gateway Foundation, Inc. * -* Unauthorized Disclosure Prohibited. +* Licensed under the GNU General Public License version 3; see the repository +* LICENSE file for the full terms. * *************************************************************************/ diff --git a/amp/src/main/java/org/digijava/module/common/exception/BBCodeException.java b/amp/src/main/java/org/digijava/module/common/exception/BBCodeException.java index 4d5eac203c9..05ea1e7f4c5 100644 --- a/amp/src/main/java/org/digijava/module/common/exception/BBCodeException.java +++ b/amp/src/main/java/org/digijava/module/common/exception/BBCodeException.java @@ -7,12 +7,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. + * Copyright 2001-2004 Development Gateway Foundation, Inc. * - * Unauthorized Disclosure Prohibited. + * Licensed under the GNU General Public License version 3; see the repository + * LICENSE file for the full terms. * *************************************************************************/ diff --git a/amp/src/main/java/org/digijava/module/common/util/BBCodeParser.java b/amp/src/main/java/org/digijava/module/common/util/BBCodeParser.java index 286afe0b83c..753c8a8df69 100644 --- a/amp/src/main/java/org/digijava/module/common/util/BBCodeParser.java +++ b/amp/src/main/java/org/digijava/module/common/util/BBCodeParser.java @@ -7,12 +7,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. + * Copyright 2001-2004 Development Gateway Foundation, Inc. * - * Unauthorized Disclosure Prohibited. + * Licensed under the GNU General Public License version 3; see the repository + * LICENSE file for the full terms. * *************************************************************************/ diff --git a/amp/src/main/java/org/digijava/module/common/util/DateTimeUtil.java b/amp/src/main/java/org/digijava/module/common/util/DateTimeUtil.java index 51607887d5f..7abea6db7b9 100644 --- a/amp/src/main/java/org/digijava/module/common/util/DateTimeUtil.java +++ b/amp/src/main/java/org/digijava/module/common/util/DateTimeUtil.java @@ -7,12 +7,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. + * Copyright 2001-2004 Development Gateway Foundation, Inc. * - * Unauthorized Disclosure Prohibited. + * Licensed under the GNU General Public License version 3; see the repository + * LICENSE file for the full terms. * *************************************************************************/ package org.digijava.module.common.util; diff --git a/amp/src/main/java/org/digijava/module/common/util/ModuleEmailManager.java b/amp/src/main/java/org/digijava/module/common/util/ModuleEmailManager.java index 966c5a6ed34..0763d094fdd 100644 --- a/amp/src/main/java/org/digijava/module/common/util/ModuleEmailManager.java +++ b/amp/src/main/java/org/digijava/module/common/util/ModuleEmailManager.java @@ -7,12 +7,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. + * Copyright 2001-2004 Development Gateway Foundation, Inc. * - * Unauthorized Disclosure Prohibited. + * Licensed under the GNU General Public License version 3; see the repository + * LICENSE file for the full terms. * *************************************************************************/ diff --git a/amp/src/main/java/org/digijava/module/common/util/ModuleUtil.java b/amp/src/main/java/org/digijava/module/common/util/ModuleUtil.java index 83a00f09e56..b67f09d22b7 100644 --- a/amp/src/main/java/org/digijava/module/common/util/ModuleUtil.java +++ b/amp/src/main/java/org/digijava/module/common/util/ModuleUtil.java @@ -7,12 +7,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. + * Copyright 2001-2004 Development Gateway Foundation, Inc. * - * Unauthorized Disclosure Prohibited. + * Licensed under the GNU General Public License version 3; see the repository + * LICENSE file for the full terms. * *************************************************************************/ package org.digijava.module.common.util; diff --git a/amp/src/main/java/org/digijava/module/editor/taglib/EditTag.java b/amp/src/main/java/org/digijava/module/editor/taglib/EditTag.java index 31410958bd5..1bf32b1c896 100644 --- a/amp/src/main/java/org/digijava/module/editor/taglib/EditTag.java +++ b/amp/src/main/java/org/digijava/module/editor/taglib/EditTag.java @@ -7,12 +7,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. + * Copyright 2001-2004 Development Gateway Foundation, Inc. * - * Unauthorized Disclosure Prohibited. + * Licensed under the GNU General Public License version 3; see the repository + * LICENSE file for the full terms. * *************************************************************************/ diff --git a/amp/src/main/java/org/digijava/module/um/form/AddUserForm.java b/amp/src/main/java/org/digijava/module/um/form/AddUserForm.java index 62caa8d9ea2..a5f892fbc7f 100644 --- a/amp/src/main/java/org/digijava/module/um/form/AddUserForm.java +++ b/amp/src/main/java/org/digijava/module/um/form/AddUserForm.java @@ -9,12 +9,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. + * Copyright 2001-2004 Development Gateway Foundation, Inc. * - * Unauthorized Disclosure Prohibited. + * Licensed under the GNU General Public License version 3; see the repository + * LICENSE file for the full terms. * *************************************************************************/ diff --git a/amp/src/main/java/org/digijava/module/um/form/UserRegisterForm.java b/amp/src/main/java/org/digijava/module/um/form/UserRegisterForm.java index 7ab0717ac44..7acb4d6dc13 100644 --- a/amp/src/main/java/org/digijava/module/um/form/UserRegisterForm.java +++ b/amp/src/main/java/org/digijava/module/um/form/UserRegisterForm.java @@ -7,12 +7,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. + * Copyright 2001-2004 Development Gateway Foundation, Inc. * - * Unauthorized Disclosure Prohibited. + * Licensed under the GNU General Public License version 3; see the repository + * LICENSE file for the full terms. * *************************************************************************/ diff --git a/amp/src/main/java/org/digijava/module/um/util/DbUtil.java b/amp/src/main/java/org/digijava/module/um/util/DbUtil.java index c0b355e72b6..48969b63fbb 100644 --- a/amp/src/main/java/org/digijava/module/um/util/DbUtil.java +++ b/amp/src/main/java/org/digijava/module/um/util/DbUtil.java @@ -7,12 +7,10 @@ * This file is part of DiGi project (www.digijava.org). * DiGi is a multi-site portal system written in Java/J2EE. * - * Confidential and Proprietary, Subject to the Non-Disclosure - * Agreement, Version 1.0, between the Development Gateway - * Foundation, Inc and the Recipient -- Copyright 2001-2004 Development - * Gateway Foundation, Inc. + * Copyright 2001-2004 Development Gateway Foundation, Inc. * - * Unauthorized Disclosure Prohibited. + * Licensed under the GNU General Public License version 3; see the repository + * LICENSE file for the full terms. * *************************************************************************/ package org.digijava.module.um.util; From b2ca6d89719dda91c492e968b2a9e0967ec7812f Mon Sep 17 00:00:00 2001 From: brianbrix Date: Fri, 28 Aug 2026 17:37:04 +0300 Subject: [PATCH 4/7] AMP-31202: Reference licensed submodule commits --- amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate | 2 +- amp/TEMPLATE/ampTemplate/node_modules/amp-filter | 2 +- amp/TEMPLATE/ampTemplate/node_modules/amp-translate | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate index 57201262154..eca4198e1c9 160000 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate @@ -1 +1 @@ -Subproject commit 572012621548ce89a6e4fa9e791102aed0204530 +Subproject commit eca4198e1c9d1550855e8036f1be3fd9f1c4d8dd diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter index 57746209b49..91fbd26824a 160000 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter @@ -1 +1 @@ -Subproject commit 57746209b4943d4be497cf48ddc367619f0a0260 +Subproject commit 91fbd26824af1c3c71b9c9a56423d1d75157bf28 diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-translate b/amp/TEMPLATE/ampTemplate/node_modules/amp-translate index 829eff1e75d..456ca4e2b5d 160000 --- a/amp/TEMPLATE/ampTemplate/node_modules/amp-translate +++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-translate @@ -1 +1 @@ -Subproject commit 829eff1e75d978d1db4494f9a89b64aa1c420365 +Subproject commit 456ca4e2b5d8df91e555dbfce5ccb0f974fc0c63 From fee4457fc524ca30560acacf03eeafb3bc9f6784 Mon Sep 17 00:00:00 2001 From: brianbrix Date: Fri, 28 Aug 2026 17:39:05 +0300 Subject: [PATCH 5/7] AMP-31202 : Add code of conduct --- CODE_OF_CONDUCT.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000000..37f030bed95 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,24 @@ +# Code of Conduct + +We want the AMP project to be welcoming, professional, and constructive for everyone. + +## Expected behaviour + +- Be respectful and considerate of other people and their backgrounds. +- Use inclusive language and focus feedback on the work, not the person. +- Keep discussions relevant, factual, and suitable for a professional project. +- Respect privacy and do not publish personal or confidential information. + +## Unacceptable behaviour + +Harassment, discrimination, intimidation, threats, personal attacks, unwanted sexual attention, and deliberate disruption are not acceptable. This applies to GitHub issues, pull requests, discussions, reviews, and other project spaces. + +## Reporting + +Report a concern to `info@developmentgateway.org`. Include the relevant link, a short description, and any supporting evidence. Reports will be reviewed by Development Gateway staff and handled as confidentially as practical. Do not use public project discussions to report sensitive details. + +## Enforcement + +Project maintainers may remove comments, close discussions, restrict participation, or take other appropriate action when this Code of Conduct is violated. Serious or repeated violations may be referred to the appropriate organisational or legal process. + +This Code of Conduct is administered by Development Gateway and may be updated as the project evolves. From b048ee09c340d9c3415ce0ee10fadcf62a555a65 Mon Sep 17 00:00:00 2001 From: brianbrix Date: Fri, 28 Aug 2026 17:44:24 +0300 Subject: [PATCH 6/7] AMP-31202 : Copilot review comments resolution --- amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp | 2 +- amp/src/main/webapp/code-of-conduct.html | 9 +-------- amp/src/main/webapp/privacy-policy.html | 7 +------ amp/src/main/webapp/resources/css/policy-pages.css | 6 ++++++ 4 files changed, 9 insertions(+), 15 deletions(-) create mode 100644 amp/src/main/webapp/resources/css/policy-pages.css diff --git a/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp b/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp index ed30c3acd7a..4a1dbe0d099 100644 --- a/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp +++ b/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp @@ -62,7 +62,7 @@

- By signing in, you acknowledge the + By signing in, you acknowledge that AMP processes account and activity information according to the Privacy Policy.

diff --git a/amp/src/main/webapp/code-of-conduct.html b/amp/src/main/webapp/code-of-conduct.html index 35d5423df5c..a2a811e8b82 100644 --- a/amp/src/main/webapp/code-of-conduct.html +++ b/amp/src/main/webapp/code-of-conduct.html @@ -4,14 +4,7 @@ AMP Code of Conduct - +
diff --git a/amp/src/main/webapp/privacy-policy.html b/amp/src/main/webapp/privacy-policy.html index 5be058bc03f..ac75ca4d024 100644 --- a/amp/src/main/webapp/privacy-policy.html +++ b/amp/src/main/webapp/privacy-policy.html @@ -4,13 +4,8 @@ AMP Privacy Policy + diff --git a/amp/src/main/webapp/resources/css/policy-pages.css b/amp/src/main/webapp/resources/css/policy-pages.css new file mode 100644 index 00000000000..05efd7c5a5f --- /dev/null +++ b/amp/src/main/webapp/resources/css/policy-pages.css @@ -0,0 +1,6 @@ +body { color: #222; font: 16px/1.6 Georgia, serif; margin: 0; } +#policy-page { margin: 0 auto; max-width: 780px; padding: 48px 24px 64px; } +h1, h2 { font-family: Georgia, serif; line-height: 1.2; } +h1 { border-bottom: 3px solid #2f6f8f; padding-bottom: 12px; } +h2 { color: #2f6f8f; margin-top: 32px; } +a { color: #1d5d7a; } From a20efa6e152f694bd36fa7e16e2f93ef98c0447d Mon Sep 17 00:00:00 2001 From: brianbrix Date: Tue, 1 Sep 2026 11:26:35 +0300 Subject: [PATCH 7/7] AMP-31202 : Allow privacy notice and code of conduct in auth --- amp/src/main/webapp/WEB-INF/applicationContext.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/amp/src/main/webapp/WEB-INF/applicationContext.xml b/amp/src/main/webapp/WEB-INF/applicationContext.xml index 7af9c51952d..b1f4564ad3f 100644 --- a/amp/src/main/webapp/WEB-INF/applicationContext.xml +++ b/amp/src/main/webapp/WEB-INF/applicationContext.xml @@ -54,6 +54,8 @@ + +