Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-27 13:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,452 Commits 74 Branches 58 Tags
503c4d16bbb950051020f246e8f54514e73d0b78
Commit Graph

26452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugen Rochko
503c4d16bb [Glitch] Fix wrong styles on rules and buttons in the sign-up form 
Port 2df86d6413 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-06 20:11:26 +02:00
Claire
f7fa3300ae Merge pull request #3216 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 4dc21d7afd
 2025-10-06 20:11:14 +02:00
Claire
e82def7dad [Glitch] Split timeline_preview setting into more granular settings 
Port 2d2c525097 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-06 19:31:02 +02:00
nicole mikołajczyk
3b659cfb48 [Glitch] Do not display mute button in hashtag dropdown when unauthenticated 
Port 62f91eddf4 to glitch-soc

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-06 19:26:48 +02:00
Claire
73a625c284 Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Upstream replaced a setting with 4 new ones, while glitch-soc had modified
  the default value of that setting.
  Removed the old setting and added the new settings, but with defaults
  matching glitch-soc's previous behavior.
 2025-10-06 19:24:16 +02:00
github-actions[bot]
4dc21d7afd New Crowdin Translations (automated) (#36349) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-06 09:11:31 +00:00
Claire
2d2c525097 Split timeline_preview setting into more granular settings (#36338) 2025-10-06 08:34:05 +00:00
nicole mikołajczyk
62f91eddf4 Do not display mute button in hashtag dropdown when unauthenticated (#36353) 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-10-05 14:24:54 +00:00
Claire
d5097398fe Merge pull request #3215 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 80c8a84740
 2025-10-04 20:27:34 +02:00
diondiondion
64393e0878 [Glitch] Allow quotes to be displayed in the featured carousel 
Port 0d7af7e1fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-04 14:23:54 +02:00
Claire
432af3c25d Merge commit '80c8a847409c73c4e9a086c8f398a984cf5c2137' into glitch-soc/merge-upstream 2025-10-04 14:22:26 +02:00
Claire
80c8a84740 Fix redirect to external object when URL is missing or malformed (#36347) 2025-10-03 17:30:23 +00:00
github-actions[bot]
1561517387 New Crowdin Translations (automated) (#36345) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-03 08:07:10 +00:00
renovate[bot]
5543967e5c chore(deps): update dependency rollup-plugin-visualizer to v6.0.4 (#36336) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-03 07:57:48 +00:00
diondiondion
0d7af7e1fe Allow quotes to be displayed in the featured carousel (#36335) 2025-10-02 13:51:47 +00:00
github-actions[bot]
4809b38f6e New Crowdin Translations (automated) (#36329) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-02 08:34:38 +00:00
renovate[bot]
554dd1a76a chore(deps): update dependency omniauth to v2.1.4 (#36331) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-02 08:25:40 +00:00
Claire
ade87f395c Merge pull request #3214 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to f69ca085db
 2025-10-02 10:05:07 +02:00
diondiondion
97065cd266 [Glitch] Add quote/boost dropdown menu to boost button in media modal 
Port 669738ef3b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-01 19:48:50 +02:00
Terence Eden
74ee0960a1 [Glitch] Add overflow to .more-from-author 
Port 6c3c2714d7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-01 19:46:49 +02:00
metalhead
be62874934 [Glitch] Add support for dynamic viewport height 
Port e4094d9fb2 to glitch-soc

Co-authored-by: l <eh.chahkiev@smartics.ru>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-01 19:46:29 +02:00
Claire
0e97992940 [Glitch] Add UI support for displaying quotes of other people's posts 
Port d51723bb57 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-01 19:46:00 +02:00
diondiondion
4f13515468 [Glitch] Update confirmation dialogs for follow button actions "unfollow", "unblock", and "withdraw request" 
Port 473bd84c24 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-01 19:43:20 +02:00
Echo
7430e3c74d [Glitch] Emoji Component 
Port c12b8f51c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-01 19:40:20 +02:00
Brad Dunbar
752214622c [Glitch] Convert mastodon/initial_state to TypeScript 
Port ac50e5eebc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-01 19:34:17 +02:00
Claire
17e0c745c6 Merge commit 'f69ca085dbfca2253404574dcdc4dc6c2aaa35c0' into glitch-soc/merge-upstream 2025-10-01 19:13:18 +02:00
Brad Dunbar
f69ca085db ESLint: Ignore .bundle directory (#36321) 2025-10-01 15:48:15 +00:00
Claire
3ee1378932 Fix approval for remote quotes of local posts not being streamed to local users (#36317) 2025-10-01 13:51:43 +00:00
Claire
f03d1bb21f Add numeric_ap_ids feature flag to switch new accounts to numeric AP identifiers (#36316) 2025-10-01 13:09:56 +00:00
diondiondion
669738ef3b Add quote/boost dropdown menu to boost button in media modal (#36315) 2025-10-01 12:18:19 +00:00
renovate[bot]
94a4e9d5a9 chore(deps): update dependency vite-plugin-static-copy to v3.1.3 (#36312) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-01 09:48:26 +00:00
github-actions[bot]
9114e72c50 New Crowdin Translations (automated) (#36308) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-01 09:47:16 +00:00
Terence Eden
6c3c2714d7 Add overflow to .more-from-author (#36310) 2025-10-01 09:23:49 +00:00
metalhead
e4094d9fb2 Add support for dynamic viewport height (#36272) 
Co-authored-by: l <eh.chahkiev@smartics.ru>
 2025-10-01 08:53:29 +00:00
Claire
a9234d99cd Merge pull request #3213 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 45219dbf64
 2025-10-01 10:52:59 +02:00
Claire
cbb94bdfde Merge commit '45219dbf64805746a472e50bb7c9bcb52972ab2a' into glitch-soc/merge-upstream 2025-09-30 18:06:45 +02:00
Claire
d51723bb57 Add UI support for displaying quotes of other people's posts (#36301) 2025-09-30 15:10:09 +00:00
Claire
5af40ff960 Fix some routes for numeric AP identifiers (#36304) 2025-09-30 15:09:59 +00:00
diondiondion
473bd84c24 Update confirmation dialogs for follow button actions "unfollow", "unblock", and "withdraw request" (#36289) 2025-09-30 14:55:25 +00:00
Echo
c12b8f51c1 Emoji Component (#36293) 2025-09-30 13:06:02 +00:00
Brad Dunbar
ac50e5eebc Convert mastodon/initial_state to TypeScript (#36274) 2025-09-30 11:14:58 +00:00
Claire
589af7a1cc Change GET /api/v1/statuses/:id/quotes to allow listing quotes to other people's posts (#36291) 2025-09-30 09:56:03 +00:00
Claire
45219dbf64 Fix spurious notification of local boosters and quoters when updating quote policy (#36299) 2025-09-30 09:40:58 +00:00
renovate[bot]
a6236148d8 chore(deps): update dependency haml-rails to v3 (#36288) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-30 08:44:15 +00:00
Claire
6deeeec2ed Merge pull request #3210 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 150f0fcba5
 2025-09-30 10:08:10 +02:00
Emelia Smith
5b97f25a15 Add integration tests for mastodon-streaming (#36025) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: David Roetzel <david@roetzel.de>
 2025-09-30 07:27:09 +00:00
Brad Dunbar
c4cd2c955b [Glitch] Remove shallow prop from Wrapper 
Port aae9a5528a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-29 18:44:40 +02:00
Claire
b6c53c1129 Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Upstream refactored a part of the code where glitch-soc has changed the code
  to potentially hide followers count.
  Adapt upstream's changes.
 2025-09-29 18:41:46 +02:00
Claire
150f0fcba5 Add support for numeric-based URIs for local accounts (#32724) 2025-09-29 12:05:48 +00:00
renovate[bot]
4d7c208da3 chore(deps): update node.js to 22.20 (#36252) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-29 09:45:31 +00:00