Skip to content

dev → main (GH-73, GH-66 & FP-1099 & GH-93, GH-142, GH-133) #259

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.

Sign up for GitHub

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

Jump to bottom
Closed
wesleyboar wants to merge 122 commits into from
Closed

dev → main (GH-73, GH-66 & FP-1099 & GH-93, GH-142, GH-133) #259

wesleyboar wants to merge 122 commits into from

Conversation

@wesleyboar
Copy link
Member

@wesleyboar wesleyboar commented Jun 22, 2021 •
edited
Loading

Important

This PR is blocked intentionally. It should not be merged.

If you were asked to review this PR, then review these instead:

Click to reveal previous state of PR.

Previous State

Important

The branch on Frontera Dev could be for testing #259 or #249.

Overview

Purpose

  • Deploy Frontera Homepage (using mostly plugins) (dev server)
  • Allow Texascale to use main branch (current deploy uses dev)

Testing

Remote (Shortcut) Testing

The dev branch is deployed on:

Local (Complete) Testing

  1. Build for New Styles & Migrate for New Plugins

    First, docker exec -it core_cms /bin/bash. Then:

    1. python3 manage.py migrate
    2. npm ci
    3. npm run build
    4. python3 manage.py collectstatic --no-input
  2. Add Plugins to New Page
    1. Open webpage.
    2. Add test page. ‽
    3. Add new plugins:
      • Sample (Greet User)
      • Blockquote
      • Offset Content
        • [nest any plugin you want]
      • News Article List (Static)
        • [nest] News Article Preview (Static)
      • Docs Article List (Static)
        • [nest] Docs Article Preview (Static)
      • Allocs Article List
        • [nest] Allocs Article Preview (Static)
      • Events Article List (Static)
        • [nest] Events Article Preview (Static)

  3. See PRs in "Overview".

* During your test, Frontera Dev may be running another branch (such as task/GH-245… for #249).
‽ The page on which you add plugins will crash if you load another branch that does not have the plugins.

Notes

Complete Lists of Changes

wesleyboar added 30 commits April 12, 2021 18:46
@wesleyboar
GH-73: WIP Blockquote Plugin from Greet Plugin
6d69a56
@wesleyboar
GH-73: Fix model desc typo
4b5b5c7
@wesleyboar
Merge branch 'task/GH-67-tacc-sample-plugin' into task/GH-73-tacc-blo…
556024f 
…ckquote-plugin
@wesleyboar
Merge branch 'task/GH-67-tacc-sample-plugin' into task/GH-73-tacc-blo…
0a9ae0c 
…ckquote-plugin
@wesleyboar
GH-73: Update blockquote based on GH-67
0260226
@wesleyboar
Merge branch 'main' into task/GH-73-tacc-blockquote-plugin
49a8163
@wesleyboar
Merge branch 'main' into task/GH-73-tacc-blockquote-plugin
1c34b4b
@wesleyboar
Merge branch 'main' into task/GH-73-tacc-blockquote-plugin
aac4f5e
@wesleyboar
Merge branch 'main' into task/GH-73-tacc-blockquote-plugin
6f9440d
@wesleyboar
Merge branch 'main' into task/GH-73-tacc-blockquote-plugin
d2c554d
@wesleyboar
Merge branch 'main' into task/GH-73-tacc-blockquote-plugin
6ed391e
@wesleyboar
GH-73: Finish first version of blockquote plugin
6028f4a
@wesleyboar
GH-73: Finish blockquote plugin
c73532e
@wesleyboar
GH-73: Add offset plugin and offset to blockquote.
59db295 
- 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.
@wesleyboar
GH-73: Blockquote: fix markup bug, post-dash space
f3dac48
@wesleyboar
Merge branch 'main' into task/GH-73-tacc-blockquote-plugin
4d5ee2b
@wesleyboar
GH-73: Update submodule to merge of main
eaa0a01
@wesleyboar
Merge branch 'main' into task/GH-73-tacc-blockquote-plugin
444cfc1
@wesleyboar
FP-1099: Test: Disable reindex on publish
580a7a5
@wesleyboar
Merge branch 'main' into task/GH-73-tacc-blockquote-plugin
3419a00
@wesleyboar
Quick: Update taccsite_custom to latest
22232f0
@wesleyboar
Merge branch 'main' into test/FP-1099-disabled-auto-search-reindex
c1bb7c7
@wesleyboar
GH-73: Move sample markup for blockquote into css
98d4199
@wesleyboar
FP-1099: Make Search a feature
7ebecb1 
Allow search to be disabled for Portal.
Allow indexing to be disabled for CMS.
@wesleyboar
FP-1099: Clarify Search feature value results
9ce83d2 
Default Value (i.e. falsy):
- Allow indexing for Portal CMS.
- Disallow indexing for SAD CMS.
@wesleyboar
GH-73: Collapse "Adv. Settings" for Offset… plugin
f972214
@wesleyboar
GH-73: Rename c-offset-content → o-offset-content
a7517d9 
- Texascale:
    - Have c-offset-content extend o-offset-content styles
    - Add comment for legacy support and deprecation of c-offset-content
@wesleyboar
GH-73: Rename c-offset-content model prop
4a55986
@wesleyboar
GH-73: Texascale: Deprecate Bootstrap blockquote
d63e6ad
@wesleyboar
GH-73: Support quotes in blockquote via CSS
10c5748
@wesleyboar wesleyboar marked this pull request as ready for review July 6, 2021 17:29
@wesleyboar wesleyboar added priority ▲ High priority and removed priority ━ Medium priority labels Jul 6, 2021
This was referenced Jul 6, 2021
Closed
Closed
@wesleyboar wesleyboar linked an issue Jul 9, 2021 that may be closed by this pull request
Blockquote Plugin #73
Closed
1 task
@wesleyboar wesleyboar mentioned this pull request Jul 9, 2021
Merged
5 tasks
This was linked to issues Jul 12, 2021
Offset Content Plugin #66
Closed
Article Lists Styles #93
Closed
@wesleyboar wesleyboar removed the request for review from taoteg July 12, 2021 22:58
@wesleyboar wesleyboar marked this pull request as draft July 12, 2021 22:59
@wesleyboar wesleyboar changed the title dev → main dev → main (GH-93: Article List Styles & Plugins, and more) Jul 12, 2021
@wesleyboar wesleyboar changed the title dev → main (GH-93: Article List Styles & Plugins, and more) dev → main (GH-93: Article List Styles & Plugins + more) Jul 12, 2021
wesleyboar added a commit that referenced this pull request Jul 13, 2021
@wesleyboar
Squashed commit of the following:
14eaf87 
#259 with reverts of these merge commits:
- 9ce83d2
- 7ebecb1
- 580a7a5
- 2caa727
- 66380a2
- 0a82cd7
- 3622661
- mixed misc. commit fragments (so as to remaining non-GH-93 changes)
@wesleyboar wesleyboar added the blocked Unable to continue work label Jul 13, 2021
@wesleyboar wesleyboar changed the title dev → main (GH-93: Article List Styles & Plugins + more) dev → main (GH-73, GH-66 & FP-1099 & GH-93, GH-142, GH-133) Jul 13, 2021
@wesleyboar wesleyboar added has alternative Alternative solution(s) exist(s) and removed priority ▲ High priority labels Jul 13, 2021
@wesleyboar
Copy link
Member Author

wesleyboar commented Jul 30, 2021

This PR should not be re-opened. Other PRs supplant it.

@wesleyboar wesleyboar closed this Jul 30, 2021
@wesleyboar wesleyboar removed blocked Unable to continue work has alternative Alternative solution(s) exist(s) labels Jul 30, 2021
@wesleyboar wesleyboar mentioned this pull request Aug 16, 2021
Merged
7 tasks
@wesleyboar wesleyboar added blocked Unable to continue work wontfix labels Aug 26, 2021
@wesleyboar wesleyboar deleted the dev branch September 23, 2021 01:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

blocked Unable to continue work

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Article Lists Styles Blockquote Plugin Offset Content Plugin

2 participants

@wesleyboar