Commit dd123428 authored by Martin Lowe's avatar Martin Lowe 🇨🇦
Browse files

Merge remote-tracking branch 'origin/dev' into malowe/master/1.4.6

parents 01d16aef 13c7bfe3
@Library('common-shared') _
pipeline {
agent {
kubernetes {
label 'buildenv-agent'
......@@ -102,6 +103,7 @@ pipeline {
options {
buildDiscarder(logRotator(numToKeepStr: '10'))
timeout(time: 30, unit: 'MINUTES')
}
stages {
......
......@@ -22,7 +22,7 @@ import org.eclipsefoundation.persistence.model.ParameterizedSQLStatementBuilder;
* @author Martin Lowe
*
*/
@Table
@Table(name = "v_FormStatusReport")
@Entity
public class FormStatusReport extends BareNode {
public static final DtoTable TABLE = new DtoTable(FormStatusReport.class, "fsr");
......
......@@ -624,7 +624,10 @@
"charter": "https://www.eclipse.org/org/workinggroups/science_charter.php",
"participation_agreements": {
"individual": null,
"organization": null
"organization": {
"document_id": "2fc4cedbbdb70b2ebf69",
"pdf": ""
}
},
"website": "https://science.eclipse.org",
"members": "https://science.eclipse.org/membership/",
......
......@@ -134,8 +134,6 @@ metadata:
namespace: foundation-internal-webdev-apps
annotations:
haproxy.router.openshift.io/timeout: 20s
haproxy.router.openshift.io/disable_cookies: "true"
haproxy.router.openshift.io/balance: roundrobin
spec:
host: "membership.eclipse.org"
path: "/"
......
......@@ -122,8 +122,6 @@ metadata:
namespace: foundation-internal-webdev-apps
annotations:
haproxy.router.openshift.io/timeout: 20s
haproxy.router.openshift.io/disable_cookies: "true"
haproxy.router.openshift.io/balance: roundrobin
spec:
host: "membership-staging.eclipse.org"
path: "/"
......
......@@ -247,6 +247,9 @@ html {
box-shadow: 1px 1px 14px rgba(0, 0, 0, 0.15);
border-radius: 5px;
}
.portal-login-page .portal-login-container .text-container {
width: 100%;
}
.portal-login-page .portal-login-container img {
width: 200px;
}
......
......@@ -26,7 +26,7 @@ export default function PortalLogin({ isFetchingUser, setIsFetchingUser }: Porta
<CircularProgress />
</div>
) : currentUserPortal?.name ? (
<div className="padding-left-30 padding-right-30">
<div className="text-container padding-left-30 padding-right-30">
<p>
Your account is not linked to a current Eclipse Foundation member. If your organization is a member,
please reach out to{' '}
......
......@@ -346,6 +346,9 @@ html {
box-shadow: 1px 1px 14px rgba(0, 0, 0, 0.15);
border-radius: @border-radius;
}
.text-container {
width: 100%;
}
img {
width: 200px;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment