Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
24 changes: 24 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 4 additions & 0 deletions amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@
</label>

<input name="j_password" type="password" class="inputx" id="j_password">
<p style="font-size:11px; line-height:15px; margin:6px 0;">
<digi:trn>By signing in, you acknowledge that AMP processes account and activity information according to the</digi:trn>
<a href="/privacy-policy.html"><digi:trn>Privacy Policy</digi:trn></a>.
</p>
Comment thread
brianbrix marked this conversation as resolved.
Comment on lines +64 to +67
<div class="clear">
<input type="submit" class="buttonx_sm_lgn" onclick="ajaxLogin();return false" value="<digi:trn>Login</digi:trn>">
</div>
Expand Down
4 changes: 4 additions & 0 deletions amp/TEMPLATE/ampTemplate/layout/publicPortalLogin.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ var loginFailed = function(data, status) {

<div id="loginbox">
<div class="logintitle"><h2><digi:trn>Member Login</digi:trn></h2></div>
<div class="login-privacy-notice" style="font-size:11px; line-height:16px; margin:0 20px 10px; color:#555;">
<digi:trn>By signing in, you acknowledge that AMP processes account and activity information according to the</digi:trn>
<a href="/privacy-policy.html"><digi:trn>Privacy Policy</digi:trn></a>.
</div>
<form action="/aim/postLogin.do" id="loginForm" method="post"
onsubmit="ajaxLogin();return false;">
<p class="userfield">
Expand Down
2 changes: 1 addition & 1 deletion amp/TEMPLATE/ampTemplate/node_modules/amp-filter
2 changes: 1 addition & 1 deletion amp/TEMPLATE/ampTemplate/node_modules/amp-translate
7 changes: 7 additions & 0 deletions amp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
<version>4.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Aid Management Platform</name>
<licenses>
<license>
<name>GNU General Public License v3.0</name>
<url>https://www.gnu.org/licenses/gpl-3.0.html</url>
<distribution>repo</distribution>
</license>
</licenses>
<properties>
<wicketVersion>6.29.0</wicketVersion>
<tomcatVersion>8.5.73</tomcatVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*************************************************************************/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*************************************************************************/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*************************************************************************/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*************************************************************************/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*************************************************************************/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*************************************************************************/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*************************************************************************/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*************************************************************************/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*************************************************************************/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*************************************************************************/

Expand Down
8 changes: 3 additions & 5 deletions amp/src/main/java/org/digijava/module/um/util/DbUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions amp/src/main/webapp/WEB-INF/applicationContext.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
<http pattern="/robots.txt" security="none" />
<http pattern="/favicon.ico" security="none" />
<http pattern="/" security="none" />
<http pattern="/privacy-policy.html" security="none" />
<http pattern="/code-of-conduct.html" security="none" />

<http pattern="/translation/ajaxTranslator.do**" security="none" />

Expand Down
5 changes: 5 additions & 0 deletions amp/src/main/webapp/WEB-INF/jsp/aim/view/userRegistration.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,11 @@ Please do not attempt to use the Notification Email as user login.
<center>
<div class="reg_form_container">
<div class="home_sec_title"><digi:trn key="um:accountInfoAboutYou">Account information / about you </digi:trn></div>
<div class="registration-privacy-notice" style="font-size:12px; line-height:18px; margin:10px auto 14px; max-width:650px; text-align:left; color:#555;">
<digi:trn>To create an AMP account, you provide account information such as your name and email address.</digi:trn>
<digi:trn>Read the</digi:trn> <a href="/privacy-policy.html"><digi:trn>Privacy Policy</digi:trn></a>
<digi:trn>before registering. By submitting this form, you confirm that the information you provide may be used to create and administer your AMP account.</digi:trn>
</div>
<digi:instance property="aimUserRegisterForm" />
<digi:form action="/registerUser.do" method="post" onsubmit="return validateAimUserRegisterForm(this);">
<html:hidden property="orgType" />
Expand Down
36 changes: 36 additions & 0 deletions amp/src/main/webapp/code-of-conduct.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>AMP Code of Conduct</title>
<link rel="stylesheet" href="/resources/css/policy-pages.css">
</head>
<body>
<div id="policy-page">
<p><a href="/">Return to AMP</a></p>
<h1>AMP Code of Conduct</h1>

<p>We want the AMP project to be welcoming, professional, and constructive for everyone.</p>

<h2>Expected behaviour</h2>
<ul>
<li>Be respectful and considerate of other people and their backgrounds.</li>
<li>Use inclusive language and focus feedback on the work, not the person.</li>
<li>Keep discussions relevant, factual, and suitable for a professional project.</li>
<li>Respect privacy and do not publish personal or confidential information.</li>
</ul>

<h2>Unacceptable behaviour</h2>
<p>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.</p>

<h2>Reporting</h2>
<p>Report a concern to <a href="mailto:info@developmentgateway.org">info@developmentgateway.org</a>. 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.</p>

<h2>Enforcement</h2>
<p>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.</p>

<p>This page is the web version of the repository <a href="https://github.com/devgateway/amp/blob/main/CODE_OF_CONDUCT.md">Code of Conduct</a>.</p>
Comment thread
brianbrix marked this conversation as resolved.
</div>
</body>
</html>
Loading
Loading