Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,479 Commits 75 Branches 73 Tags
7ccada36dbb770485e26bc586f5a6a83d103d2c7
Commit Graph

4805 Commits

Author SHA1 Message Date
Claire
ddc7df2064 Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream 2026-02-13 13:03:51 +01:00
github-actions[bot]
a3f34137fd New Crowdin Translations (automated) (#37853) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-13 10:45:32 +00:00
Claire
e451416d90 Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream 2026-02-12 18:00:45 +01:00
David Roetzel
f57167c61a Add ID/URI to collection items (#37842) 2026-02-12 15:31:45 +00:00
Claire
bfec82e5f9 Add nan-TW to interface languages (#37822) 2026-02-12 15:12:08 +00:00
github-actions[bot]
6e8df21233 New Crowdin Translations (automated) (#37836) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-12 08:59:31 +00:00
Claire
2373c5a132 Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream 2026-02-11 20:26:56 +01:00
Claire
dfe44bcaef Add ability to require 2FA for specific roles (including Everybody) (#37701) 2026-02-11 14:34:09 +00:00
Claire
4fbd1ad7ae Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream 
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.
 2026-02-11 13:32:18 +01:00
Claire
c53bb3b33e Rename “Mode” to “Color scheme” (#37819) 2026-02-11 10:36:59 +00:00
github-actions[bot]
cc75188a76 New Crowdin Translations (automated) (#37817) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-11 09:11:56 +00:00
Claire
1b00b92772 Merge commit '2774e0fbfa045e883ec94e873e657e9e8fefa98b' into glitch-soc/merge-upstream 2026-02-10 12:03:53 +01:00
Claire
75ba314e6b Migrate to new theming infrastructure (#37612) 2026-02-10 10:59:47 +00:00
github-actions[bot]
662df23793 New Crowdin Translations (automated) (#37797) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-10 10:16:57 +00:00
Claire
47b0e7897c Merge commit 'd3cef824018a79ba383deab85e09c31d2673d2c3' into glitch-soc/merge-upstream 2026-02-09 13:11:17 +01:00
github-actions[bot]
6ec4bd5927 New Crowdin Translations (automated) (#37767) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-09 09:04:32 +00:00
Claire
8f58c42ca3 Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-soc/merge-upstream 2026-02-06 22:45:55 +01:00
github-actions[bot]
b1d4459267 New Crowdin Translations (automated) (#37755) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-06 09:52:28 +00:00
Claire
55cd5e1ab1 Merge commit 'acdd0b33a3183569a2cdb50befdbba58f1e74ae9' into glitch-soc/merge-upstream 2026-02-05 17:57:46 +01:00
Matt Jankowski
acdd0b33a3 Pre-update some config file no-op changes from 8.1 branch (#37746) 2026-02-05 16:40:18 +00:00
Claire
59e02a628d Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/backup_service.rb`:
  Upstream refactored activity serialization while glitch-soc passed an extra argument.
  Followed upstream's refactor, keeping our extra argument.
 2026-02-05 12:43:12 +01:00
Matt Jankowski
f652c54c33 Update devise to version 5.0 (#37419) 2026-02-05 11:05:32 +00:00
github-actions[bot]
ed649fbdb7 New Crowdin Translations (automated) (#37740) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-05 10:08:56 +00:00
Claire
3bbc8ecf92 Merge commit '8ebe2e673e2fd175140df7275eb362c8eecfec31' into glitch-soc/merge-upstream 2026-02-04 19:23:24 +01:00
Claire
33dc4a6091 Merge commit '4f99b48e8e8c9818f85be1b2ac9abad75f538585' into glitch-soc/merge-upstream 2026-02-04 18:51:17 +01:00
github-actions[bot]
015d88b4c6 New Crowdin Translations (automated) (#37733) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-04 17:03:08 +00:00
Valtteri Laitinen
ee631bf826 Make “Following” correctly translatable (#37671) 2026-02-04 10:56:33 +00:00
github-actions[bot]
1cb3b49537 New Crowdin Translations (automated) (#37729) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-04 08:48:44 +00:00
Claire
13499168f8 Merge commit 'c48634cf5f3c5b50fcf6ea075121fa2d88e07c0e' into glitch-soc/merge-upstream 2026-02-03 15:44:04 +01:00
github-actions[bot]
c1272c4b68 New Crowdin Translations (automated) (#37714) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-03 09:29:43 +00:00
Claire
5b926157e8 Merge commit '6188de3efc293a6327cabcb858430aa79564dfd7' into glitch-soc/merge-upstream 2026-02-02 18:26:04 +01:00
github-actions[bot]
df1ac47a72 New Crowdin translations (#3376) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-02 18:25:03 +01:00
github-actions[bot]
6bf2b27b5b New Crowdin Translations (automated) (#37688) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-02 09:39:24 +00:00
Claire
0e154b859f Merge commit '6a5578a0db1aed100b6a3ac82b477923d221c350' into glitch-soc/merge-upstream 2026-01-30 12:00:44 +01:00
github-actions[bot]
6a5578a0db New Crowdin Translations (automated) (#37668) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-30 10:09:15 +00:00
Claire
32993fbdef Merge commit 'a6883242e3d9f9ed85806b66d40e1a148972bc3c' into glitch-soc/merge-upstream 2026-01-28 19:54:41 +01:00
Claire
a6883242e3 Remove unused nan locale files (replaced by nan-TW) (#37650) 2026-01-28 16:32:19 +00:00
github-actions[bot]
42dfd6c031 New Crowdin Translations (automated) (#37647) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-28 16:04:42 +00:00
Claire
5a45a3203a Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream 2026-01-27 18:03:27 +01:00
github-actions[bot]
6a73618f3d New Crowdin Translations (automated) (#37621) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-27 09:52:41 +00:00
Claire
b96c8ecff4 Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream 2026-01-26 18:09:54 +01:00
github-actions[bot]
e317645ed9 New Crowdin Translations (automated) (#37598) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-26 10:10:31 +00:00
Claire
8b95254883 Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream 2026-01-23 17:57:20 +01:00
diondiondion
a1acf8f4bc Add "My collections" page (#37552) 2026-01-23 13:51:39 +00:00
Matt Jankowski
157d8c0d99 Remove deprecated usage of imagemagick (#37488) 2026-01-22 14:57:19 +00:00
Claire
95aaefe083 Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream 2026-01-21 22:04:02 +01:00
github-actions[bot]
1468f94509 New Crowdin Translations (automated) (#37555) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-21 13:08:16 +00:00
Claire
5d04c56c48 Merge commit '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream 2026-01-20 16:14:14 +01:00
github-actions[bot]
8ff7662918 New Crowdin Translations (automated) (#37545) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-20 08:31:49 +00:00
David Roetzel
51224bb437 Add "featured collections" collection to actors (#37512) 2026-01-20 08:27:05 +00:00