Skip to content

chore: Replace Twitter & Diaspora links and text - #48520

Merged
nfebe merged 8 commits into
masterfrom
chore/48409/replace-diaspora-and-twitter
Oct 8, 2024
Merged

chore: Replace Twitter & Diaspora links and text#48520
nfebe merged 8 commits into
masterfrom
chore/48409/replace-diaspora-and-twitter

Conversation

@nfebe

@nfebenfebe commented Oct 2, 2024•
edited
Loading

Copy link
Copy Markdown
Contributor
  • Use Twitters new name "X"
  • Remove Diaspora social and include Mastodon instead

Resolves : #48409

Screenshots

Before
Screenshot from 2024-10-02 11-09-44
After
Screenshot from 2024-10-02 11-48-12

@nfebenfebe added the 2. developing Work in progress label Oct 2, 2024
@nfebe
nfebeforce-pushed the chore/48409/replace-diaspora-and-twitter branch from 3804cbd to a539a56CompareOctober 2, 2024 09:53
@nfebe
nfebe marked this pull request as ready for review October 2, 2024 09:53
@nfebenfebe added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 2, 2024
@nfebe

nfebe commented Oct 2, 2024

Copy link
Copy Markdown
ContributorAuthor

/backport to stable30

@nfebe
nfebeforce-pushed the chore/48409/replace-diaspora-and-twitter branch from a539a56 to 04cacc3CompareOctober 2, 2024 09:58
@nfebe

nfebe commented Oct 2, 2024

Copy link
Copy Markdown
ContributorAuthor

/compile

@nfebe
nfebe enabled auto-merge October 2, 2024 09:59
provokateurin
provokateurin requested changes Oct 2, 2024
View reviewed changes
Comment threadapps/federatedfilesharing/src/components/PersonalSettings.vue Outdated
artonge
artonge reviewed Oct 2, 2024
View reviewed changes
Comment threadapps/federatedfilesharing/src/components/PersonalSettings.vue Outdated
Comment threadapps/federatedfilesharing/src/components/PersonalSettings.vue Outdated
@nfebe
nfebeforce-pushed the chore/48409/replace-diaspora-and-twitter branch from 9620778 to f8483edCompareOctober 2, 2024 12:47
@nfebe
nfebeforce-pushed the chore/48409/replace-diaspora-and-twitter branch 2 times, most recently from e99060a to c4e5566CompareOctober 7, 2024 06:51
susnux
susnux reviewed Oct 7, 2024
View reviewed changes
Comment threadapps/federatedfilesharing/src/components/PersonalSettings.vue Outdated
susnux
susnux reviewed Oct 7, 2024
View reviewed changes
Comment threadapps/federatedfilesharing/src/components/PersonalSettings.vue
@susnux
susnuxforce-pushed the chore/48409/replace-diaspora-and-twitter branch from c4e5566 to 37ffe36CompareOctober 7, 2024 16:28
susnux
susnux approved these changes Oct 7, 2024
View reviewed changes

@susnuxsusnux left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just replaced the icons with the proper ones from core/img for legal reasons.

Screenshot 2024-10-07 at 18-14-26 Sharing - Personal settings - Nextcloud
Screenshot 2024-10-07 at 18-14-18 Sharing - Personal settings - Nextcloud

@susnux
susnuxforce-pushed the chore/48409/replace-diaspora-and-twitter branch from 37ffe36 to 4342a44CompareOctober 7, 2024 16:30
susnux
susnux reviewed Oct 7, 2024
View reviewed changes
Comment threadapps/federatedfilesharing/src/components/PersonalSettings.vue Outdated
@susnux
susnuxforce-pushed the chore/48409/replace-diaspora-and-twitter branch from 4f4a68b to 64eec9dCompareOctober 7, 2024 18:48
@susnux

susnux commented Oct 7, 2024

Copy link
Copy Markdown
Contributor

/compile

nfebeand others added 8 commits October 8, 2024 14:31
@nfebe@susnux
chore: Replace Twitter & Diaspora links and text
cacfa5d
- Use Twitters new name "X"
- Remove Diaspora social and include Mastodon instead
Resolves : #48409
Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
@susnux
fix(core): Use correct facebook icon provided by Meta
f9d3954
The legal terms require to exactly use the facebook logo as provided by Meta.
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
feat(core): Add correct X logo as provided by X Corp.
38cd9d3
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
fix(federatedfilessharing): Use social media icons from core rather t…
52cfac5
…han inline SVGs
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
refactor(federatedfilessharing): Make copy logic more resilient and u…
af9d716
…se Typescript
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
fix(federatedfilesharing): Add aria label to include the X in `X (f…
268aad3
…ormerly Twitter)` button.
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
fix(federatedfilesharing): Use valid mastodon URL for sharing
30e02f2
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@nextcloud-command@susnux
chore(assets): Recompile assets
9741456
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@susnux
susnuxforce-pushed the chore/48409/replace-diaspora-and-twitter branch from 60cf975 to 9741456CompareOctober 8, 2024 12:31
@nfebe
nfebe merged commit 50b8221 into masterOct 8, 2024
@nfebe
nfebe deleted the chore/48409/replace-diaspora-and-twitter branch October 8, 2024 19:02
@backportbotbackportbotBot mentioned this pull request Oct 8, 2024
Merged
2 tasks
@susnux
susnux restored the chore/48409/replace-diaspora-and-twitter branch October 8, 2024 19:06
@susnux
susnux deleted the chore/48409/replace-diaspora-and-twitter branch October 8, 2024 19:11
@github-actions

github-actionsBot commented Oct 31, 2024

Copy link
Copy Markdown
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@skjnldsvskjnldsv mentioned this pull request Jan 7, 2025
Merged
@joshtrichardsjoshtrichards mentioned this pull request Feb 17, 2025
Open
@susnuxsusnux moved this from 🏗️ In progress to ☑️ Done in 📁 Files teamMar 14, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@susnuxsusnuxsusnux approved these changes
@provokateurinprovokateurinprovokateurin approved these changes
@szaimenszaimenAwaiting requested review from szaimen
@sorbaughsorbaughAwaiting requested review from sorbaugh
@artongeartongeAwaiting requested review from artonge

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsfeedback-requested

Projects

📁 Files team
Status: ☑️ Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Sharing settings: Replace Diaspora and Twitter with Mastodon and X

6 participants

@nfebe@susnux@artonge@provokateurin@szaimen@nextcloud-command