Skip to content
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

feat(sticky): make excerpt optional in sticky #4016

Merged
merged 5 commits into from
Oct 21, 2024
Merged

feat(sticky): make excerpt optional in sticky #4016

merged 5 commits into from
Oct 21, 2024

Conversation

lycorisor
Copy link
Contributor

@lycorisor lycorisor requested a review from a team as a code owner August 15, 2024 14:18
SychO9
SychO9 requested changes Aug 15, 2024
View reviewed changes
Copy link
Member

@SychO9 SychO9 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR! some comments

@lycorisor
Copy link
Contributor Author

applied your comment

@lycorisor lycorisor requested a review from SychO9 August 15, 2024 15:17
SychO9
SychO9 requested changes Aug 15, 2024
View reviewed changes
Copy link
Member

@SychO9 SychO9 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please complete this so that it visually works as expected.

The excerpt should not be displayed when the setting is off, the next extend of the same file changed needs to also be adapted to that.

@lycorisor
Copy link
Contributor Author

Hello, please describe your requirements in detail. I have applied your suggestions in the chore commit.

@lycorisor lycorisor requested a review from SychO9 August 16, 2024 14:01
SychO9 added 2 commits October 21, 2024 18:54
@SychO9
Merge branch '2.x' into fork/lycorisor/2.x
f75329f 
# Conflicts:
#	extensions/sticky/js/dist/admin.js
#	extensions/sticky/js/dist/admin.js.map
#	extensions/sticky/js/dist/forum.js
#	extensions/sticky/js/dist/forum.js.map
#	extensions/sticky/js/src/admin/index.js
@SychO9
fix: use setting to hide/show excerpt
dad63e9
@SychO9 SychO9 added this to the 2.0 milestone Oct 21, 2024
@SychO9 SychO9 changed the title feat: make excerpt optional in sticky feat(sticky): make excerpt optional in sticky Oct 21, 2024
SychO9
SychO9 approved these changes Oct 21, 2024
View reviewed changes
Copy link
Member

@SychO9 SychO9 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@SychO9 SychO9 merged commit a0311df into flarum:2.x Oct 21, 2024
15 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SychO9 SychO9 SychO9 approved these changes

Assignees
No one assigned
Labels
type/feature
Projects
None yet
Milestone
2.0.0-beta.1
Development

Successfully merging this pull request may close these issues.
2 participants
@lycorisor @SychO9