From ccabd55e49b73924350418e9a780f8e0a658ca05 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 11 Oct 2022 17:22:05 -0500 Subject: [PATCH 1/4] feat(taccsite_custom): BM-26 new logo and favicon --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 5e583c353..0caf1fb71 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 5e583c3536b610b55f97446ac1a6577d60167660 +Subproject commit 0caf1fb71158d50f596104bef0cdda936dbdfcc3 From ffdbb6a4bc1df0a6d18a78b58c1c9f4dcec432f9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 12 Oct 2022 11:14:57 -0500 Subject: [PATCH 2/4] Revert "chore(taccsite_custom): retire apcd-cms here" This reverts commit 16bb02263f8b2cc1645ed3fc744bcdb32ae07852. --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 0caf1fb71..a10730f27 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 0caf1fb71158d50f596104bef0cdda936dbdfcc3 +Subproject commit a10730f27166e59713fb99a882cf8fe913845cad From 7d4ea6eea19ee42e0b07808634543cc18967a90d Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 12 Oct 2022 11:28:31 -0500 Subject: [PATCH 3/4] chore(taccsite_custom): BM-26 update with main --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index b4d0883dd..7c0cff188 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit b4d0883dd4e227aaecedf1d53e8afaf71bad7b1d +Subproject commit 7c0cff188c6aad0f3d2a5e74db74b16f90f328df From 5b70ced275f12bf73896579c0258db268634bbd3 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 12 Oct 2022 14:01:48 -0500 Subject: [PATCH 4/4] chore(taccsite_custom): merge dependent PR https://github.com/TACC/Core-CMS-Resources/pull/167 --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 7c0cff188..13ddfab0d 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 7c0cff188c6aad0f3d2a5e74db74b16f90f328df +Subproject commit 13ddfab0da16597c9a449c997e8ebb1c7b536d38