Add image and CTA Content Block in Process Groups #6821
Closed
entantoencuanto wants to merge 33 commits intodevelopfrom
Closed
Add image and CTA Content Block in Process Groups #6821entantoencuanto wants to merge 33 commits intodevelopfrom
entantoencuanto wants to merge 33 commits intodevelopfrom
Conversation
12 tasks
7411ab3 to
fa9b223
Compare
decidim-core/app/assets/stylesheets/decidim/modules/_cards.scss
Outdated
Show resolved
Hide resolved
decidim-core/app/assets/stylesheets/decidim/modules/_cards.scss
Outdated
Show resolved
Hide resolved
fa9b223 to
23217e6
Compare
…ocess_groups table
The hashtag attribute has been moved to the metadata section in admin form
This content block contains title, description, number of participatory processes and hashtag, external url and meta scope if present
…groups landing page
23217e6 to
992f402
Compare
Contributor
|
@entantoencuanto can you resolve conflicting files please? |
Contributor
|
Zero files from |
Contributor
Author
|
The branches of the PRs of this project are made one after other, so the branch of a PR contains the commits of the previous ones. This is the order of the PRs:
So the merging #6823, involves also merging the changes of #6699, #6821 and #6822. Sorry for the inconvenience. |
Contributor
|
Closing then as changes in this PR were already merged by #6823 |
This was referenced Dec 4, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🎩 What? Why?
Note: This PR is built on top of
feature/process_groups_improvements-metadata_title_content_block, the branch of #6699 PR.📌 Related Issues
Testing
This block has been registered in participatory process groups
📋 Checklist
🚨 Please review the guidelines for contributing to this repository.
docs/.📷 Screenshots
Please add screenshots of the changes you're proposing
