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
Planet 2561 #738
Planet 2561 #738
Conversation
…eme into planet-2561
- Placed the list of themes in one function for use in the Post Campaign Class - More formatting fixes - Removed unneeded blocks from single-campaigns. - Reset changes to gulpfile
* Added CPT for campaigns and page templates * Syntax fix and removal of unnecessary scss * Added CPT for campaigns and page templates * Formatting and split Campaign template class into new file * Removed unneeded code and resetting changes - Placed the list of themes in one function for use in the Post Campaign Class - More formatting fixes - Removed unneeded blocks from single-campaigns. - Reset changes to gulpfile * Linting and formatting fixes * Remove fonts, icon and reset style map.
- Page template support added - Font/logo support added Delete obsolete style files. Remove unneeded images
# Conflicts: # classes/class-p4-campaigns.php
# Conflicts: # templates/html-header.twig
This has similar issues with the plugin-blocks PR. It's full with fixup commits and merge commits from the target branch. I see this is still WIP. But when it's ready to be merged, we should spend some time to clean up the commits. |
@comzeradd I'm basically done with it. You want me to squash just the merge commits? Or which other ones? |
The merge commits that were created as part of merging PRs to this branch are fine. The ones that shouldn't be there are ones that merge the target branch back into this. (eg. Additionally the PR has many fixup commits (eg. |
Ideally these commits (to which Nikos is referring to) should not exist as they pollute the git history As this is an evolving codebase, we need to keep the git history as clean as possible. |
Closing this in favor of #751 |
Master branch of all changes made for Planet 2561. Merged in the deploy branch.
Changes include: