-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
GH-73: Blockquote, Offset & Sample Plugins #275
Conversation
- Add basic "Offset Content" plugin. - matches existing usage - lacks new feature (center alignment) - Add support for Blockquote plugin inside text. - Add support for offset option in Blockquote plugin.
Allow search to be disabled for Portal. Allow indexing to be disabled for CMS.
Default Value (i.e. falsy): - Allow indexing for Portal CMS. - Disallow indexing for SAD CMS.
- Texascale: - Have c-offset-content extend o-offset-content styles - Add comment for legacy support and deprecation of c-offset-content
commit 425cdfb Merge: 3ad23ee e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:08:20 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 3ad23ee Merge: 20b00a8 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:21:53 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 20b00a8 Merge: e2d4fc0 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:23:19 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit e2d4fc0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:53:46 2021 -0500 GH-73: Add Missing Plugin Helper This code was lost during re-creation: - of #257 - as #275. commit d2ee161 Merge: 64c0894 374b78e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:50:53 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 64c0894 Merge: 89ce2c6 d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:38:32 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 89ce2c6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 23 18:41:23 2021 -0500 Noop: Existing Plugins: Comments, New Lines (Cherry-picked from `task/GH-93…` or `dev` as 29e929e "GH-93: Noop: Existing Plugins: Comments, New Lines".) commit a69c40c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 30 15:28:52 2021 -0500 Quick: Couple DIRECTION class names and choices commit 4ea2e1c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 20:20:20 2021 -0500 Quick: Polish Existing Plugins (cherry-picked from GH-93, new message) From b510c75 "GH-93: Polish Existing Plugins" on `task/GH-93…` or `dev` branch commit e44356b Merge: a7f46f6 053bcb2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 16:48:38 2021 -0500 Merge branch 'quick/clean-up-plugins-to-match-GH-93-plugins' into task/GH-73-tacc-blockquote-plugin commit a7f46f6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 16:42:55 2021 -0500 Quick: Submod: Merge main commit 053bcb2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jul 1 10:25:13 2021 -0500 Quick: Function doc improvements & additions commit 39e3d26 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jul 1 10:18:46 2021 -0500 Quick: Clean Up PLugins to Match GH-93 Plugins commit b76fda0 Merge: 3622661 a0104d4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 30 15:47:26 2021 -0500 Merge branch 'main' into dev commit 3622661 Merge: 10aaf2f 66380a2 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Fri Jun 25 16:10:17 2021 -0500 Merge pull request #261 from TACC/quick/support-plugins-unadulterated-by-bootstrap commit 66380a2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit a4f6b4d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit cd7e3e1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit df25f2b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 989c981 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit 10aaf2f Merge: 0b38c4a 9ce83d2 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Jun 22 12:21:27 2021 -0500 Merge pull request #258 from TACC/test/FP-1099-disabled-auto-search-reindex commit 0b38c4a Merge: 27b3dd3 0a82cd7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:55:58 2021 -0500 Merge branch 'dev' of github.com:TACC/Core-CMS into dev commit 27b3dd3 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:55:46 2021 -0500 Quick: Update taccsite_custom commit 0a82cd7 Merge: f48ecd2 956e12d Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Jun 22 10:31:39 2021 -0500 Merge pull request #257 from TACC/task/GH-73-tacc-blockquote-plugin commit 956e12d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:13:00 2021 -0500 GH-73: Texascale: Noop: Comment text tweak commit 3831732 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:00:28 2021 -0500 GH-73: Cleanup constants & helpers & offset commit 2eee71a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 09:09:55 2021 -0500 GH-73: Recreate migrations from zero commit cd45ab7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 08:54:10 2021 -0500 GH-73: Texascale: Use 2400px / `--max-wide-…` commit a047df5 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 21:05:13 2021 -0500 GH-73: Move `offset-…` max-width to media query commit 10c5748 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:51:09 2021 -0500 GH-73: Support quotes in blockquote via CSS commit d63e6ad Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:40:10 2021 -0500 GH-73: Texascale: Deprecate Bootstrap blockquote commit 4a55986 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:33:01 2021 -0500 GH-73: Rename c-offset-content model prop commit a7517d9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 18:42:05 2021 -0500 GH-73: Rename c-offset-content → o-offset-content - Texascale: - Have c-offset-content extend o-offset-content styles - Add comment for legacy support and deprecation of c-offset-content commit f972214 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 16:52:28 2021 -0500 GH-73: Collapse "Adv. Settings" for Offset… plugin commit 9ce83d2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 13:18:44 2021 -0500 FP-1099: Clarify Search feature value results Default Value (i.e. falsy): - Allow indexing for Portal CMS. - Disallow indexing for SAD CMS. commit 7ebecb1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 12:44:30 2021 -0500 FP-1099: Make Search a feature Allow search to be disabled for Portal. Allow indexing to be disabled for CMS. commit 98d4199 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 10:59:22 2021 -0500 GH-73: Move sample markup for blockquote into css commit c1bb7c7 Merge: 22232f0 f48ecd2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Sat Jun 19 15:17:59 2021 -0500 Merge branch 'main' into test/FP-1099-disabled-auto-search-reindex commit 22232f0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Sat Jun 19 15:03:43 2021 -0500 Quick: Update taccsite_custom to latest commit 3419a00 Merge: 444cfc1 f48ecd2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 18 21:41:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 580a7a5 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 18 14:19:53 2021 -0500 FP-1099: Test: Disable reindex on publish commit 444cfc1 Merge: eaa0a01 5918cce Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 16:34:11 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit eaa0a01 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 16:19:26 2021 -0500 GH-73: Update submodule to merge of main commit 4d5ee2b Merge: f3dac48 fb7f601 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 15:02:29 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit f3dac48 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 09:58:18 2021 -0500 GH-73: Blockquote: fix markup bug, post-dash space commit 59db295 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 09:26:34 2021 -0500 GH-73: Add offset plugin and offset to blockquote. - Add basic "Offset Content" plugin. - matches existing usage - lacks new feature (center alignment) - Add support for Blockquote plugin inside text. - Add support for offset option in Blockquote plugin. commit c73532e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 19:24:03 2021 -0500 GH-73: Finish blockquote plugin commit 6028f4a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 15:45:24 2021 -0500 GH-73: Finish first version of blockquote plugin commit 6ed391e Merge: d2c554d 828a5dd Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 10:37:19 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit d2c554d Merge: 6f9440d 2c50694 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 14 10:08:50 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 6f9440d Merge: aac4f5e 3d4b47c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon May 10 12:12:52 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit aac4f5e Merge: 1c34b4b 3deb6b4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Apr 22 10:06:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 1c34b4b Merge: 49a8163 2781c7e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Apr 14 17:33:39 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 49a8163 Merge: 0260226 27958c4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:52:26 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 0260226 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:16:08 2021 -0500 GH-73: Update blockquote based on GH-67 commit 0a9ae0c Merge: 556024f 541a74d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:10:00 2021 -0500 Merge branch 'task/GH-67-tacc-sample-plugin' into task/GH-73-tacc-blockquote-plugin commit 556024f Merge: 4b5b5c7 b8be85c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 19:02:54 2021 -0500 Merge branch 'task/GH-67-tacc-sample-plugin' into task/GH-73-tacc-blockquote-plugin commit 4b5b5c7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 19:02:42 2021 -0500 GH-73: Fix model desc typo commit 6d69a56 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 18:46:53 2021 -0500 GH-73: WIP Blockquote Plugin from Greet Plugin
|
✅ The submodule PR commits have been restored. This PR's description has been simplified. |
commit 8ca137498f4206b26f5e2a4df7ea98f41fce1b4b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Sep 1 12:11:54 2021 -0500 Squashed merge of main of the following: commit 8e4b58e3b2e7f3108a722d91350d477532fb8a11 Merge: 97f7df0 2aca7e6 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Wed Sep 1 12:10:40 2021 -0500 Merge pull request #278 from TACC/quick/support-plugins-unadulterated-by-bootstrap--for-main commit 2aca7e66d1e2dc8955ae99892bed076fe0e497ae Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:01:15 2021 -0500 Quick: Mark Bootstrap Link & Image as Depreacted commit 884194ec70f1bf0791697999959b0157d1d4df6d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 10:58:58 2021 -0500 Quick: More Comments commit 31e9da8205061055fa2b05b690818da063353d89 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:53:25 2021 -0500 Quick: Explain Try/Catch for Plugin Restoration commit 7c2f78a4e9f107037c372380d8885e931479a470 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:44:28 2021 -0500 Quick: Better Comments Restoring Generic Plugins commit 9d018e0fd70d6cfb6cbc3c20ba35ecea136cc19c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:35:14 2021 -0500 Quick: Fix Support for Unadulterated Link Plugin commit 9cf1e6700fff8557d04d38e2476fe3433d6722ae Merge: 7c617af 97f7df0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 07:54:50 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 97f7df069bf119ad51a1d85205a6ae0c63b71008 Merge: 08e09e7 afa0672 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 20:37:20 2021 -0500 Merge pull request #332 from TACC/task/GH-331-new-fullwidth-standard-templates commit afa06722fd357dee5eef6b37d096a96f16298387 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 20:33:44 2021 -0500 Quick: Update submod → main. Drop Frontera changes commit 735ec867b582b47a83a4f877e9ef1244027c8b9a Merge: b9f976d 08e09e7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:46:30 2021 -0500 Merge branch 'main' into task/GH-331-new-fullwidth-standard-templates commit 08e09e7a01d542c8198dfe1baeda12ad94f663b7 Merge: e80de90 15cafe8 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 17:44:40 2021 -0500 Merge pull request #333 from TACC/quick/update-submod-protx-secrets Quick: Update submod (ProTX secrets delta) commit 15cafe8a44061318609f5884f19457f9c523542a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:40:13 2021 -0500 Quick: Update submod (ProTX secrets delta) commit b9f976d5d68d6ef3b45225de98bd4f3a4d4ab810 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 15:10:01 2021 -0500 GH-331: Frontera: Remove now-superfluous comment commit 2be0bff7c9ac377b25dd07d91404779dbb132534 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 13:00:58 2021 -0500 GH-331: Frontera: Load via static, not staticfiles commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit 7c617af1aa88dd14b39e3764c0e42f8a8246b3e4 Merge: 0ddc50a e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 0ddc50a8e8dc66675172b9a0121f21b11b473c7f Merge: d662f24 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit d662f24607b58d07aa7d865d42ce5a8488829c82 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9ecc36fe5ea14a225ddb803f1f9777a3106 Merge: eda34fa 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34faa49ddcefcbbd5ced6e8473040082e4a03 Merge: 11f735c d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c49efed900e13b737c817ee3546fae9522 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dcdf29fdf312e7af312ce9a1fecb5679a9e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 78374510d25b0603d54e32e4a53d57b26a9c17a9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f4f4073a50ac853c49286123b2daed8c1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c13acf86bfe5fa9f77fa398ac7eb87cfe1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit af8a9c21d2cae1ec5642450ee475183f60f06973 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 14:51:32 2021 -0500 Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles of the following: (nothing, empty commit, I confirmed all merge conflicts were erroneous) commit db3aed1480da5d9653a62aed6741cfbdb08e9946 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:02:14 2021 -0500 Squashed merge of quick/support-plugins-unadulterated-by-bootstrap--for-main of the following: commit 2aca7e66d1e2dc8955ae99892bed076fe0e497ae Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:01:15 2021 -0500 Quick: Mark Bootstrap Link & Image as Depreacted commit 884194ec70f1bf0791697999959b0157d1d4df6d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 10:58:58 2021 -0500 Quick: More Comments commit 31e9da8205061055fa2b05b690818da063353d89 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:53:25 2021 -0500 Quick: Explain Try/Catch for Plugin Restoration commit 7c2f78a4e9f107037c372380d8885e931479a470 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:44:28 2021 -0500 Quick: Better Comments Restoring Generic Plugins commit 9d018e0fd70d6cfb6cbc3c20ba35ecea136cc19c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:35:14 2021 -0500 Quick: Fix Support for Unadulterated Link Plugin commit 9cf1e6700fff8557d04d38e2476fe3433d6722ae Merge: 7c617af 97f7df0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 07:54:50 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 97f7df069bf119ad51a1d85205a6ae0c63b71008 Merge: 08e09e7 afa0672 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 20:37:20 2021 -0500 Merge pull request #332 from TACC/task/GH-331-new-fullwidth-standard-templates commit afa06722fd357dee5eef6b37d096a96f16298387 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 20:33:44 2021 -0500 Quick: Update submod → main. Drop Frontera changes commit 735ec867b582b47a83a4f877e9ef1244027c8b9a Merge: b9f976d 08e09e7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:46:30 2021 -0500 Merge branch 'main' into task/GH-331-new-fullwidth-standard-templates commit 08e09e7a01d542c8198dfe1baeda12ad94f663b7 Merge: e80de90 15cafe8 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 17:44:40 2021 -0500 Merge pull request #333 from TACC/quick/update-submod-protx-secrets Quick: Update submod (ProTX secrets delta) commit 15cafe8a44061318609f5884f19457f9c523542a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:40:13 2021 -0500 Quick: Update submod (ProTX secrets delta) commit b9f976d5d68d6ef3b45225de98bd4f3a4d4ab810 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 15:10:01 2021 -0500 GH-331: Frontera: Remove now-superfluous comment commit 2be0bff7c9ac377b25dd07d91404779dbb132534 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 13:00:58 2021 -0500 GH-331: Frontera: Load via static, not staticfiles commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit 7c617af1aa88dd14b39e3764c0e42f8a8246b3e4 Merge: 0ddc50a e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 0ddc50a8e8dc66675172b9a0121f21b11b473c7f Merge: d662f24 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit d662f24607b58d07aa7d865d42ce5a8488829c82 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9ecc36fe5ea14a225ddb803f1f9777a3106 Merge: eda34fa 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34faa49ddcefcbbd5ced6e8473040082e4a03 Merge: 11f735c d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c49efed900e13b737c817ee3546fae9522 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dcdf29fdf312e7af312ce9a1fecb5679a9e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 78374510d25b0603d54e32e4a53d57b26a9c17a9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f4f4073a50ac853c49286123b2daed8c1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c13acf86bfe5fa9f77fa398ac7eb87cfe1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit a49f908ca44d470b4aad8b1c6370d44de31762aa Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 11:42:45 2021 -0500 Squashed merge of quick/support-plugins-unadulterated-by-bootstrap--for-main of the following: commit 884194ec70f1bf0791697999959b0157d1d4df6d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 10:58:58 2021 -0500 Quick: More Comments commit 31e9da8205061055fa2b05b690818da063353d89 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:53:25 2021 -0500 Quick: Explain Try/Catch for Plugin Restoration commit 7c2f78a4e9f107037c372380d8885e931479a470 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:44:28 2021 -0500 Quick: Better Comments Restoring Generic Plugins commit 9d018e0fd70d6cfb6cbc3c20ba35ecea136cc19c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:35:14 2021 -0500 Quick: Fix Support for Unadulterated Link Plugin commit 9cf1e6700fff8557d04d38e2476fe3433d6722ae Merge: 7c617af 97f7df0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 07:54:50 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 97f7df069bf119ad51a1d85205a6ae0c63b71008 Merge: 08e09e7 afa0672 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 20:37:20 2021 -0500 Merge pull request #332 from TACC/task/GH-331-new-fullwidth-standard-templates commit afa06722fd357dee5eef6b37d096a96f16298387 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 20:33:44 2021 -0500 Quick: Update submod → main. Drop Frontera changes commit 735ec867b582b47a83a4f877e9ef1244027c8b9a Merge: b9f976d 08e09e7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:46:30 2021 -0500 Merge branch 'main' into task/GH-331-new-fullwidth-standard-templates commit 08e09e7a01d542c8198dfe1baeda12ad94f663b7 Merge: e80de90 15cafe8 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 17:44:40 2021 -0500 Merge pull request #333 from TACC/quick/update-submod-protx-secrets Quick: Update submod (ProTX secrets delta) commit 15cafe8a44061318609f5884f19457f9c523542a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:40:13 2021 -0500 Quick: Update submod (ProTX secrets delta) commit b9f976d5d68d6ef3b45225de98bd4f3a4d4ab810 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 15:10:01 2021 -0500 GH-331: Frontera: Remove now-superfluous comment commit 2be0bff7c9ac377b25dd07d91404779dbb132534 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 13:00:58 2021 -0500 GH-331: Frontera: Load via static, not staticfiles commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit 7c617af1aa88dd14b39e3764c0e42f8a8246b3e4 Merge: 0ddc50a e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 0ddc50a8e8dc66675172b9a0121f21b11b473c7f Merge: d662f24 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit d662f24607b58d07aa7d865d42ce5a8488829c82 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9ecc36fe5ea14a225ddb803f1f9777a3106 Merge: eda34fa 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34faa49ddcefcbbd5ced6e8473040082e4a03 Merge: 11f735c d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c49efed900e13b737c817ee3546fae9522 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dcdf29fdf312e7af312ce9a1fecb5679a9e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 78374510d25b0603d54e32e4a53d57b26a9c17a9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f4f4073a50ac853c49286123b2daed8c1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c13acf86bfe5fa9f77fa398ac7eb87cfe1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit 217d0a553a0eed013eaa05f750e7a26cd30d8cb9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 13:02:07 2021 -0500 Quick: Update submodule to its latest commit 1edbb038c19cfa9e951b2eb8cfd8d54b7ede0153 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 12:17:21 2021 -0500 Squashed merge of task/GH-331-new-fullwidth-standard-templates of the following: commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit d6ebf9b71fd6875032463a4880527ef3555a683f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 09:53:26 2021 -0500 Squashed merge of task/GH-83-callout-element of the following: commit 75a6ecebd1e9cc68626885f427422b060c67b3db Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 09:51:01 2021 -0500 GH-83: Fix: Ensure 0001 taccsite_callout migration See d01c8cf for details. commit fa185d0140f45607df01f73cf91f5e2f2fffcd79 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 15:04:29 2021 -0500 GH-83/GH-321: Show image on narrow windows commit 66eae8f47b8cee14b0a2bd5b8214c824b15a161c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:35:59 2021 -0500 GH-321: Fix figure size and note about its resize commit a7134e21c129ab8ce1cea9f229b393169275429f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:25:01 2021 -0500 GH-83: Quick: Update script comments & equality - Update comments for clarity and accuracy and scope. - Update equality that was not explicit enough. commit 1a57226619c01cebf5afb2b834976b3acff25485 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:08:18 2021 -0500 GH-83: Support Optional Image/Link in CSS Docblock The plugin may require a link and should require an image (GH-328)… But the styles (and template) work fine without either. commit 5059e02f5a4244ddc735ef8bbb541c0a7893858b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 10:07:26 2021 -0500 GH-83: Require all fields (can't require image) commit a07957ea33e5455d87faf8cc1df799a7f9a91abe Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 09:48:21 2021 -0500 GH-83: Add two relevant docs from PR #280 SEE: https://github.com/TACC/Core-CMS/pull/280/ SEE: https://github.com/TACC/Core-CMS/blob/579f5c6/taccsite_cms/contrib/_docs/ commit 7ffceebca8b873da46d417d0aa74e0fecad4b8a0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 09:29:14 2021 -0500 GH-321: Default to not resize image. Add warning. - Add helper to get a model name. - Simplify user instruction for fixing caveat. - Do not allow normal user to check resize field. - Hide field and caveat details in "Advanced settings". - Default resize field to false. commit 9767d455a00157fc1b8bc7ad1c9426301dfbbdcc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:56:56 2021 -0500 GH-321: Resize Callout image to parent height CAVEAT: The addition to 0001 migration was manual and is untested. commit acefadfbd1e74ff7d6479049856a6be949db0e74 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:10:57 2021 -0500 GH-83/GH-321: Add missing static template tag load commit d59c3f63b358868c4cbe0c2a76ed0c1dfe3aa0e2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:07:24 2021 -0500 GH-83: Squash migrations. Accept GH-321 as part of GH-83. commit df1060bdad9f680a1f2e76ace22e0b9e6897340c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:01:27 2021 -0500 GH-83: Add missing helper clean_for_abstract_link commit 51d3f1d9482a0ab6d147e76bbccf4e9593e78771 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:26:20 2021 -0500 GH-83: Support Hyperlink (requires 69f47cc) Requires new `x-article-link-active` mixin. The reason 0003 is added, not 0002, is cuz extending branch added 0002: - site/frontera/task/GH-83-callout-element--GH-321-resize-callout-image (there, the 0003 migration has 0002 as a dependency) (here, the 0003 migration has 0001 as a dependency) When a proper main-extending branch is made, this should still happen: - task/GH-83-callout-element--GH-321-resize-callout-image - task/GH-321-resize-callout-image (there, the 0003 migration will have ??? as a dependency) Good luck, Wes. commit ed0e74902e9d1b687e81b460b6b7b620ceb8ca05 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:24:45 2021 -0500 Quick: Add x-article-link-active mixin commit 1266e4e34f136b1e4ea4271327f2dc0d637978ea Merge: 54fc04a 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:18:48 2021 -0500 Merge branch 'main' into task/GH-83-callout-element commit 54fc04a706581eacc62b5c9d20dd80fb3ed7646d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 14:05:36 2021 -0500 GH-83: Quick: Remove temp snippet commit c24e0f9c0af615cecac4e48363c99427cedb3aff Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:30:29 2021 -0500 GH-83: Noop: Add markup whitespace for legibility commit dba3f4b8cfd6cdd38abb23bac453ee433a795818 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:03:37 2021 -0500 GH-83: Remove leftover templates commit a15e585587a49a4a2753e9ad6a073c40e83e209f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:50:15 2021 -0500 GH-83: Fix Callout Plugin, Update Styles to Match commit 4fa354cd6ca120c47638184ade411dbe4c25afce Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:09:41 2021 -0500 GH-83: Fix Callout Component after Plugin's tweaks commit c15d7667864ba8f879d35a4d6b02eb1d3ea52705 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:53:49 2021 -0500 GH-83: WIP: Callout Plugin commit c2c96ecbed4a45df1be98337d214bbb5b84a2ae0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:25 2021 -0500 GH-83: Temp: Callout Snippet (Frontera) commit 82b768ff9b6650f21f5d699666cd40ba6a327073 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:02 2021 -0500 GH-83: Callout Component commit 736a0be8c78c074b00bc74241ae8e509df7e3ecc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:21:46 2021 -0500 Quick: Update submodule to its site/frontera/main commit 52c8ef79304ab7769da4eb5a15d0bbb0ba40a670 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:10:03 2021 -0500 Squashed merge of task/GH-73-tacc-blockquote-plugin of the following: commit 425cdfbe31273e76ff9dc3674a2ec839b2d0a210 Merge: 3ad23ee e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:08:20 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 3ad23ee0eca8dcf42d2ae2959efeae9df4e5eb02 Merge: 20b00a8 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:21:53 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 20b00a8dc38fdde2ee364bd03e90d0e5b4465ab5 Merge: e2d4fc0 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:23:19 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit e2d4fc078093f70a99dc06a162872d28d856e6cd Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:53:46 2021 -0500 GH-73: Add Missing Plugin Helper This code was lost during re-creation: - of https://github.com/TACC/Core-CMS/pull/257 - as https://github.com/TACC/Core-CMS/pull/275. commit d2ee16101ecb7898a499262a1fc0c08818f0e088 Merge: 64c0894 374b78e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:50:53 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 64c089498958d96078bd7a8aa05cc41628bfd518 Merge: 89ce2c6 d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:38:32 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 89ce2c60e588840399079bdade22e41cf08e8e59 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 23 18:41:23 2021 -0500 Noop: Existing Plugins: Comments, New Lines (Cherry-picked from `task/GH-93…` or `dev` as 29e929ed "GH-93: Noop: Existing Plugins: Comments, New Lines".) commit a69c40c49817c6352f938ad8167d289c097f6405 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 30 15:28:52 2021 -0500 Quick: Couple DIRECTION class names and choices commit 4ea2e1c1810f06f3db3d17d7c2148b3c3bdc907a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 20:20:20 2021 -0500 Quick: Polish Existing Plugins (cherry-picked from GH-93, new message) From b510c757 "GH-93: Polish Existing Plugins" on `task/GH-93…` or `dev` branch commit e44356b867875afb98a663a997fb00d20204908a Merge: a7f46f6 053bcb2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 16:48:38 2021 -0500 Merge branch 'quick/clean-up-plugins-to-match-GH-93-plugins' into task/GH-73-tacc-blockquote-plugin commit a7f46f6709f9ee2f1756b6c3ffc9f7a57571515a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 16:42:55 2021 -0500 Quick: Submod: Merge main commit 053bcb28aa3dc71ae3ca403b9fcde0ed7992cffb Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jul 1 10:25:13 2021 -0500 Quick: Function doc improvements & additions commit 39e3d26985f9fcc95cb800c910d7230d4d936b62 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jul 1 10:18:46 2021 -0500 Quick: Clean Up PLugins to Match GH-93 Plugins commit b76fda0db85bbfb7b40ac05120f2b9d839c01ecb Merge: 3622661 a0104d4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 30 15:47:26 2021 -0500 Merge branch 'main' into dev commit 3622661cad36714d1969ab799c51b3422bf05bc0 Merge: 10aaf2f 66380a2 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Fri Jun 25 16:10:17 2021 -0500 Merge pull request #261 from TACC/quick/support-plugins-unadulterated-by-bootstrap commit 66380a23f227b69f56f89b8aff1c46a54b2d1931 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit a4f6b4d10dfb090687f57f6fcc8eacf758ff55a2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit cd7e3e123a33839a868c99b6b897110dd424986f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit df25f2b1ff0bb7f3d5eb07d769206f2e385eddfd Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 989c981f903583b08d154a8974741c63182188d3 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit 10aaf2f0a1ed43082c01e305a87980665577e6b3 Merge: 0b38c4a 9ce83d2 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Jun 22 12:21:27 2021 -0500 Merge pull request #258 from TACC/test/FP-1099-disabled-auto-search-reindex commit 0b38c4af7a95b95c3a9b9c80cf33579a4907062d Merge: 27b3dd3 0a82cd7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:55:58 2021 -0500 Merge branch 'dev' of github.com:TACC/Core-CMS into dev commit 27b3dd3990f847ba3c8e30dd3a18c2ad034eee0c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:55:46 2021 -0500 Quick: Update taccsite_custom commit 0a82cd70c6eef78baba15403e300a7bf50191a1f Merge: f48ecd2 956e12d Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Jun 22 10:31:39 2021 -0500 Merge pull request #257 from TACC/task/GH-73-tacc-blockquote-plugin commit 956e12dce53209de38a72645b67b1de0c09254ee Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:13:00 2021 -0500 GH-73: Texascale: Noop: Comment text tweak commit 38317320c1563557e9dc1cf876869425e6ceef22 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:00:28 2021 -0500 GH-73: Cleanup constants & helpers & offset commit 2eee71a35ff48ac5e3f51fd3da908c407056bd9b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 09:09:55 2021 -0500 GH-73: Recreate migrations from zero commit cd45ab75e348cca784a52ded56fcaa1d6f490230 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 08:54:10 2021 -0500 GH-73: Texascale: Use 2400px / `--max-wide-…` commit a047df5e7e360b7f33235933c2bdfab86d90111e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 21:05:13 2021 -0500 GH-73: Move `offset-…` max-width to media query commit 10c57480dc100b7199559f295aa2392c79bfd7b3 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:51:09 2021 -0500 GH-73: Support quotes in blockquote via CSS commit d63e6ad113b2f5f52cd7fde4e92616931870bdb9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:40:10 2021 -0500 GH-73: Texascale: Deprecate Bootstrap blockquote commit 4a55986178777fe698226aa9e6b752cd35306e3b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:33:01 2021 -0500 GH-73: Rename c-offset-content model prop commit a7517d9c45efa915bc21081d7e87e1ed01f1fc59 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 18:42:05 2021 -0500 GH-73: Rename c-offset-content → o-offset-content - Texascale: - Have c-offset-content extend o-offset-content styles - Add comment for legacy support and deprecation of c-offset-content commit f972214da05f2d9e081db00e62296eeeaba5d857 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 16:52:28 2021 -0500 GH-73: Collapse "Adv. Settings" for Offset… plugin commit 9ce83d2977c1a253afe4b4cb9e571a79444585e2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 13:18:44 2021 -0500 FP-1099: Clarify Search feature value results Default Value (i.e. falsy): - Allow indexing for Portal CMS. - Disallow indexing for SAD CMS. commit 7ebecb1dc58152c21ed3241c242cc4c6a6dd09be Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 12:44:30 2021 -0500 FP-1099: Make Search a feature Allow search to be disabled for Portal. Allow indexing to be disabled for CMS. commit 98d419965d35ac45e94b685853e8c00ad64c016e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 10:59:22 2021 -0500 GH-73: Move sample markup for blockquote into css commit c1bb7c74c0fbff34508acc81b9bb1d3251c3ec23 Merge: 22232f0 f48ecd2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Sat Jun 19 15:17:59 2021 -0500 Merge branch 'main' into test/FP-1099-disabled-auto-search-reindex commit 22232f0a10b6dcd51aed684927a6e699357311fa Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Sat Jun 19 15:03:43 2021 -0500 Quick: Update taccsite_custom to latest commit 3419a002c303e15b01bc9c13310ed14680eebdde Merge: 444cfc1 f48ecd2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 18 21:41:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 580a7a5e306b88ee8cf3c8f368dcd830615fc434 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 18 14:19:53 2021 -0500 FP-1099: Test: Disable reindex on publish commit 444cfc15c77a1f7ce0852de7c5e3d543dad18d5d Merge: eaa0a01 5918cce Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 16:34:11 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit eaa0a01abd472ed131ddee52622fa1db4e511222 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 16:19:26 2021 -0500 GH-73: Update submodule to merge of main commit 4d5ee2b4f0756ebb73bb39626f91321e4e102203 Merge: f3dac48 fb7f601 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 15:02:29 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit f3dac48fb0f9d069d42841d986d636c0296e6590 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 09:58:18 2021 -0500 GH-73: Blockquote: fix markup bug, post-dash space commit 59db29512b8b8a9d0badea0fc6a69eaf876452bf Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 09:26:34 2021 -0500 GH-73: Add offset plugin and offset to blockquote. - Add basic "Offset Content" plugin. - matches existing usage - lacks new feature (center alignment) - Add support for Blockquote plugin inside text. - Add support for offset option in Blockquote plugin. commit c73532e452171c48e72e03ca3531f9dbac33ff5b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 19:24:03 2021 -0500 GH-73: Finish blockquote plugin commit 6028f4aff5270cc47885bb615eb432f2e0c12cad Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 15:45:24 2021 -0500 GH-73: Finish first version of blockquote plugin commit 6ed391e90c286d29a03997d6df945a40f19ada75 Merge: d2c554d 828a5dd Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 10:37:19 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit d2c554d153980d192eaa932df1a4c148faa88966 Merge: 6f9440d 2c50694 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 14 10:08:50 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 6f9440d86108a203d2a2fa99269b041e7a264bbe Merge: aac4f5e 3d4b47c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon May 10 12:12:52 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit aac4f5e197fffe5b5b741910343155bd3f93bf5e Merge: 1c34b4b 3deb6b4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Apr 22 10:06:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 1c34b4bd823dae176090060b5eb5d98cc882499e Merge: 49a8163 2781c7e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Apr 14 17:33:39 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 49a8163d84bbb11dd4a1ce2d6382617bcc84e937 Merge: 0260226 27958c4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:52:26 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 0260226af608deb05adfc54413b5df10a0c01d9f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:16:08 2021 -0500 GH-73: Update blockquote based on GH-67 commit 0a9ae0cbb3fa42e86b3c9e488be2a470742e0250 Merge: 556024f 541a74d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:10:00 2021 -0500 Merge branch 'task/GH-67-tacc-sample-plugin' into task/GH-73-tacc-blockquote-plugin commit 556024f1298e76578f8335e99e8732d2001417fb Merge: 4b5b5c7 b8be85c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 19:02:54 2021 -0500 Merge branch 'task/GH-67-tacc-sample-plugin' into task/GH-73-tacc-blockquote-plugin commit 4b5b5c74b5b6e1c0dc4f3f2c1cbfe4d64712cf97 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 19:02:42 2021 -0500 GH-73: Fix model desc typo commit 6d69a561007512b7397fe78d6f46914b7682cc04 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 18:46:53 2021 -0500 GH-73: WIP Blockquote Plugin from Greet Plugin commit b96869201053ab8eb9523bc229117c3b6be5c5a1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:04:10 2021 -0500 Squashed merge of task/GH-88-system-specs of the following: commit b57e072b16b46a040a515b8501bb908f301ad491 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 10:43:42 2021 -0500 GH-88: Do not allow Bootstrap Picture commit fd5ed6195aa06c237687e4981f47b87063a2c3c0 Merge: 0bfb57f 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:25:11 2021 -0500 Merge branch 'main' into task/GH-88-system-specs commit 0bfb57fe35fa3d9966cb5ebc507bc9a23f59dcf6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 15:03:21 2021 -0500 GH-88: Noop: Cleanup commit a64592daf7448a1983aa27100c5d50fbd9a0abdb Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 12:58:00 2021 -0500 GH-88: Add missing taccsite helper and constant commit 3b179f79a9954e369ef04149e162ae8b12a0499c Merge: 52b408b 610a49a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 12:17:21 2021 -0500 Merge branch 'main' into task/GH-88-system-specs commit 52b408b3e1388bab087920aee9344e519bfed674 Merge: c2616c0 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:24:02 2021 -0500 Merge branch 'main' into task/GH-88-system-specs commit c2616c0de47fa78d3cba9c7dd047ce1e8b1971f4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 15:26:23 2021 -0500 GH-88: Rename child plugin Sysmon to SystemMonitor This prepares for the rename that occurs in task/GH-89. commit 732b99c926cf4a7e6a5eeb82be90b03309a674b6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:19:25 2021 -0500 GH-88: Fix incorrect var name (font-size→weight) commit 5f5eb56e6339464619266632b64e66319c5532ed Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:00:21 2021 -0500 GH-88: Document support for app stylesheets commit 2c28f4a403b3baccb35a59ebeab86d3eb711fa81 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 05:04:32 2021 -0500 GH-88: Set plugin font size and weight commit e5748a1afdb5866e45417388e544aabad46c2855 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 12 16:47:37 2021 -0500 GH-88: SystemSpecs: Fix Bug using Generic Image commit 3fb8a3056478a351432afae77347748fcf70ba3b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 12 16:13:13 2021 -0500 GH-88: SystemSpecs: Support Sysmon Image DataList For System Monitor, Image / Picture, and DataList: - Limit System Specs child plugins to these. - Style these in System Monitor layout. - Load System Monitor styles via new `app.*` stylesheet. commit 491c385d6ac019e80d5bbe9a635786a47ab88ecc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 05:01:52 2021 -0500 GH-88: Update submod (merge main) commit eba88c0b0ec81afb9415d4ec22208aa3d7864719 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 6 12:56:41 2021 -0500 GH-88: SystemSpecs: Fix Dup. Internal Link Opt Do not let "Internal Link" have duplicate options. commit 45f07cf9bac85f51a59cf85cca84b210aaead0df Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 6 00:10:23 2021 -0500 GH-88: SystemSpecs: Enable Link (Has Admin Bug) Enable the link by adding missing context variables. TODO: Prevent duplicate entires in "Internal Link". commit e5fa6c4658b3f673f484883f661891616b02c349 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 5 23:39:16 2021 -0500 GH-88: SystemSpecs: Integrate DataList - Add DataList plugin support. - Require description. - Edit "Resources Title" verbose name. - Update To Do list. - Rebuild migrations. - Rebuild specifications using table. commit 4e40d66ed81e27e4d6a4bbabf23c201c75767229 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 4 12:51:47 2021 -0500 GH-88: Initial SystemSpecs (see TODO.md) commit 0b102dfe83d31094f8330b4d40cf566bf4ef501a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:02:02 2021 -0500 Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts of the following: commit 579f5c6a0f94b1ea8329d2bb3cbb93ff01beb0a8 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:25:31 2021 -0500 Docs: Corrections to "How to Extend Plugin" doc commit 3bdde39258aca0c15e0c735e749a9fd716141734 Merge: 266a9ad 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:18:22 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit 266a9adfcc42d6637471fd955a04498b8da7abf8 Merge: 647d394 a66033a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:09:17 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit 647d394e8d67f43184224649f2f038f67f1be788 Merge: dcf606c ac6d873 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 17:19:26 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit dcf606cfda2c76f894086764412a183913f7e7f4 Merge: 74b9a9c e0e420d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 17:04:52 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit 74b9a9c5029ed786e43de23319249696fc17f172 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 05:52:08 2021 -0500 GH-93: Avoid title color bug with upcoming PR #312 Ensure heading turns white. commit 1729430fce740e7d77a80f5294ebe31e99c64e13 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:43:29 2021 -0500 GH-142, GH-133: Article List Plugin Helpers This code was lost during re-creation: - of https://github.com/TACC/Core-CMS/pull/264 - as https://github.com/TACC/Core-CMS/pull/280. commit eea07689bc7aada961a9a02333a1ee8dadffb7aa Merge: 89b1136 374b78e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 12:46:27 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit 89b11363442836eda4799ebd4842cc2823969432 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jul 20 17:24:37 2021 -0500 GH-93: Frontera: Plugin-less style … — Real Fix commit 5bd64840bd0d19565238e678d44dfa8c0542bb6c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jul 20 17:23:30 2021 -0500 GH-93: Frontera: Plugin-less style … snippet — Fix commit f6b8f3aa00ce5918ed7f132ae6e80c69407d2e5a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jul 20 17:03:17 2021 -0500 GH-93: Frontera: Plugin-less style updates snippet commit b531503dd5e9c8a29c7327dc7713081dccec60d3 Merge: 2b66f11 302fe3b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jul 20 16:58:15 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit 2b66f11f5f23da70f204a52ef1f1287e51f9b161 Merge: 2bdf7e7 d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:38:53 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit 2bdf7e70faa42580d96a737be5b8bf7666177f1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 20:55:42 2021 -0500 GH-93, GH-142, GH-133: Article List Plugins+Styles commit b250ed412432853ba2231f7403e7393b42782f2a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 16:58:18 2021 -0500 Squashed merge of quick/support-plugins-unadulterated-by-bootstrap--for-main of the following: commit 7c617af1aa88dd14b39e3764c0e42f8a8246b3e4 Merge: 0ddc50a e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 0ddc50a8e8dc66675172b9a0121f21b11b473c7f Merge: d662f24 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit d662f24607b58d07aa7d865d42ce5a8488829c82 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9ecc36fe5ea14a225ddb803f1f9777a3106 Merge: eda34fa 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34faa49ddcefcbbd5ced6e8473040082e4a03 Merge: 11f735c d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c49efed900e13b737c817ee3546fae9522 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dcdf29fdf312e7af312ce9a1fecb5679a9e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 78374510d25b0603d54e32e4a53d57b26a9c17a9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f4f4073a50ac853c49286123b2daed8c1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c13acf86bfe5fa9f77fa398ac7eb87cfe1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit 4b97bad78afe02894bc51e2a026d709f3b616502 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 16:57:53 2021 -0500 Squashed merge of task/GH-83-callout-element of the following: commit fa185d0140f45607df01f73cf91f5e2f2fffcd79 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 15:04:29 2021 -0500 GH-83/GH-321: Show image on narrow windows commit 66eae8f47b8cee14b0a2bd5b8214c824b15a161c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:35:59 2021 -0500 GH-321: Fix figure size and note about its resize commit a7134e21c129ab8ce1cea9f229b393169275429f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:25:01 2021 -0500 GH-83: Quick: Update script comments & equality - Update comments for clarity and accuracy and scope. - Update equality that was not explicit enough. commit 1a57226619c01cebf5afb2b834976b3acff25485 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:08:18 2021 -0500 GH-83: Support Optional Image/Link in CSS Docblock The plugin may require a link and should require an image (GH-328)… But the styles (and template) work fine without either. commit 5059e02f5a4244ddc735ef8bbb541c0a7893858b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 10:07:26 2021 -0500 GH-83: Require all fields (can't require image) commit a07957ea33e5455d87faf8cc1df799a7f9a91abe Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 09:48:21 2021 -0500 GH-83: Add two relevant docs from PR #280 SEE: https://github.com/TACC/Core-CMS/pull/280/ SEE: https://github.com/TACC/Core-CMS/blob/579f5c6/taccsite_cms/contrib/_docs/ commit 7ffceebca8b873da46d417d0aa74e0fecad4b8a0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 09:29:14 2021 -0500 GH-321: Default to not resize image. Add warning. - Add helper to get a model name. - Simplify user instruction for fixing caveat. - Do not allow normal user to check resize field. - Hide field and caveat details in "Advanced settings". - Default resize field to false. commit 9767d455a00157fc1b8bc7ad1c9426301dfbbdcc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:56:56 2021 -0500 GH-321: Resize Callout image to parent height CAVEAT: The addition to 0001 migration was manual and is untested. commit acefadfbd1e74ff7d6479049856a6be949db0e74 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:10:57 2021 -0500 GH-83/GH-321: Add missing static template tag load commit d59c3f63b358868c4cbe0c2a76ed0c1dfe3aa0e2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:07:24 2021 -0500 GH-83: Squash migrations. Accept GH-321 as part of GH-83. commit df1060bdad9f680a1f2e76ace22e0b9e6897340c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:01:27 2021 -0500 GH-83: Add missing helper clean_for_abstract_link commit 51d3f1d9482a0ab6d147e76bbccf4e9593e78771 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:26:20 2021 -0500 GH-83: Support Hyperlink (requires 69f47cc) Requires new `x-article-link-active` mixin. The reason 0003 is added, not 0002, is cuz extending branch added 0002: - site/frontera/task/GH-83-callout-element--GH-321-resize-callout-image (there, the 0003 migration has 0002 as a dependency) (here, the 0003 migration has 0001 as a dependency) When a proper main-extending branch is made, this should still happen: - task/GH-83-callout-element--GH-321-resize-callout-image - task/GH-321-resize-callout-image (there, the 0003 migration will have ??? as a dependency) Good luck, Wes. commit ed0e74902e9d1b687e81b460b6b7b620ceb8ca05 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:24:45 2021 -0500 Quick: Add x-article-link-active mixin commit 1266e4e34f136b1e4ea4271327f2dc0d637978ea Merge: 54fc04a 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:18:48 2021 -0500 Merge branch 'main' into task/GH-83-callout-element commit 54fc04a706581eacc62b5c9d20dd80fb3ed7646d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 14:05:36 2021 -0500 GH-83: Quick: Remove temp snippet commit c24e0f9c0af615cecac4e48363c99427cedb3aff Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:30:29 2021 -0500 GH-83: Noop: Add markup whitespace for legibility commit dba3f4b8cfd6cdd38abb23bac453ee433a795818 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:03:37 2021 -0500 GH-83: Remove leftover templates commit a15e585587a49a4a2753e9ad6a073c40e83e209f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:50:15 2021 -0500 GH-83: Fix Callout Plugin, Update Styles to Match commit 4fa354cd6ca120c47638184ade411dbe4c25afce Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:09:41 2021 -0500 GH-83: Fix Callout Component after Plugin's tweaks commit c15d7667864ba8f879d35a4d6b02eb1d3ea52705 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:53:49 2021 -0500 GH-83: WIP: Callout Plugin commit c2c96ecbed4a45df1be98337d214bbb5b84a2ae0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:25 2021 -0500 GH-83: Temp: Callout Snippet (Frontera) commit 82b768ff9b6650f21f5d699666cd40ba6a327073 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:02 2021 -0500 GH-83: Callout Component commit e80de906635960698d9e3585aa217ff71e08e015 Merge: 2689b8b bbef103 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 24 08:40:16 2021 -0500 Merge pull request #326 from TACC/hotfix/GH-75-data-list-field-desc-db-migration commit bbef103d71cfad0e2d4a36fc4fcbb71efa351aa8 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:15:54 2021 -0500 GH-75: Hotfix: Add missing (small) db migration
commit 0e26b591ea21c8f08749105fa8901b81204e72ee Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Sep 1 12:49:45 2021 -0500 Squashed merge of site/frontera/task/GH-88-system-specs of the following: commit fa03b2d4b016dd4bce4d84b102997d95619229ad Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 10:43:42 2021 -0500 GH-88: Do not allow Bootstrap Picture commit 2537d47751871cdacbc4d4def1a197ce32264237 Merge: 1d25c5d 2da390c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 16:23:09 2021 -0500 Merge branch 'site/frontera/main' into site/frontera/task/GH-88-system-specs commit 2da390c5c7de0d0f5b498b66fc5a0f9ae805424a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 16:22:38 2021 -0500 Squashed merge of site/frontera/task/GH-88-system-specs at commit 1d25c5d commit 1d25c5dde61779999da87a9c4779f44f250d4c3a Merge: 35602d0 37fa111 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 16:20:51 2021 -0500 Merge branch 'site/frontera/main' into site/frontera/task/GH-88-system-specs commit 35602d07feac98ed8ea27b20ef49e9da155947c6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 16:19:56 2021 -0500 Squashed merge of site/frontera/main at commit 37fa1117 commit 37fa1117d4a2f9dcc68815836d7c3c3e5dc4a277 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 16:15:47 2021 -0500 Squashed merge of site/frontera/task/GH-83-callout-element--GH-321-resize-callout-image at commit b50a8ad commit c481500609d456361069b6914fcb408b8cc06003 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:35:59 2021 -0500 GH-321: Fix figure size and note about its resize commit eadcccd1835105e55f8715ce3cccd4fc9e8b8569 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:25:01 2021 -0500 GH-83: Quick: Update script comments & equality - Update comments for clarity and accuracy and scope. - Update equality that was not explicit enough. commit 0ebed91865ac7ec02c315d45c3f7ce92f174b9c1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:08:18 2021 -0500 GH-83: Support Optional Image/Link in CSS Docblock The plugin may require a link and should require an image (GH-328)… But the styles (and template) work fine without either. commit c1f01ee2f7136db3736a4a0646a7860e86937af7 Merge: ab13f49 5059e02 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 11:52:45 2021 -0500 Merge branch 'task/GH-83-callout-element' into site/frontera/task/GH-83-callout-element--GH-321-resize-callout-image commit 5059e02f5a4244ddc735ef8bbb541c0a7893858b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 10:07:26 2021 -0500 GH-83: Require all fields (can't require image) commit a07957ea33e5455d87faf8cc1df799a7f9a91abe Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 09:48:21 2021 -0500 GH-83: Add two relevant docs from PR #280 SEE: https://github.com/TACC/Core-CMS/pull/280/ SEE: https://github.com/TACC/Core-CMS/blob/579f5c6/taccsite_cms/contrib/_docs/ commit 7ffceebca8b873da46d417d0aa74e0fecad4b8a0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 09:29:14 2021 -0500 GH-321: Default to not resize image. Add warning. - Add helper to get a model name. - Simplify user instruction for fixing caveat. - Do not allow normal user to check resize field. - Hide field and caveat details in "Advanced settings". - Default resize field to false. commit 9767d455a00157fc1b8bc7ad1c9426301dfbbdcc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:56:56 2021 -0500 GH-321: Resize Callout image to parent height CAVEAT: The addition to 0001 migration was manual and is untested. commit acefadfbd1e74ff7d6479049856a6be949db0e74 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:10:57 2021 -0500 GH-83/GH-321: Add missing static template tag load commit d59c3f63b358868c4cbe0c2a76ed0c1dfe3aa0e2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:07:24 2021 -0500 GH-83: Squash migrations. Accept GH-321 as part of GH-83. commit df1060bdad9f680a1f2e76ace22e0b9e6897340c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:01:27 2021 -0500 GH-83: Add missing helper clean_for_abstract_link commit 51d3f1d9482a0ab6d147e76bbccf4e9593e78771 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:26:20 2021 -0500 GH-83: Support Hyperlink (requires 69f47cc) Requires new `x-article-link-active` mixin. The reason 0003 is added, not 0002, is cuz extending branch added 0002: - site/frontera/task/GH-83-callout-element--GH-321-resize-callout-image (there, the 0003 migration has 0002 as a dependency) (here, the 0003 migration has 0001 as a dependency) When a proper main-extending branch is made, this should still happen: - task/GH-83-callout-element--GH-321-resize-callout-image - task/GH-321-resize-callout-image (there, the 0003 migration will have ??? as a dependency) Good luck, Wes. commit ed0e74902e9d1b687e81b460b6b7b620ceb8ca05 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:24:45 2021 -0500 Quick: Add x-article-link-active mixin commit ab13f49738ad7e2a4c939982bd7e876e9d713c86 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:26:20 2021 -0500 GH-83: Support Hyperlink (requires 69f47cc) Requires new `x-article-link-active` mixin. commit d0d156e5c0aaf0ce316a88cf03e902cd081001e0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:25:31 2021 -0500 Docs: Corrections to "How to Extend Plugin" doc commit 69f47cc39904fe21a80754c1eda9fd9b3341cec8 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:24:45 2021 -0500 Quick: Add x-article-link-active mixin commit 6ccf84974ddde72867a7549624a46a079f051cc6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:58:11 2021 -0500 GH-321: Fix migration file bug SEE: https://stackoverflow.com/a/48082377/11817077 commit 579e102567416ef0a8ac1684934f0884f5f18a0b Merge: 9117881 2f8911e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:24:30 2021 -0500 Merge branch 'site/frontera/main' into site/frontera/task/GH-83-callout-element--GH-321-resize-callout-image commit af298dd6a82c419a87da39fc61df3af8c33b0bfe Merge: 6adfecb 2f8911e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:23:36 2021 -0500 Merge branch 'site/frontera/main' into site/frontera/task/GH-88-system-specs commit 1266e4e34f136b1e4ea4271327f2dc0d637978ea Merge: 54fc04a 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:18:48 2021 -0500 Merge branch 'main' into task/GH-83-callout-element commit 6adfecb8cf23308a046f32f0705cc20893518e9d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:17:42 2021 -0500 Squashed merge of site/frontera/main at commit 2f8911e commit 9117881292e058de98bf618c59a33642eb64b5f9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:17:04 2021 -0500 Squashed merge of site/frontera/main at commit 2f8911e commit 2f8911eef52b7672a8087ed3b76fc37ec7e3fec2 Merge: 8604189 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:15:50 2021 -0500 Merge branch 'main' into site/frontera/main commit ddc6a435eb1037d75cb922c337b110b460fc952a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 14:05:36 2021 -0500 GH-83: Quick: Remove temp snippet commit 54fc04a706581eacc62b5c9d20dd80fb3ed7646d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 14:05:36 2021 -0500 GH-83: Quick: Remove temp snippet commit 94110b6a520d754599869a8b3a0f7b92080f7f9f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 15:23:17 2021 -0500 Squashed merge of site/frontera/main at commit 8604189 commit 4de09833fe38fd33fe7aadc47f0d12e3b8dd1cf0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 15:22:09 2021 -0500 Squashed merge of site/frontera/main at commit 8604189 commit 8604189feac5f2e9f061aa99a4a691f12496f599 Merge: 11e2302 5af9da2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 15:19:59 2021 -0500 Merge branch 'main' into site/frontera/main commit df463ca24679007c6e5afb72a5fcf3d00284d0c6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 15:03:21 2021 -0500 GH-88: Noop: Cleanup commit 81a65ae394e4f8ea86438a607120c68d57755a91 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 14:09:32 2021 -0500 Squashed merge of site/frontera/main at commit 11e2302 commit 11e2302398e1bcf060d7645b55de9895c6af6504 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 14:06:44 2021 -0500 Squashed merge of site/frontera/task/GH-83-callout-element at commit 34b774c commit c24e0f9c0af615cecac4e48363c99427cedb3aff Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:30:29 2021 -0500 GH-83: Noop: Add markup whitespace for legibility commit dba3f4b8cfd6cdd38abb23bac453ee433a795818 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:03:37 2021 -0500 GH-83: Remove leftover templates commit bba22efdf385d7b4d2c3395f94a87ba11461fefc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:56:56 2021 -0500 GH-321: Resize Callout image to parent height commit fb1bfc3c0b78a914c064c9beca6ad0a9a155c34a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:30:29 2021 -0500 GH-83: Noop: Add markup whitespace for legibility commit a5da003886370374ff6da949dae59bbeab39fd66 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:03:37 2021 -0500 GH-83: Remove leftover templates commit a15e585587a49a4a2753e9ad6a073c40e83e209f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:50:15 2021 -0500 GH-83: Fix Callout Plugin, Update Styles to Match commit 77a657a31b88941e33412ae347269139b8fa4a24 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:50:15 2021 -0500 GH-83: Fix Callout Plugin, Update Styles to Match commit 4fa354cd6ca120c47638184ade411dbe4c25afce Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:09:41 2021 -0500 GH-83: Fix Callout Component after Plugin's tweaks commit c76aedccb9f48c2703e6a5ef240ee8191dc984f8 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:09:41 2021 -0500 GH-83: Fix Callout Component after Plugin's tweaks commit 4494919395b0142df98f2590f1495be1e8b90c99 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:53:49 2021 -0500 GH-83: WIP: Callout Plugin commit 34894a16bfb46ea496fdbd1493e37e56ae5ea9d2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:25 2021 -0500 GH-83: Temp: Callout Snippet (Frontera) commit d1753544ea58c1226c6f37a3b84f810b0ce5c6f8 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:02 2021 -0500 GH-83: WIP: Callout Plugin commit b0cad78af1a01295e18bf7ca04b8d77d29c71d70 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:01:37 2021 -0500 Squashed merge of site/frontera/main at commit 419fdd2 commit 6955fcf0e6cfc130f45ba4361ea681a67188e842 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 12:58:00 2021 -0500 GH-88: Add missing taccsite helper and constant commit 419fdd25bf2b223cf68d82826fdd7fdf0f04dc66 Merge: ae9a993 7f8c438 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:56:02 2021 -0500 Merge branch 'site/frontera/main' of https://github.com/TACC/Core-CMS into site/frontera/main commit ae9a9931bc575b32af2d967e6d8096dbf71a0122 Merge: a69d355 98431d1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:54:18 2021 -0500 Merge branch 'main' into site/frontera/main commit c15d7667864ba8f879d35a4d6b02eb1d3ea52705 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:53:49 2021 -0500 GH-83: WIP: Callout Plugin commit c2c96ecbed4a45df1be98337d214bbb5b84a2ae0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:25 2021 -0500 GH-83: Temp: Callout Snippet (Frontera) commit 82b768ff9b6650f21f5d699666cd40ba6a327073 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:02 2021 -0500 GH-83: Callout Component commit a69d35504728d95aaddadcfa74a4f5b94d13b7a5 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 14:18:41 2021 -0500 GH-88: Convert float layout to grid layout commit 7f8c438a60e6482ee479e5551ba98d675e57f043 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 14:18:41 2021 -0500 GH-88: Convert float layout to grid layout commit 322262418db02cb7a78d0d013c76b59a7ca45442 Merge: ca59ca1 610a49a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 12:16:21 2021 -0500 Merge branch 'main' into site/frontera/main commit ca59ca149d7d59d53108fcfc0b3a10d71c66fb4c Merge: d3a83d3 ebee58a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 11:50:13 2021 -0500 Merge branch 'main' into site/frontera/main commit d3a83d329635ccbd8697d5f50ff1299a4062d413 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 17 17:48:22 2021 -0500 Squashed merge of task/GH-310-breadcrumbs at commit cd7ae17 Also, I removed a bad line from fullwidth.html template. commit fc6469f292f792cae74649be149a05d209c0e856 Merge: ff0855a 5b97b8f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 17 17:40:54 2021 -0500 Merge branch 'main' into site/frontera/main commit ff0855ab763b179c4715c2fd3b75908cc0d15895 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 17 16:55:42 2021 -0500 Squashed merge of site/frontera/task/GH-75-plugin commit 649fcb172ca16987a79a7f03500b5d95f9907f67 Merge: 17e1960 f50b6ac Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:32:51 2021 -0500 Merge branch 'site/frontera/main' into site/frontera/task/GH-88-system-specs commit f50b6ac5c84aeb2f8581cedba1273426a77fd103 Merge: 1de92f5 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:21:50 2021 -0500 Merge branch 'main' into site/frontera/main commit 1de92f50756daf21c324b153e3e4e4ea2f73e75f Merge: d6149b5 ac6d873 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 17:20:22 2021 -0500 Merge branch 'main' into site/frontera/main commit d6149b539eb70bc5c65463caa018eb9a9251a097 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 17:07:27 2021 -0500 Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts at commit dcf606c commit 4e1ec355946574af8053fb4e4a42a7f54eab56bc Merge: 3be5786 e0e420d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 17:01:58 2021 -0500 Merge branch 'main' into site/frontera/main commit 3be578689f1153954c93a4ce3fa59572b4092306 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 16:57:20 2021 -0500 Squashed merge of site/frontera/task/GH-88-system-specs at commit 17e1960 commit 17e1960077012a962a19971a4e463bebe8f3f416 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 15:35:21 2021 -0500 Squashed merge of site/frontera/main at commit 4f3e348 commit d4bf28835cfdbe76fb42679d3aae05748b74cc22 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 15:29:06 2021 -0500 Quick: Update submod for latest site/frontera/main commit ca0bc05cb72a4e50307313dd6d8d105a571510cc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 15:28:06 2021 -0500 GH-88: Rename child plugin Sysmon to SystemMonitor This prepares for rename that occurs in site/frontera/main/task/GH-89. commit 4f3e348a86a7dd41191a404a71e15dc3e0ec4c46 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 15:32:07 2021 -0500 Squashed merge of site/frontera/task/GH-88-system-specs at commit 2f21356 commit c0ce36f580be44a80892d05ed246a15dd7eff225 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 15:23:54 2021 -0500 Squashed merge of site/frontera/task/GH-89 at commit a3a6891 commit e339e4b708405c3200ca434a487cb66ef210a870 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 15:05:53 2021 -0500 Squashed merge of main at commit e0e420d commit d1b007a1565eb43403e81e39e88a24bface5f241 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:27:14 2021 -0500 Squashed merge of task/GH-310-breadcrumbs at commit 50e7e77 commit 28c16313f29e237c475482fb6cf714fe4768e624 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:22:59 2021 -0500 Squashed merge of site/frontera/task/GH-88-system-specsat commit 0b64e92 commit 0b64e920653295ce833a05586ba6fb39ae35f27a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:21:23 2021 -0500 Squashed merge of site/frontera/main at commit 9424328 commit 6104907d059743f44bdbf5637792d9c64e719ae9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:19:25 2021 -0500 GH-88: Fix incorrect var name (font-size→weight) commit 94243287741ef92c027710cde380b4e130f7965c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:14:35 2021 -0500 Quick: Fix bad merge conflict resolution commit 94ca6a73965f5b67af4d18948c5883e88cc531a8 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:12:48 2021 -0500 Squashed merge of task/GH-310-breadcrumbs at commit c5d3aee commit 4be51d16e0cf4c47cbad83370462101f0cc56e34 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:09:03 2021 -0500 Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts at commit 74b9a9c commit 98d754dafb707017f1f1f472daf60ddc5f56f11e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:03:43 2021 -0500 Squashed merge of site/frontera/task/GH-88-system-specs at commit 87cf588 commit 87cf588217dcc9bced3c249399197ac3be05bef8 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:02:52 2021 -0500 Squashed merge of site/frontera/main at commit 65d5757 commit 03590e9f8ec11b3978683616807095588308be7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:00:21 2021 -0500 GH-88: Document support for app stylesheets commit 65d575743f59ec7dcdadc3503b57ec9aba12af07 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 05:54:16 2021 -0500 Quick: Update submod (merge main) commit 818f297d93451786814139135b1731ef241ffcbe Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 05:16:37 2021 -0500 Squashed merge of site/frontera/task/GH-98-typography at commit c2f43a4 commit 8778d4f578947e0385971e1204b8b92d7f975e49 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 05:10:26 2021 -0500 Squashed merge of site/frontera/main at commit e13bf34 commit 11238aad75ec1e136ced6e751c5f426c9d418a13 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 05:04:32 2021 -0500 GH-88: Set plugin font size and weight commit e13bf34956817820e6bb947319755bd15b4970ff Merge: 9fd8ee1 1ea4ea6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 03:22:28 2021 -0500 Merge branch 'task/GH-98-typography' into site/frontera/main commit 9fd8ee116e4370b1b498b3f9d73b5899e95a76ee Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 03:19:02 2021 -0500 Squashed merge of task/GH-310-breadcrumbs at commit 84418b3 commit f09fa4086c3c1bd9e3fbe8655e3f38339911be8a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 02:53:02 2021 -0500 Squashed merge of task/GH-310-breadcrumbs at commit f441e67 commit b9a1a9365c2fddb7fdde05bbde29b05f492d3e56 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 12 22:56:30 2021 -0500 Squashed merge of task/GH-310-breadcrumbs at commit 13276af commit 432251317b6392bde37aa556d6869f03469d95c2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 12 21:51:51 2021 -0500 Squashed merge of site/frontera/task/GH-75-plugin at commit ff5581d commit ea4535f463cfc0db5e26e37d12f0659c16159453 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 12 21:34:28 2021 -0500 Squashed merge of site/frontera/task/GH-75-plugin at commit 6645360 commit d7922cd4682c1b8015c063053d7d01aebfec1beb Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 12 16:50:55 2021 -0500 Squashed merge of site/frontera/task/GH-88-system-specs at commit 39e02f8 commit 39e02f89e8fbf964d061f9e1749c3ad1409fb673 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 12 16:47:37 2021 -0500 GH-88: SystemSpecs: Fix Bug using Generic Image commit c96f704a82ebecb39261b5b7ab06887a4aee9a07 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 12 16:13:13 2021 -0500 GH-88: SystemSpecs: Support Sysmon Image DataList For System Monitor, Image / Picture, and DataList: - Limit System Specs child plugins to these. - Style these in System Monitor layout. - Load System Monitor styles via new `app.*` stylesheet. commit 04080e227c0d394c1be1973d02983fd0fc9c404c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 10 12:37:41 2021 -0500 Squashed merge of site/frontera/main at commit 0fca8b0 commit 0fca8b0d352576f0ee2b3a1ba6a505acd8911ac9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 9 12:53:02 2021 -0500 Squashed merge of site/frontera/task/GH-75-plugin at commit 5b0f0de commit 05dff61eb9825deb92de02aef41de335f8b8df31 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 9 11:36:42 2021 -0500 Squashed merge of main at commit 476deda commit 185811a82e27521ec59451de630af6192df67929 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 6 20:52:26 2021 -0500 Squashed merge of site/frontera/main at commit 7b85320 commit 7b85320ee115d4f72e9c94de684605dc4a996668 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 6 20:51:20 2021 -0500 Squashed merge of site/frontera/task/GH-75-plugin at commit 814b245e1 commit dcf8f52acc1056216dc5c81fba90cc662597138b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 6 15:53:59 2021 -0500 Squashed merge of site/frontera/main at commit 2353d06 commit 85ab78c70a2227249c421479707ca9f9f3d4c677 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 6 15:52:18 2021 -0500 Squashed merge of site/frontera/task/GH-75-plugin at commit 04cb5f1 commit 389fdb5cde65b7271596d668159692fc6a518376 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 6 13:00:52 2021 -0500 Squashed merge of site/frontera/task/GH-88-system-specs at commit ed72de7 commit ed72de738cd2c1b5f0eef5b7951bcbfe478630e8 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 6 12:56:41 2021 -0500 GH-88: SystemSpecs: Fix Dup. Internal Link Opt Do not let "Internal Link" have duplicate options. commit a1220f4779fe99c00efd7761c90e78f9ea9b45dc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 6 00:14:54 2021 -0500 Squashed merge of site/frontera/task/GH-88-system-specs at commit 77c5040 commit 77c5040b8a62ad2df9569662d4df1a07ba7b7ac8 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 6 00:10:23 2021 -0500 GH-88: SystemSpecs: Enable Link (Has Admin Bug) Enable the link by adding missing context variables. TODO: Prevent duplicate entires in "Internal Link". commit 1cb0ea3701ab02c3d793e7e562d83f147d4b7481 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 5 23:50:34 2021 -0500 Squashed merge of site/frontera/task/GH-88-system-specs at commit 66a91bb commit 66a91bb21c457800b6c8a19e9b7e7b6ae1521164 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 5 23:39:16 2021 -0500 GH-88: SystemSpecs: Integrate DataList - Add DataList plugin support. - Require description. - Edit "Resources Title" verbose name. - Update To Do list. - Rebuild migrations. - Rebuild specifications using table. commit 1a66c4dc9ff2b69642dea4beb7cc4669f23c3128 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 4 13:01:12 2021 -0500 Squashed merge of site/frontera/main at commit dada334 commit 7fa977e2e2084de733bf43c7d9b9f83ea2caa886 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 4 12:51:47 2021 -0500 GH-88: Initial SystemSpecs (see TODO.md) commit dada334ae2202a00b529e66f36aacd954f417cc0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 4 12:59:33 2021 -0500 Squashed merge of site/frontera/quick/support-and-add-snippets at commit cdac3be commit 6e4d0db3a10743c7e17f9fe2e92f56e87a27ab4d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 4 12:46:19 2021 -0500 Squashed merge of site/frontera/task/GH-298-add-see-all-component at commit 9f8687e commit 55cf5b892082354e61cdd2fcee3691076187e99a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 4 12:43:32 2021 -0500 Squashed merge of site/frontera/task/GH-75-styles at commit ade6a20 commit 0e5f6f382d7f23c4cc6058e8ae019f1dc35ae351 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 4 12:25:22 2021 -0500 Squashed merge of site/frontera/main/GH-89 at commit 2f27649 commit a4f3aabab1086febf7713ef35427c03559e0c984 Merge: c9bd8e2 0c8ded4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 4 12:00:53 2021 -0500 Merge branch 'main' into site/frontera/main commit c9bd8e2bac25999850b61a5250cc089ffa2c6a5b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 2 13:44:16 2021 -0500 Squashed merge of site/frontera/task/GH-89 at commit 2ebe810 commit 6ec30a809386afb1b43d6d2eddf6add6f9baa42b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 2 13:31:03 2021 -0500 Squashed merge of site/frontera/task/GH-89 at commit 344dfa5 commit 64dad90603c06ea8e90522c005fabc0f00bae281 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 14:03:51 2021 -0500 Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts at commit 1729430 commit 62dbc632bdeaab3a58383ec8e06f0e50e337434a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 14:00:55 2021 -0500 Squashed merge of task/GH-73-tacc-blockquote-plugin at commit e2d4fc0 commit 938db9032267588d6c92e080d6c47bac15e03e59 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:08:53 2021 -0500 Squashed merge of quick/support-plugins-unadulterated-by-bootstrap--for-main at commit eda34fa commit 265a800df703dd71552218e81331aaa812226b50 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:06:16 2021 -0500 Squashed merge of task/GH-73-tacc-blockquote-plugin at 64c0894 commit c6ce79f5d6614b9fe07fe47f31f2d93591e7bf2d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 12:53:34 2021 -0500 Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts at commit eea0768 commit 8ca137498f4206b26f5e2a4df7ea98f41fce1b4b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Sep 1 12:11:54 2021 -0500 Squashed merge of main of the following: commit 8e4b58e3b2e7f3108a722d91350d477532fb8a11 Merge: 97f7df0 2aca7e6 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Wed Sep 1 12:10:40 2021 -0500 Merge pull request #278 from TACC/quick/support-plugins-unadulterated-by-bootstrap--for-main commit 2aca7e66d1e2dc8955ae99892bed076fe0e497ae Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:01:15 2021 -0500 Quick: Mark Bootstrap Link & Image as Depreacted commit 884194ec70f1bf0791697999959b0157d1d4df6d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 10:58:58 2021 -0500 Quick: More Comments commit 31e9da8205061055fa2b05b690818da063353d89 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:53:25 2021 -0500 Quick: Explain Try/Catch for Plugin Restoration commit 7c2f78a4e9f107037c372380d8885e931479a470 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:44:28 2021 -0500 Quick: Better Comments Restoring Generic Plugins commit 9d018e0fd70d6cfb6cbc3c20ba35ecea136cc19c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:35:14 2021 -0500 Quick: Fix Support for Unadulterated Link Plugin commit 9cf1e6700fff8557d04d38e2476fe3433d6722ae Merge: 7c617af 97f7df0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 07:54:50 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 97f7df069bf119ad51a1d85205a6ae0c63b71008 Merge: 08e09e7 afa0672 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 20:37:20 2021 -0500 Merge pull request #332 from TACC/task/GH-331-new-fullwidth-standard-templates commit afa06722fd357dee5eef6b37d096a96f16298387 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 20:33:44 2021 -0500 Quick: Update submod → main. Drop Frontera changes commit 735ec867b582b47a83a4f877e9ef1244027c8b9a Merge: b9f976d 08e09e7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:46:30 2021 -0500 Merge branch 'main' into task/GH-331-new-fullwidth-standard-templates commit 08e09e7a01d542c8198dfe1baeda12ad94f663b7 Merge: e80de90 15cafe8 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 17:44:40 2021 -0500 Merge pull request #333 from TACC/quick/update-submod-protx-secrets Quick: Update submod (ProTX secrets delta) commit 15cafe8a44061318609f5884f19457f9c523542a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:40:13 2021 -0500 Quick: Update submod (ProTX secrets delta) commit b9f976d5d68d6ef3b45225de98bd4f3a4d4ab810 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 15:10:01 2021 -0500 GH-331: Frontera: Remove now-superfluous comment commit 2be0bff7c9ac377b25dd07d91404779dbb132534 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 13:00:58 2021 -0500 GH-331: Frontera: Load via static, not staticfiles commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit 7c617af1aa88dd14b39e3764c0e42f8a8246b3e4 Merge: 0ddc50a e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 0ddc50a8e8dc66675172b9a0121f21b11b473c7f Merge: d662f24 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit d662f24607b58d07aa7d865d42ce5a8488829c82 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9ecc36fe5ea14a225ddb803f1f9777a3106 Merge: eda34fa 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34faa49ddcefcbbd5ced6e8473040082e4a03 Merge: 11f735c d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c49efed900e13b737c817ee3546fae9522 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dcdf29fdf312e7af312ce9a1fecb5679a9e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 78374510d25b0603d54e32e4a53d57b26a9c17a9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f4f4073a50ac853c49286123b2daed8c1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c13acf86bfe5fa9f77fa398ac7eb87cfe1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit af8a9c21d2cae1ec5642450ee475183f60f06973 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 14:51:32 2021 -0500 Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles of the following: (nothing, empty commit, I confirmed all merge conflicts were erroneous) commit db3aed1480da5d9653a62aed6741cfbdb08e9946 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:02:14 2021 -0500 Squashed merge of quick/support-plugins-unadulterated-by-bootstrap--for-main of the following: commit 2aca7e66d1e2dc8955ae99892bed076fe0e497ae Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:01:15 2021 -0500 Quick: Mark Bootstrap Link & Image as Depreacted commit 884194ec70f1bf0791697999959b0157d1d4df6d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 10:58:58 2021 -0500 Quick: More Comments commit 31e9da8205061055fa2b05b690818da063353d89 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:53:25 2021 -0500 Quick: Explain Try/Catch for Plugin Restoration commit 7c2f78a4e9f107037c372380d8885e931479a470 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:44:28 2021 -0500 Quick: Better Comments Restoring Generic Plugins commit 9d018e0fd70d6cfb6cbc3c20ba35ecea136cc19c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:35:14 2021 -0500 Quick: Fix Support for Unadulterated Link Plugin commit 9cf1e6700fff8557d04d38e2476fe3433d6722ae Merge: 7c617af 97f7df0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 07:54:50 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 97f7df069bf119ad51a1d85205a6ae0c63b71008 Merge: 08e09e7 afa0672 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 20:37:20 2021 -0500 Merge pull request #332 from TACC/task/GH-331-new-fullwidth-standard-templates commit afa06722fd357dee5eef6b37d096a96f16298387 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 20:33:44 2021 -0500 Quick: Update submod → main. Drop Frontera changes commit 735ec867b582b47a83a4f877e9ef1244027c8b9a Merge: b9f976d 08e09e7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:46:30 2021 -0500 Merge branch 'main' into task/GH-331-new-fullwidth-standard-templates commit 08e09e7a01d542c8198dfe1baeda12ad94f663b7 Merge: e80de90 15cafe8 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 17:44:40 2021 -0500 Merge pull request #333 from TACC/quick/update-submod-protx-secrets Quick: Update submod (ProTX secrets delta) commit 15cafe8a44061318609f5884f19457f9c523542a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:40:13 2021 -0500 Quick: Update submod (ProTX secrets delta) commit b9f976d5d68d6ef3b45225de98bd4f3a4d4ab810 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 15:10:01 2021 -0500 GH-331: Frontera: Remove now-superfluous comment commit 2be0bff7c9ac377b25dd07d91404779dbb132534 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 13:00:58 2021 -0500 GH-331: Frontera: Load via static, not staticfiles commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit 7c617af1aa88dd14b39e3764c0e42f8a8246b3e4 Merge: 0ddc50a e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 0ddc50a8e8dc66675172b9a0121f21b11b473c7f Merge: d662f24 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit d662f24607b58d07aa7d865d42ce5a8488829c82 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9ecc36fe5ea14a225ddb803f1f9777a3106 Merge: eda34fa 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34faa49ddcefcbbd5ced6e8473040082e4a03 Merge: 11f735c d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c49efed900e13b737c817ee3546fae9522 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dcdf29fdf312e7af312ce9a1fecb5679a9e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 78374510d25b0603d54e32e4a53d57b26a9c17a9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f4f4073a50ac853c49286123b2daed8c1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c13acf86bfe5fa9f77fa398ac7eb87cfe1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit a49f908ca44d470b4aad8b1c6370d44de31762aa Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 11:42:45 2021 -0500 Squashed merge of quick/support-plugins-unadulterated-by-bootstrap--for-main of the following: commit 884194ec70f1bf0791697999959b0157d1d4df6d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 10:58:58 2021 -0500 Quick: More Comments commit 31e9da8205061055fa2b05b690818da063353d89 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:53:25 2021 -0500 Quick: Explain Try/Catch for Plugin Restoration commit 7c2f78a4e9f107037c372380d8885e931479a470 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:44:28 2021 -0500 Quick: Better Comments Restoring Generic Plugins commit 9d018e0fd70d6cfb6cbc3c20ba35ecea136cc19c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:35:14 2021 -0500 Quick: Fix Support for Unadulterated Link Plugin commit 9cf1e6700fff8557d04d38e2476fe3433d6722ae Merge: 7c617af 97f7df0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 07:54:50 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 97f7df069bf119ad51a1d85205a6ae0c63b71008 Merge: 08e09e7 afa0672 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 20:37:20 2021 -0500 Merge pull request #332 from TACC/task/GH-331-new-fullwidth-standard-templates commit afa06722fd357dee5eef6b37d096a96f16298387 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 20:33:44 2021 -0500 Quick: Update submod → main. Drop Frontera changes commit 735ec867b582b47a83a4f877e9ef1244027c8b9a Merge: b9f976d 08e09e7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:46:30 2021 -0500 Merge branch 'main' into task/GH-331-new-fullwidth-standard-templates commit 08e09e7a01d542c8198dfe1baeda12ad94f663b7 Merge: e80de90 15cafe8 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 17:44:40 2021 -0500 Merge pull request #333 from TACC/quick/update-submod-protx-secrets Quick: Update submod (ProTX secrets delta) commit 15cafe8a44061318609f5884f19457f9c523542a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:40:13 2021 -0500 Quick: Update submod (ProTX secrets delta) commit b9f976d5d68d6ef3b45225de98bd4f3a4d4ab810 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 15:10:01 2021 -0500 GH-331: Frontera: Remove now-superfluous comment commit 2be0bff7c9ac377b25dd07d91404779dbb132534 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 13:00:58 2021 -0500 GH-331: Frontera: Load via static, not staticfiles commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit 7c617af1aa88dd14b39e3764c0e42f8a8246b3e4 Merge: 0ddc50a e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 0ddc50a8e8dc66675172b9a0121f21b11b473c7f Merge: d662f24 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit d662f24607b58d07aa7d865d42ce5a8488829c82 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9ecc36fe5ea14a225ddb803f1f9777a3106 Merge: eda34fa 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34faa49ddcefcbbd5ced6e8473040082e4a03 Merge: 11f735c d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c49efed900e13b737c817ee3546fae9522 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dcdf29fdf312e7af312ce9a1fecb5679a9e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 78374510d25b0603d54e32e4a53d57b26a9c17a9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f4f4073a50ac853c49286123b2daed8c1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c13acf86bfe5fa9f77fa398ac7eb87cfe1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit 217d0a553a0eed013eaa05f750e7a26cd30d8cb9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 13:02:07 2021 -0500 Quick: Update submodule to its latest commit 1edbb038c19cfa9e951b2eb8cfd8d54b7ede0153 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 12:17:21 2021 -0500 Squashed merge of task/GH-331-new-fullwidth-standard-templates of the following: commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit d6ebf9b71fd6875032463a4880527ef3555a683f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 09:53:26 2021 -0500 Squashed merge of task/GH-83-callout-element of the following: commit 75a6ecebd1e9cc68626885f427422b060c67b3db Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 09:51:01 2021 -0500 GH-83: Fix: Ensure 0001 taccsite_callout migration See d01c8cf for details. commit fa185d0140f45607df01f73cf91f5e2f2fffcd79 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 15:04:29 2021 -0500 GH-83/GH-321: Show image on narrow windows commit 66eae8f47b8cee14b0a2bd5b8214c824b15a161c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:35:59 2021 -0500 GH-321: Fix figure size and note about its resize commit a7134e21c129ab8ce1cea9f229b393169275429f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:25:01 2021 -0500 GH-83: Quick: Update script comments & equality - Update comments for clarity and accuracy and scope. - Update equality that was not explicit enough. commit 1a57226619c01cebf5afb2b834976b3acff25485 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:08:18 2021 -0500 GH-83: Support Optional Image/Link in CSS Docblock The plugin may require a link and should require an image (GH-328)… But the styles (and template) work fine without either. commit 5059e02f5a4244ddc735ef8bbb541c0a7893858b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 10:07:26 2021 -0500 GH-83: Require all fields (can't require image) commit a07957ea33e5455d87faf8cc1df799a7f9a91abe Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 09:48:21 2021 -0500 GH-83: Add two relevant docs from PR #280 SEE: https://github.com/TACC/Core-CMS/pull/280/ SEE: https://github.com/TACC/Core-CMS/blob/579f5c6/taccsite_cms/contrib/_docs/ commit 7ffceebca8b873da46d417d0aa74e0fecad4b8a0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 09:29:14 2021 -0500 GH-321: Default to not resize image. Add warning. - Add helper to get a model name. - Simplify user instruction for fixing caveat. - Do not allow normal user to check resize field. - Hide field and caveat details in "Advanced settings". - Default resize field to false. commit 9767d455a00157fc1b8bc7ad1c9426301dfbbdcc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:56:56 2021 -0500 GH-321: Resize Callout image to parent height CAVEAT: The addition to 0001 migration was manual and is untested. commit acefadfbd1e74ff7d6479049856a6be949db0e74 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:10:57 2021 -0500 GH-83/GH-321: Add missing static template tag load commit d59c3f63b358868c4cbe0c2a76ed0c1dfe3aa0e2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:07:24 2021 -0500 GH-83: Squash migrations. Accept GH-321 as part of GH-83. commit df1060bdad9f680a1f2e76ace22e0b9e6897340c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:01:27 2021 -0500 GH-83: Add missing helper clean_for_abstract_link commit 51d3f1d9482a0ab6d147e76bbccf4e9593e78771 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:26:20 2021 -0500 GH-83: Support Hyperlink (requires 69f47cc) Requires new `x-article-link-active` mixin. The reason 0003 is added, not 0002, is cuz extending branch added 0002: - site/frontera/task/GH-83-callout-element--GH-321-resize-callout-image (there, the 0003 migration has 0002 as a dependency) (here, the 0003 migration has 0001 as a dependency) When a proper main-extending branch is made, this should still happen: - task/GH-83-callout-element--GH-321-resize-callout-image - task/GH-321-resize-callout-image (there, the 0003 migration will have ??? as a dependency) Good luck, Wes. commit ed0e74902e9d1b687e81b460b6b7b620ceb8ca05 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:24:45 2021 -0500 Quick: Add x-article-link-active mixin commit 1266e4e34f136b1e4ea4271327f2dc0d637978ea Merge: 54fc04a 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:18:48 2021 -0500 Merge branch 'main' into task/GH-83-callout-element commit 54fc04a706581eacc62b5c9d20dd80fb3ed7646d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 14:05:36 2021 -0500 GH-83: Quick: Remove temp snippet commit c24e0f9c0af615cecac4e48363c99427cedb3aff Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:30:29 2021 -0500 GH-83: Noop: Add markup whitespace for legibility commit dba3f4b8cfd6cdd38abb23bac453ee433a795818 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:03:37 2021 -0500 GH-83: Remove leftover templates commit a15e585587a49a4a2753e9ad6a073c40e83e209f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:50:15 2021 -0500 GH-83: Fix Callout Plugin, Update Styles to Match commit 4fa354cd6ca120c47638184ade411dbe4c25afce Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:09:41 2021 -0500 GH-83: Fix Callout Component after Plugin's tweaks commit c15d7667864ba8f879d35a4d6b02eb1d3ea52705 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:53:49 2021 -0500 GH-83: WIP: Callout Plugin commit c2c96ecbed4a45df1be98337d214bbb5b84a2ae0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:25 2021 -0500 GH-83: Temp: Callout Snippet (Frontera) commit 82b768ff9b6650f21f5d699666cd40ba6a327073 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:02 2021 -0500 GH-83: Callout Component commit 736a0be8c78c074b00bc74241ae8e509df7e3ecc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:21:46 2021 -0500 Quick: Update submodule to its site/frontera/main commit 52c8ef79304ab7769da4eb5a15d0bbb0ba40a670 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:10:03 2021 -0500 Squashed merge of task/GH-73-tacc-blockquote-plugin of the following: commit 425cdfbe31273e76ff9dc3674a2ec839b2d0a210 Merge: 3ad23ee e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:08:20 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 3ad23ee0eca8dcf42d2ae2959efeae9df4e5eb02 Merge: 20b00a8 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:21:53 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 20b00a8dc38fdde2ee364bd03e90d0e5b4465ab5 Merge: e2d4fc0 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:23:19 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit e2d4fc078093f70a99dc06a162872d28d856e6cd Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:53:46 2021 -0500 GH-73: Add Missing Plugin Helper This code was lost during re-creation: - of https://github.com/TACC/Core-CMS/pull/257 - as https://github.com/TACC/Core-CMS/pull/275. commit d2ee16101ecb7898a499262a1fc0c08818f0e088 Merge: 64c0894 374b78e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:50:53 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 64c089498958d96078bd7a8aa05cc41628bfd518 Merge: 89ce2c6 d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:38:32 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 89ce2c60e588840399079bdade22e41cf08e8e59 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 23 18:41:23 2021 -0500 Noop: Existing Plugins: Comments, New Lines (Cherry-picked from `task/GH-93…` or `dev` as 29e929ed "GH-93: Noop: Existing Plugins: Comments, New Lines".) commit a69c40c49817c6352f938ad8167d289c097f6405 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 30 15:28:52 2021 -0500 Quick: Couple DIRECTION class names and choices commit 4ea2e1c1810f06f3db3d17d7c2148b3c3bdc907a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 20:20:20 2021 -0500 Quick: Polish Existing Plugins (cherry-picked from GH-93, new message) From b510c757 "GH-93: Polish Existing Plugins" on `task/GH-93…` or `dev` branch commit e44356b867875afb98a663a997fb00d20204908a Merge: a7f46f6 053bcb2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 16:48:38 2021 -0500 Merge branch 'quick/clean-up-plugins-to-match-GH-93-plugins' into task/GH-73-tacc-blockquote-plugin commit a7f46f6709f9ee2f1756b6c3ffc9f7a57571515a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 16:42:55 2021 -0500 Quick: Submod: Merge main commit 053bcb28aa3dc71ae3ca403b9fcde0ed7992cffb Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jul 1 10:25:13 2021 -0500 Quick: Function doc improvements & additions commit 39e3d26985f9fcc95cb800c910d7230d4d936b62 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jul 1 10:18:46 2021 -0500 Quick: Clean Up PLugins to Match GH-93 Plugins commit b76fda0db85bbfb7b40ac05120f2b9d839c01ecb Merge: 3622661 a0104d4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 30 15:47:26 2021 -0500 Merge branch 'main' into dev commit 3622661cad36714d1969ab799c51b3422bf05bc0 Merge: 10aaf2f 66380a2 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Fri Jun 25 16:10:17 2021 -0500 Merge pull request #261 from TACC/quick/support-plugins-unadulterated-by-bootstrap commit 66380a23f227b69f56f89b8aff1c46a54b2d1931 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit a4f6b4d10dfb090687f57f6fcc8eacf758ff55a2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit cd7e3e123a33839a868c99b6b897110dd424986f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit df25f2b1ff0bb7f3d5eb07d769206f2e385eddfd Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 989c981f903583b08d154a8974741c63182188d3 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit 10aaf2f0a1ed43082c01e305a87980665577e6b3 Merge: 0b38c4a 9ce83d2 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Jun 22 12:21:27 2021 -0500 Merge pull request #258 from TACC/test/FP-1099-disabled-auto-search-reindex commit 0b38c4af7a95b95c3a9b9c80cf33579a4907062d Merge: 27b3dd3 0a82cd7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:55:58 2021 -0500 Merge branch 'dev' of github.com:TACC/Core-CMS into dev commit 27b3dd3990f847ba3c8e30dd3a18c2ad034eee0c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:55:46 2021 -0500 Quick: Update taccsite_custom commit 0a82cd70c6eef78baba15403e300a7bf50191a1f Merge: f48ecd2 956e12d Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Jun 22 10:31:39 2021 -0500 Merge pull request #257 from TACC/task/GH-73-tacc-blockquote-plugin commit 956e12dce53209de38a72645b67b1de0c09254ee Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:13:00 2021 -0500 GH-73: Texascale: Noop: Comment text tweak commit 38317320c1563557e9dc1cf876869425e6ceef22 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:00:28 2021 -0500 GH-73: Cleanup constants & helpers & offset commit 2eee71a35ff48ac5e3f51fd3da908c407056bd9b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 09:09:55 2021 -0500 GH-73: Recreate migrations from zero commit cd45ab75e348cca784a52ded56fcaa1d6f490230 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 08:54:10 2021 -0500 GH-73: Texascale: Use 2400px / `--max-wide-…` commit a047df5e7e360b7f33235933c2bdfab86d90111e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 21:05:13 2021 -0500 GH-73: Move `offset-…` max-width to media query commit 10c57480dc100b7199559f295aa2392c79bfd7b3 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:51:09 2021 -0500 GH-73: Support quotes in blockquote via CSS commit d63e6ad113b2f5f52cd7fde4e92616931870bdb9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:40:10 2021 -0500 GH-73: Texascale: Deprecate Bootstrap blockquote commit 4a55986178777fe698226aa9e6b752cd35306e3b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:33:01 2021 -0500 GH-73: Rename c-offset-content model prop commit a7517d9c45efa915bc21081d7e87e1ed01f1fc59 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 18:42:05 2021 -0500 GH-73: Rename c-offset-content → o-offset-content - Texascale: - Have c-offset-content extend o-offset-content styles - Add comment for legacy support and deprecation of c-offset-content commit f972214da05f2d9e081db00e62296eeeaba5d857 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 16:52:28 2021 -0500 GH-73: Collapse "Adv. Settings" for Offset… plugin commit 9ce83d2977c1a253afe4b4cb9e571a79444585e2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 13:18:44 2021 -0500 FP-1099: Clarify Search feature value results Default Value (i.e. falsy): - Allow indexing for Portal CMS. - Disallow indexing for SAD CMS. commit 7ebecb1dc58152c21ed3241c242cc4c6a6dd09be Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 12:44:30 2021 -0500 FP-1099: Make Search a feature Allow search to be disabled for Portal. Allow indexing to be disabled for CMS. commit 98d419965d35ac45e94b685853e8c00ad64c016e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 10:59:22 2021 -0500 GH-73: Move sample markup for blockquote into css commit c1bb7c74c0fbff34508acc81b9bb1d3251c3ec23 Merge: 22232f0 f48ecd2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Sat Jun 19 15:17:59 2021 -0500 Merge branch 'main' into test/FP-1099-disabled-auto-search-reindex commit 22232f0a10b6dcd51aed684927a6e699357311fa Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Sat Jun 19 15:03:43 2021 -0500 Quick: Update taccsite_custom to latest commit 3419a002c303e15b01bc9c13310ed14680eebdde Merge: 444cfc1 f48ecd2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 18 21:41:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 580a7a5e306b88ee8cf3c8f368dcd830615fc434 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 18 14:19:53 2021 -0500 FP-1099: Test: Disable reindex on publish commit 444cfc15c77a1f7ce0852de7c5e3d543dad18d5d Merge: eaa0a01 5918cce Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 16:34:11 2021 -0500 Merge branch 'main' into task/GH-73-ta…
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great 💯
I had one suggestion. Could you make it so that enabling the Use the "Citations" fields
checkbox makes the Citation fields required?
If not, no worries!
That sounds familiar, like something I also wanted. I'll look at options. |
@duckonomy How does dependency TACC/Core-CMS-Resources#61 code look? |
commit 439d655 Merge: 197b971 b028b59 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Sep 30 12:38:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 197b971 Merge: 14ff86b 1248117 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Sep 2 14:25:14 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 14ff86b Merge: a124db2 8e4b58e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Sep 1 16:41:42 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit a124db2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 15:34:27 2021 -0500 GH-73: Restore lost submodule commits commit 08e3cd1 Merge: f13af32 97f7df0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:34:34 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit f13af32 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:32:18 2021 -0500 Quick: Update submod to last commit on its branch commit 425cdfb Merge: 3ad23ee e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:08:20 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 3ad23ee Merge: 20b00a8 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:21:53 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 20b00a8 Merge: e2d4fc0 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:23:19 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit e2d4fc0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:53:46 2021 -0500 GH-73: Add Missing Plugin Helper This code was lost during re-creation: - of #257 - as #275. commit d2ee161 Merge: 64c0894 374b78e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:50:53 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 64c0894 Merge: 89ce2c6 d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:38:32 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 89ce2c6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 23 18:41:23 2021 -0500 Noop: Existing Plugins: Comments, New Lines (Cherry-picked from `task/GH-93…` or `dev` as 29e929e "GH-93: Noop: Existing Plugins: Comments, New Lines".) commit a69c40c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 30 15:28:52 2021 -0500 Quick: Couple DIRECTION class names and choices commit 4ea2e1c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 20:20:20 2021 -0500 Quick: Polish Existing Plugins (cherry-picked from GH-93, new message) From b510c75 "GH-93: Polish Existing Plugins" on `task/GH-93…` or `dev` branch commit e44356b Merge: a7f46f6 053bcb2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 16:48:38 2021 -0500 Merge branch 'quick/clean-up-plugins-to-match-GH-93-plugins' into task/GH-73-tacc-blockquote-plugin commit a7f46f6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 16:42:55 2021 -0500 Quick: Submod: Merge main commit 053bcb2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jul 1 10:25:13 2021 -0500 Quick: Function doc improvements & additions commit 39e3d26 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jul 1 10:18:46 2021 -0500 Quick: Clean Up PLugins to Match GH-93 Plugins commit b76fda0 Merge: 3622661 a0104d4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 30 15:47:26 2021 -0500 Merge branch 'main' into dev commit 3622661 Merge: 10aaf2f 66380a2 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Fri Jun 25 16:10:17 2021 -0500 Merge pull request #261 from TACC/quick/support-plugins-unadulterated-by-bootstrap commit 66380a2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit a4f6b4d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit cd7e3e1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit df25f2b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 989c981 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit 10aaf2f Merge: 0b38c4a 9ce83d2 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Jun 22 12:21:27 2021 -0500 Merge pull request #258 from TACC/test/FP-1099-disabled-auto-search-reindex commit 0b38c4a Merge: 27b3dd3 0a82cd7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:55:58 2021 -0500 Merge branch 'dev' of github.com:TACC/Core-CMS into dev commit 27b3dd3 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:55:46 2021 -0500 Quick: Update taccsite_custom commit 0a82cd7 Merge: f48ecd2 956e12d Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Jun 22 10:31:39 2021 -0500 Merge pull request #257 from TACC/task/GH-73-tacc-blockquote-plugin commit 956e12d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:13:00 2021 -0500 GH-73: Texascale: Noop: Comment text tweak commit 3831732 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:00:28 2021 -0500 GH-73: Cleanup constants & helpers & offset commit 2eee71a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 09:09:55 2021 -0500 GH-73: Recreate migrations from zero commit cd45ab7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 08:54:10 2021 -0500 GH-73: Texascale: Use 2400px / `--max-wide-…` commit a047df5 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 21:05:13 2021 -0500 GH-73: Move `offset-…` max-width to media query commit 10c5748 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:51:09 2021 -0500 GH-73: Support quotes in blockquote via CSS commit d63e6ad Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:40:10 2021 -0500 GH-73: Texascale: Deprecate Bootstrap blockquote commit 4a55986 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:33:01 2021 -0500 GH-73: Rename c-offset-content model prop commit a7517d9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 18:42:05 2021 -0500 GH-73: Rename c-offset-content → o-offset-content - Texascale: - Have c-offset-content extend o-offset-content styles - Add comment for legacy support and deprecation of c-offset-content commit f972214 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 16:52:28 2021 -0500 GH-73: Collapse "Adv. Settings" for Offset… plugin commit 9ce83d2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 13:18:44 2021 -0500 FP-1099: Clarify Search feature value results Default Value (i.e. falsy): - Allow indexing for Portal CMS. - Disallow indexing for SAD CMS. commit 7ebecb1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 12:44:30 2021 -0500 FP-1099: Make Search a feature Allow search to be disabled for Portal. Allow indexing to be disabled for CMS. commit 98d4199 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 10:59:22 2021 -0500 GH-73: Move sample markup for blockquote into css commit c1bb7c7 Merge: 22232f0 f48ecd2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Sat Jun 19 15:17:59 2021 -0500 Merge branch 'main' into test/FP-1099-disabled-auto-search-reindex commit 22232f0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Sat Jun 19 15:03:43 2021 -0500 Quick: Update taccsite_custom to latest commit 3419a00 Merge: 444cfc1 f48ecd2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 18 21:41:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 580a7a5 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 18 14:19:53 2021 -0500 FP-1099: Test: Disable reindex on publish commit 444cfc1 Merge: eaa0a01 5918cce Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 16:34:11 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit eaa0a01 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 16:19:26 2021 -0500 GH-73: Update submodule to merge of main commit 4d5ee2b Merge: f3dac48 fb7f601 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 15:02:29 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit f3dac48 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 09:58:18 2021 -0500 GH-73: Blockquote: fix markup bug, post-dash space commit 59db295 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 09:26:34 2021 -0500 GH-73: Add offset plugin and offset to blockquote. - Add basic "Offset Content" plugin. - matches existing usage - lacks new feature (center alignment) - Add support for Blockquote plugin inside text. - Add support for offset option in Blockquote plugin. commit c73532e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 19:24:03 2021 -0500 GH-73: Finish blockquote plugin commit 6028f4a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 15:45:24 2021 -0500 GH-73: Finish first version of blockquote plugin commit 6ed391e Merge: d2c554d 828a5dd Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 10:37:19 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit d2c554d Merge: 6f9440d 2c50694 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 14 10:08:50 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 6f9440d Merge: aac4f5e 3d4b47c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon May 10 12:12:52 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit aac4f5e Merge: 1c34b4b 3deb6b4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Apr 22 10:06:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 1c34b4b Merge: 49a8163 2781c7e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Apr 14 17:33:39 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 49a8163 Merge: 0260226 27958c4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:52:26 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 0260226 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:16:08 2021 -0500 GH-73: Update blockquote based on GH-67 commit 0a9ae0c Merge: 556024f 541a74d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:10:00 2021 -0500 Merge branch 'task/GH-67-tacc-sample-plugin' into task/GH-73-tacc-blockquote-plugin commit 556024f Merge: 4b5b5c7 b8be85c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 19:02:54 2021 -0500 Merge branch 'task/GH-67-tacc-sample-plugin' into task/GH-73-tacc-blockquote-plugin commit 4b5b5c7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 19:02:42 2021 -0500 GH-73: Fix model desc typo commit 6d69a56 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 18:46:53 2021 -0500 GH-73: WIP Blockquote Plugin from Greet Plugin
commit bf20f96 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Sep 30 14:18:10 2021 -0500 GH-73: Submodule: Merge Main commit 439d655 Merge: 197b971 b028b59 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Sep 30 12:38:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 197b971 Merge: 14ff86b 1248117 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Sep 2 14:25:14 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 14ff86b Merge: a124db2 8e4b58e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Sep 1 16:41:42 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit a124db2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 15:34:27 2021 -0500 GH-73: Restore lost submodule commits commit 08e3cd1 Merge: f13af32 97f7df0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:34:34 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit f13af32 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:32:18 2021 -0500 Quick: Update submod to last commit on its branch commit 425cdfb Merge: 3ad23ee e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:08:20 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 3ad23ee Merge: 20b00a8 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:21:53 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 20b00a8 Merge: e2d4fc0 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:23:19 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit e2d4fc0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:53:46 2021 -0500 GH-73: Add Missing Plugin Helper This code was lost during re-creation: - of #257 - as #275. commit d2ee161 Merge: 64c0894 374b78e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:50:53 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 64c0894 Merge: 89ce2c6 d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:38:32 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 89ce2c6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 23 18:41:23 2021 -0500 Noop: Existing Plugins: Comments, New Lines (Cherry-picked from `task/GH-93…` or `dev` as 29e929e "GH-93: Noop: Existing Plugins: Comments, New Lines".) commit a69c40c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 30 15:28:52 2021 -0500 Quick: Couple DIRECTION class names and choices commit 4ea2e1c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 20:20:20 2021 -0500 Quick: Polish Existing Plugins (cherry-picked from GH-93, new message) From b510c75 "GH-93: Polish Existing Plugins" on `task/GH-93…` or `dev` branch commit e44356b Merge: a7f46f6 053bcb2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 16:48:38 2021 -0500 Merge branch 'quick/clean-up-plugins-to-match-GH-93-plugins' into task/GH-73-tacc-blockquote-plugin commit a7f46f6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 16:42:55 2021 -0500 Quick: Submod: Merge main commit 053bcb2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jul 1 10:25:13 2021 -0500 Quick: Function doc improvements & additions commit 39e3d26 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jul 1 10:18:46 2021 -0500 Quick: Clean Up PLugins to Match GH-93 Plugins commit b76fda0 Merge: 3622661 a0104d4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 30 15:47:26 2021 -0500 Merge branch 'main' into dev commit 3622661 Merge: 10aaf2f 66380a2 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Fri Jun 25 16:10:17 2021 -0500 Merge pull request #261 from TACC/quick/support-plugins-unadulterated-by-bootstrap commit 66380a2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit a4f6b4d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit cd7e3e1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit df25f2b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 989c981 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit 10aaf2f Merge: 0b38c4a 9ce83d2 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Jun 22 12:21:27 2021 -0500 Merge pull request #258 from TACC/test/FP-1099-disabled-auto-search-reindex commit 0b38c4a Merge: 27b3dd3 0a82cd7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:55:58 2021 -0500 Merge branch 'dev' of github.com:TACC/Core-CMS into dev commit 27b3dd3 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:55:46 2021 -0500 Quick: Update taccsite_custom commit 0a82cd7 Merge: f48ecd2 956e12d Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Jun 22 10:31:39 2021 -0500 Merge pull request #257 from TACC/task/GH-73-tacc-blockquote-plugin commit 956e12d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:13:00 2021 -0500 GH-73: Texascale: Noop: Comment text tweak commit 3831732 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:00:28 2021 -0500 GH-73: Cleanup constants & helpers & offset commit 2eee71a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 09:09:55 2021 -0500 GH-73: Recreate migrations from zero commit cd45ab7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 08:54:10 2021 -0500 GH-73: Texascale: Use 2400px / `--max-wide-…` commit a047df5 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 21:05:13 2021 -0500 GH-73: Move `offset-…` max-width to media query commit 10c5748 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:51:09 2021 -0500 GH-73: Support quotes in blockquote via CSS commit d63e6ad Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:40:10 2021 -0500 GH-73: Texascale: Deprecate Bootstrap blockquote commit 4a55986 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:33:01 2021 -0500 GH-73: Rename c-offset-content model prop commit a7517d9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 18:42:05 2021 -0500 GH-73: Rename c-offset-content → o-offset-content - Texascale: - Have c-offset-content extend o-offset-content styles - Add comment for legacy support and deprecation of c-offset-content commit f972214 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 16:52:28 2021 -0500 GH-73: Collapse "Adv. Settings" for Offset… plugin commit 9ce83d2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 13:18:44 2021 -0500 FP-1099: Clarify Search feature value results Default Value (i.e. falsy): - Allow indexing for Portal CMS. - Disallow indexing for SAD CMS. commit 7ebecb1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 12:44:30 2021 -0500 FP-1099: Make Search a feature Allow search to be disabled for Portal. Allow indexing to be disabled for CMS. commit 98d4199 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 10:59:22 2021 -0500 GH-73: Move sample markup for blockquote into css commit c1bb7c7 Merge: 22232f0 f48ecd2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Sat Jun 19 15:17:59 2021 -0500 Merge branch 'main' into test/FP-1099-disabled-auto-search-reindex commit 22232f0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Sat Jun 19 15:03:43 2021 -0500 Quick: Update taccsite_custom to latest commit 3419a00 Merge: 444cfc1 f48ecd2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 18 21:41:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 580a7a5 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 18 14:19:53 2021 -0500 FP-1099: Test: Disable reindex on publish commit 444cfc1 Merge: eaa0a01 5918cce Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 16:34:11 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit eaa0a01 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 16:19:26 2021 -0500 GH-73: Update submodule to merge of main commit 4d5ee2b Merge: f3dac48 fb7f601 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 15:02:29 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit f3dac48 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 09:58:18 2021 -0500 GH-73: Blockquote: fix markup bug, post-dash space commit 59db295 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 09:26:34 2021 -0500 GH-73: Add offset plugin and offset to blockquote. - Add basic "Offset Content" plugin. - matches existing usage - lacks new feature (center alignment) - Add support for Blockquote plugin inside text. - Add support for offset option in Blockquote plugin. commit c73532e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 19:24:03 2021 -0500 GH-73: Finish blockquote plugin commit 6028f4a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 15:45:24 2021 -0500 GH-73: Finish first version of blockquote plugin commit 6ed391e Merge: d2c554d 828a5dd Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 10:37:19 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit d2c554d Merge: 6f9440d 2c50694 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 14 10:08:50 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 6f9440d Merge: aac4f5e 3d4b47c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon May 10 12:12:52 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit aac4f5e Merge: 1c34b4b 3deb6b4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Apr 22 10:06:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 1c34b4b Merge: 49a8163 2781c7e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Apr 14 17:33:39 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 49a8163 Merge: 0260226 27958c4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:52:26 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 0260226 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:16:08 2021 -0500 GH-73: Update blockquote based on GH-67 commit 0a9ae0c Merge: 556024f 541a74d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:10:00 2021 -0500 Merge branch 'task/GH-67-tacc-sample-plugin' into task/GH-73-tacc-blockquote-plugin commit 556024f Merge: 4b5b5c7 b8be85c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 19:02:54 2021 -0500 Merge branch 'task/GH-67-tacc-sample-plugin' into task/GH-73-tacc-blockquote-plugin commit 4b5b5c7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 19:02:42 2021 -0500 GH-73: Fix model desc typo commit 6d69a56 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 18:46:53 2021 -0500 GH-73: WIP Blockquote Plugin from Greet Plugin
@duckonomy, I can "make it so that enabling the Use the 'Citations' fields checkbox makes the Citation fields required"! I have created a ticket and provided direction, but I am compelled to merge without it. Why Merge Without This?
But, this feature will be very useful, so I anticipate coming back to it when it next applies to a new TACC plugin. It definitely improves UX. |
To Do (Done)
Dependencies
Overview
Issues
+
Changes
Create Offset plugin and styles.
Create Blockquote plugin and styles.
Add
2400px
breakpoint--max-wide-…
.Tweak Sample plugin based on lessons learned.
Clean up Texascale project-specific styles.
(complete changelog)
Major
o-offset-content
component, which:c-blockquote
component, which:o-offset-content
component, which:o-offset-content
styles.Minor
2400px
to@custom-media
as--max-wide-…
.utils.py
tohelpers.py
Submodule
Screenshots & Testing
Remote Server
Texascale Dev "Urgent Computing" article
class
attribute)Texascale Prod "Urgent Computing" article
class
attribute)class
attribute)(Optional, but Thorough) Local Server
All Steps
First,
docker exec -it core_cms /bin/bash
. Then:Next, test plugins:
TACC Plugins has new plugins…
Plugins
Screenshot
Blockquote has options…
Options
Screenshot
New plugins render…
Features
Screenshot
Blockquote has options…
Options
Screenshot
Blockquote can be offset via "Layout" options which are Offset Content's "Direction" options…
Values
Screenshot
Notes
Archived
502 Error on publish. Re-index fails.
Logs:
Helpful Commands:
journalctl --unit=gunicorn -f
journalctl --unit=gunicorn | tail -n 300
@taoteg was made aware of this on 2021-09-01. Seems like an ES issue. Must be fixed, but it does not block this PR, nor is it caused by this PR.
This issues is likely caused by task/FP-982: Add
rebuild_index
haystack signal processor #189.