Skip to content

Commit

Permalink
Merge Split Branch
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Feb 8, 2024
2 parents 9ae2f70 + 3960a5a commit acdca2b
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 7 deletions.
18 changes: 18 additions & 0 deletions preview-update-submodules/.well-known/issuer.jwks
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,24 @@
"use": "sig",
"x": "jS5cVffYOKP9fXKysPiT4UhLGsXpsooxXW3kZHFM6aM=",
"y": "9LWogFfXPRUyGzcCQ9haXbBv-IKx_M5M6KX50M6zrWM="
},
{
"alg": "ES256",
"crv": "P-256",
"kid": "dcb8",
"kty": "EC",
"use": "sig",
"x": "uZuja5BBP-CCongrDM0z7rVKeGyieCW0T2bTRaEuyoY=",
"y": "eYtm6i8pyOFdfZz7ahmtiBQiC4ioUuwxAxc5txJRUFY="
},
{
"alg": "ES256",
"crv": "P-256",
"kid": "d402",
"kty": "EC",
"use": "sig",
"x": "eDK50R6M81DUUWU9JIW9obA02U4sRZQSPR44pcFnkSI=",
"y": "P8-SthnBHG5iwfSA1meV5ZV4tvobD4_6Mb_cPgiC9JA="
}
]
}
2 changes: 1 addition & 1 deletion preview-update-submodules/assets/search/index.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion preview-update-submodules/assets/search/metadata.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions preview-update-submodules/gis-story.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Preserving Historic Wisconsin aerial photos with a little help from CHTC</title>
<title>Preserving historic Wisconsin aerial photos with a little help from CHTC</title>
<script type="text/javascript">
function resizeIframe(iframe) {
var newheight;
Expand Down Expand Up @@ -244,7 +244,7 @@ <h1 id="site-title" class="uw-site-title">
<div class="row justify-content-center">
<div class="col-12 col-sm-11 col-md-9 col-lg-8">
<h1 class="uw-mini-bar mb-4">
Preserving Historic Wisconsin aerial photos with a little help from CHTC
Preserving historic Wisconsin aerial photos with a little help from CHTC
</h1>
<h3 id="associate-state-cartographer-jim-lacy-works-with-chtc-to-digitize-and-preserve-historical-aerial-photography-for-the-public">Associate State Cartographer Jim Lacy works with CHTC to digitize and preserve historical aerial photography for the public.</h3>

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion preview-update-submodules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ <h2 class="uw-mini-bar mt-1">

<div class="uw-card-copy">
<a href="/web-preview/preview-update-submodules/gis-story.html" class=" col-12">
<h4 class="uw-mini-bar">Preserving Historic Wisconsin aerial photos with a little help from CHTC</h4>
<h4 class="uw-mini-bar">Preserving historic Wisconsin aerial photos with a little help from CHTC</h4>
</a>
<div class="text-dark d-flex flex-row justify-content-between">

Expand Down
2 changes: 1 addition & 1 deletion preview-update-submodules/news.html
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ <h2>Read about some of CHTC’s latest news and projects:</h2>

<div class="uw-card-copy">
<a href="/web-preview/preview-update-submodules/gis-story.html" class="">
<h4 class="uw-mini-bar">Preserving Historic Wisconsin aerial photos with a little help from CHTC</h4>
<h4 class="uw-mini-bar">Preserving historic Wisconsin aerial photos with a little help from CHTC</h4>
</a>
<div class="text-dark d-flex flex-row justify-content-between">

Expand Down
25 changes: 25 additions & 0 deletions preview-update-submodules/people.html
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,31 @@ <h2 class="uw-mini-bar">
</div>
</div>

<div class="col-xl-2 col-md-3 col-sm-4 col-6">
<div class="bg-white team-card justify-content-center mb-3 flex-grow-1">
<div class="uw-card-content">
<div class="img-container" class="overflow-hidden d-flex justify-content-center">

<img src="/web-preview/preview-update-submodules/images/team/william_swanson.jpg" alt="Headshot for William Swanson">

</div>
<div class="uw-card-copy">
<div>
<h2 class="uw-mini-bar">

William Swanson

</h2>
<p>Research Cyberinfrastructure Specialist</p>
</div>
<div>
<span class="institution">University of Wisconsin–Madison</span>
</div>
</div>
</div>
</div>
</div>

</div>
<h2 class="uw-mini-bar">Students</h2>
<div class="row gx-1">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ <h3 id="known-to-support-persistent-connections">Known to support persistent con
</ol>
</li>
<li>
<p>Cyberduck (taken from <a href="https://s2.smu.edu/hpc/documentation/access.html">these docs</a></p>
<p>Cyberduck (taken from <a href="https://southernmethodistuniversity.github.io/hpc_docs/">these docs</a></p>

<p>Cyberduck does not use SSH configurations, therefore the following setting
can be used to enable connection persistence. Within Cyberduck:</p>
Expand Down

0 comments on commit acdca2b

Please sign in to comment.