Skip to content

DEV: update upstream with Discourse's changes #73

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
Merged
jumagura merged 25 commits into from
Apr 28, 2025
Merged

DEV: update upstream with Discourse's changes #73

jumagura merged 25 commits into from
Apr 28, 2025

Conversation

@renato
Copy link
Contributor

@renato renato commented Apr 24, 2025 •
edited
Loading

Drenmi and others added 24 commits October 30, 2023 12:08
@Drenmi
DEV: Pass respect_plugin_enabled to add_to_serializer as keyword argu…
31a886a 
…ment (#1)

Passing the respect_plugin_enabled argument to #add_to_serializer as a positional argument is deprecated. It is now expected to be a keyword argument. This PR adds the keyword.
@cvx
FIX: Use the correct container (#2)
8fc0834
@nattsw
DEV: Refresh auto group in test (#3)
af7e008
@cvx
DEV: Update linting (#4)
f206d4f
@tyb-talks
DEV: replace bootbox with dialog service (#5)
79b7b3f 
* DEV: replace bootbox with dialog service

* DEV: add discourse-compatibility file
@nattsw
DEV: Pin plugin for Discourse < 3.4.0.beta1-dev (#6)
9b897ae
@jjaffeux
DEV: fixes registerUnbound deprecation (#7)
a2a3422
@jjaffeux
FIX: use proper action function (#8)
bdc7068 
This was causing a crash on the `/admin/plugins/ratings page`. Calling an action with a string on `DButton` is not supported anymore at all.
@nattsw
FIX: Prevent DestroyOldHiddenPosts from failing when there are orphan…
ab40709 
…ed posts (#9)
@tyb-talks
DEV: Switch to use pnpm (#12)
752abbd
@davidtaylorhq
DEV: Update eslint config (#13)
bed3881
@davidtaylorhq
DEV: Update linting (#14)
c07b1f5
@davidtaylorhq
DEV: Update linting (#15)
5e1ba49
@davidtaylorhq
DEV: Update linting (#16)
dabd302
@davidtaylorhq
DEV: Convert to native class syntax (#17)
c70500f
@tyb-talks
DEV: Update deprecated Font Awesome icon names (#18)
5a7fe80
@davidtaylorhq
DEV: Colocate component templates (#19)
3d68dbb
@davidtaylorhq
DEV: Update for glimmer topic list (#20)
574d24c
@davidtaylorhq
DEV: Pin version for Discourse <3.5.0.beta1-dev (#21)
8e11442
@davidtaylorhq
DEV: Bump dependencies and fix linting (#22)
9efc112
@Flink
DEV: Add system spec to check core features are working fine (#23)
0a698ad
@davidtaylorhq
FIX: Remove handlebars dependency (#24)
d61a51c
@davidtaylorhq
DEV: Remove legacy topic-list code (#25)
832db0b
@renato
Merge remote-tracking branch 'upstream/main' into pr-to-upstream
43af07a 
# Conflicts:
#	assets/javascripts/discourse/components/rating-actions.js
#	assets/javascripts/discourse/components/rating-destroy.js
#	assets/javascripts/discourse/components/rating-migrate.js
#	assets/javascripts/discourse/components/rating-object-list.js
#	assets/javascripts/discourse/components/rating-object.js
#	assets/javascripts/discourse/components/rating-star.js
#	assets/javascripts/discourse/components/rating-type-chooser.js
#	assets/javascripts/discourse/components/rating-type.js
#	assets/javascripts/discourse/components/select-rating.js
#	assets/javascripts/discourse/components/star-rating.js
#	assets/javascripts/discourse/controllers/admin-plugins-ratings.js
#	assets/javascripts/discourse/initializers/initialize-ratings.js
#	assets/javascripts/discourse/templates/components/rating-destroy.hbs
#	assets/javascripts/discourse/templates/components/rating-migrate.hbs
@merefield
Copy link
Member

merefield commented Apr 24, 2025

thanks @renato this is fantastic

@merefield
Copy link
Member

merefield commented Apr 24, 2025

@renato is this still wip? should it be Draft?

@renato renato marked this pull request as draft April 24, 2025 16:23
@renato
Copy link
Contributor Author

renato commented Apr 24, 2025

I converted it to a draft, I'm just double-checking if there's anything accidentally overridden from the existing commits on this repo, and will do a smoke-test. Then I can mark it as ready again

@renato renato marked this pull request as ready for review April 24, 2025 16:46
@renato
Copy link
Contributor Author

renato commented Apr 24, 2025

I noticed a small issue where the ratings aren't displayed immediately after posting, only after a refresh, but I also tested on an instance that has an older version and it behaves the same, so doesn't look like a regression

@renato renato changed the title DEV: wip/tentative upstream update DEV: update upstream with Discourse's changes Apr 24, 2025
@renato
Copy link
Contributor Author

renato commented Apr 24, 2025

It's ready for review @merefield. There was a conflict with a commit from today that I kept paviliondev's version

@merefield
Copy link
Member

merefield commented Apr 25, 2025

@jumagura do you wish to handle?

@jumagura
Copy link
Member

jumagura commented Apr 25, 2025

Hi @renato. Thanks a lot for this contribution! 🙌 I’ll start reviewing it. Really appreciate the time and effort you've put into it.

@jumagura jumagura merged commit b3f7241 into paviliondev:main Apr 28, 2025
4 checks passed
@renato
Copy link
Contributor Author

renato commented Apr 28, 2025

Hey @jumagura, just one thing I just realized, the .discourse-compatibility entries won't make much sense with the different tree, it's probably a good idea to remove those entries. Thank you!

@jumagura
Copy link
Member

jumagura commented Apr 28, 2025

Thank you! I overlooked that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jumagura jumagura jumagura approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@renato @merefield @jumagura @Drenmi @cvx @nattsw @tyb-talks @jjaffeux @davidtaylorhq @Flink