Merge upstream changes - Githubissues

polyamspace / mastodon

Custom Mastodon fork used by https://polyam.space

GNU Affero General Public License v3.0

1 stars 2 forks source link

Merge upstream changes #638

Closed polyamAdmin closed 1 month ago

polyamAdmin commented 1 month ago

Conflicts:

app/javascript/flavours/glitch/actions/interactions.js Upstream added new functions where functions for reactions were. Added new functions.
app/javascript/flavours/glitch/components/status.jsx Upstream changed a line close to one modified for polyam-glitch. Applied change.
app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx Upstream removed lines close to a polyam-glitch change. Removed lines upstream did.

Skipped changes:

6be21ae8ac9b910677e983c25a6154b4ed905823 (This style was deleted in polyam-glitch)

Ported changes:

f13a231b3980f76fc5b105ac8e430599df19e956
9cb94271333ccfe488fa84d49e3351f18594e480
cbf25634a9144bb6420fb0350d7ea64bed4f763f
838ea5f9cdac103a6f5cc9f63c35315f8985eeb1
9a015a2a157b43ea63d911327248635e629a72c9
a8330be93ee825948a17c810af33e28bfa2c56c8
8b7f93cc7fa7a8421ceddeaa79e487360a4ad223

polyamAdmin commented 1 month ago

The admin UI recolor is definitely an improvement to before, but it also looks a bit too boring and of course breaks skins, which was expected.

Other than that the changes are okay. I just don't have the energy to update the skins right now, so I will merge this once I have them ready. Honestly, I should create a "shared_skins" dir, so I don't have to port every style change...