Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-25 03:47:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,225 Commits 74 Branches 58 Tags
7fa6d6193cc6b96dc4e25444cd8a9fe3bf527552
Commit Graph

25225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Echo
7fa6d6193c [Glitch] Update ESLint to not try to resolve virtual modules 
Port 6ffa262546 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-28 18:43:22 +02:00
Claire
b627aee45f Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream 
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.
 2025-05-28 18:41:47 +02:00
renovate[bot]
ca41a95872 chore(deps): update dependency rubocop to v1.75.8 (#34843) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-28 15:46:21 +00:00
renovate[bot]
6e16cac09f chore(deps): update dependency ox to v2.14.23 (#34835) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-28 14:53:42 +00:00
Matt Jankowski
38e0a360ca Add coverage for "default" stylesheet theme helper path (#34732) 2025-05-28 13:33:07 +00:00
David Roetzel
b195956ecb Encapsulate redis key usage (#34840) 2025-05-28 12:34:37 +00:00
Emelia Smith
a73ade526a Assert usage of client credentials for account registration (#34828) 2025-05-28 12:09:32 +00:00
Echo
6ffa262546 Update ESLint to not try to resolve virtual modules (#34837) 2025-05-28 10:04:52 +00:00
Darius Kazemi
991796172a Fix NoMethodError in edge case of emoji cache handling (#34749) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-28 09:39:55 +00:00
Matt Jankowski
71d46e26b2 Update rack to version 3 (#34816) 2025-05-28 08:39:17 +00:00
Matt Jankowski
887533392f Regenerate rubocop todo with 1.75.7 (#34825) 2025-05-28 08:38:57 +00:00
github-actions[bot]
43ccb04548 New Crowdin Translations (automated) (#34834) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-28 08:38:51 +00:00
renovate[bot]
75ae084976 fix(deps): update dependency rollup-plugin-visualizer to v6.0.1 (#34836) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-28 08:20:55 +00:00
renovate[bot]
474013b48c fix(deps): update dependency postcss-preset-env to v10.2.0 (#34821) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-28 08:01:02 +00:00
renovate[bot]
9d7ecf92fe chore(deps): update dependency omniauth-saml to v2.2.4 (#34831) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-28 07:45:16 +00:00
Claire
a76647c406 Merge pull request #3079 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to d78535eab9
 2025-05-27 22:33:44 +02:00
Echo
ebab5e42c0 [Glitch] Add language picker to server rules section 
Port d78535eab9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-27 20:51:37 +02:00
Claire
086a7016c4 Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream moved its theming system to a plug-in, where we had our own.
  Adapted the file as well as our own plugin to adopt the same mechanisms.
 2025-05-27 20:49:19 +02:00
Echo
d78535eab9 Add language picker to server rules section (#34820) 2025-05-27 13:57:34 +00:00
renovate[bot]
7ede5460d8 chore(deps): update dependency pghero to v3.7.0 (#34819) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-27 12:14:38 +00:00
github-actions[bot]
32b5da558e New Crowdin Translations (automated) (#34817) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-27 09:28:32 +00:00
renovate[bot]
7132e660a6 chore(deps): update dependency sidekiq-unique-jobs to v8.0.11 (#34815) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-27 08:56:08 +00:00
Claire
0372344d33 Move Mastodon theme handling to custom vite plugin (#34808) 
Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com>
 2025-05-27 08:50:48 +00:00
Claire
3c281e3d00 Merge pull request #3078 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ba5320671c
 2025-05-26 23:30:51 +02:00
Claire
8bb75bd4ab Fix issue with status width in glitch-soc 2025-05-26 21:27:11 +02:00
Echo
5bd7b2c6f3 [Glitch] Move pinned posts to a carousel 
Port ba5320671c to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-26 21:06:15 +02:00
Claire
e1cac17f4a Merge commit 'ba5320671c287b66284bc42544b3bccc506f22b9' into glitch-soc/merge-upstream 2025-05-26 20:47:12 +02:00
Claire
a4defbb271 Merge pull request #3077 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 47512fe518
 2025-05-26 20:46:52 +02:00
Claire
e8f713ba57 Merge commit '47512fe51867fd30f13e02731a9733fa971e8837' into glitch-soc/merge-upstream 2025-05-26 18:46:50 +02:00
Claire
56b3726899 Fix glitch-soc flavor always loading english locales for upstream (#3076) 2025-05-26 18:45:55 +02:00
Matt Jankowski
37c82a3003 Update sidekiq to version 7 (#34745) 2025-05-26 15:32:41 +00:00
Claire
a67527c589 Merge pull request #3075 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 198b59ca3e
 2025-05-26 17:12:18 +02:00
Echo
ba5320671c Move pinned posts to a carousel (#34754) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-05-26 13:35:28 +00:00
renovate[bot]
47512fe518 fix(deps): update dependency rollup-plugin-visualizer to v6 (#34805) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-26 13:26:09 +00:00
Claire
955e75e820 Fix premailer strategy when using CDN_HOST (#34813) 2025-05-26 13:19:19 +00:00
Claire
b7e967817b Fix unnecessary requirement for deprecated OTP_SECRET environment variable (#34810) 2025-05-26 11:59:54 +00:00
Claire
342290a9e0 Merge commit '198b59ca3ec45cbf6e73f53e1f39c7204d8a70c9' into glitch-soc/merge-upstream 2025-05-26 12:31:26 +02:00
Claire
198b59ca3e Fix NoMethodError in ActivityPub::FetchFeaturedCollectionService (#34811) 2025-05-26 08:24:46 +00:00
Claire
b3615a803e Remove unnecessary direct dependency to glob (#34809) 2025-05-26 07:42:24 +00:00
renovate[bot]
170668ed69 chore(deps): update dependency selenium-webdriver to v4.33.0 (#34796) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-26 07:41:59 +00:00
github-actions[bot]
d1d3ff087a New Crowdin Translations (automated) (#34795) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-26 07:41:52 +00:00
Claire
558c73a21e Use @/ absolute paths instead of relative paths in CSS (#34806) 2025-05-26 07:27:44 +00:00
Claire
c9c2fbb27d Merge pull request #3074 from ClearlyClaire/glitch-soc/merge-upstream 
[Breaking changes] Merge upstram changes up to a13756148d
 2025-05-25 20:49:36 +02:00
diondiondion
ac4255c9e5 [Glitch] fix: Allow quotes to be filtered 
Port 68a5724b3e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 16:14:34 +02:00
Claire
d28a62f900 [Glitch] Change display of quote posts to strip fallback link and preview cards 
Port 02ac18da51 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 16:14:34 +02:00
Claire
cac981662e [Glitch] Fix quotes not being displayed in reblogs 
Port e0ce4b9b6b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 16:14:34 +02:00
diondiondion
5061a32f1d [Glitch] Add visual indicator & link to nested quote posts 
Port 79ccba1758 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 16:14:34 +02:00
diondiondion
e3b424aa02 [Glitch] Add rendering of quote posts in web UI 
Port 97b9e8849d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 16:14:34 +02:00
Echo
7efac8c025 [Glitch] Revert React Spring to 9.7.5 and updates Renovate 
Port 84d03e4e16 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 15:26:37 +02:00
nicole mikołajczyk
93350d6dd9 [Glitch] Fix “Open original page” and “Add or Remove from lists” being included in account dropdown even when irrelevant 
Port 6b066eac2c to glitch-soc

Signed-off-by: Nicole Mikołajczyk <git@mkljczk.pl>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 15:26:37 +02:00