tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,633 Commits 5 Branches 0 Tags
b33cc49abf08e6533a530112ccade8314ba3d896
Commit Graph
1625 Commits
Author SHA1 Message Date
Claire 1403a21fe8 Merge commit 'd74bbd9a3c64740433e016dfc936e83d710858f6' into glitch-soc/merge-4.6 2026-08-13 18:41:35 +02:00
Claire d74bbd9a3c Bump version to v4.6.6 2026-08-13 18:16:01 +02:00
Claire c76fd2b478 Update mastodon:setup task warning about trademark to match masto but ignore subdomains (#40143) 2026-08-13 14:42:43 +02:00
Claire 53bad36955 Merge commit '1440d55b139e39ec722c2a3db7f60b66cd889048' into glitch-soc/merge-4.6 2026-08-06 18:09:08 +02:00
Claire 1440d55b13 Bump version to v4.6.5 2026-08-06 14:22:54 +02:00
Claire 2be3994558 Merge commit '930aa9fee26bf9eaefe27826fa1061288d83373b' into glitch-soc/stable-4.6 2026-07-27 16:05:45 +02:00
Claire 930aa9fee2 Merge commit from fork 
* Fix GHSA-7jvv-fhmg-wpfw

* Fix GHSA-hx34-2pfw-2qfj

* Fix GHSA-vwhj-3g83-v276

* Bump version to v4.6.4
 2026-07-27 16:02:01 +02:00
Claire f8fb62193a Merge commit 'eeb68053a83894190eefae178a661018b9859494' into glitch-soc/merge-4.6 2026-07-03 18:14:36 +02:00
Claire eeb68053a8 Bump version to v4.6.3 2026-07-03 15:22:15 +02:00
Claire 8941f1f98c Merge commit '06d64519da4c6fc50536744f0d950dae22c6e2b9' into glitch-soc/merge-4.6 2026-07-02 18:31:59 +02:00
Brook Miles 27c66a997f fix tootctl media lookup fails on local media URLs (#39615) 2026-07-02 14:14:43 +02:00
Claire 42e1446900 Merge commit '70d39d364ba6183a2b6e2f763204fe2c21e0ca42' into glitch-soc/merge-4.6 2026-06-25 11:07:11 +02:00
Claire 70d39d364b Bump version to v4.6.2 2026-06-25 10:56:15 +02:00
Claire 3083fdad1f Merge commit '46108ecfe18f53e8a989aa36e9397914f6bc0108' into glitch-soc/merge-4.6 2026-06-24 17:27:19 +02:00
Claire 8fe3dbad2e Bump version to v4.6.1 2026-06-24 14:48:52 +02:00
Claire 2f491f0d48 Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version.
   Did it as well.
 2026-06-23 18:01:59 +02:00
Claire a454bbde69 Bump Mastodon API version (#39574) 2026-06-23 17:35:29 +02:00
Claire 6b4e8c7467 Merge commit 'e8642389912b1059c921f0836825f12a0f2779db' into glitch-soc/merge-4.6 
Conflicts:
- `app/models/account.rb`:
  Upstream changed the display name length limit for local users,
  but glitch-soc has a configurable limit.
  Updated the default limit to be upstream's new limit.
 2026-06-17 14:40:25 +02:00
Claire e864238991 Bump version to v4.6.0 (#39470) 2026-06-17 14:14:09 +02:00
Matt Jankowski 41ea9ad128 Handle missing sw.js in test environment assets (#39459) 2026-06-17 12:09:12 +02:00
Claire 6aca68e185 Merge commit 'e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def' into glitch-soc/merge-4.6 2026-06-16 21:49:17 +02:00
Claire e2b7096bd3 Bump version to v4.6.0-rc.2 (#39441) 2026-06-15 17:27:55 +02:00
Claire 08027edb10 Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream 2026-06-12 18:37:02 +02:00
Eugen Rochko d438a09ddb Bump version to 4.6.0-rc.1 (#39383) 2026-06-11 17:22:41 +00:00
Claire 89c2ac444f Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream 2026-06-10 18:52:58 +02:00
Claire 22a5e1b0b0 Fix Elasticsearch connection cleanup in Sidekiq middleware (#39359) 2026-06-10 15:12:25 +00:00
Matt Jankowski c51eb56a90 Clarify preview card CLI command handles media only (#39348) 2026-06-10 09:27:07 +00:00
Claire a1ab96baed Merge commit '52aa8a44bbd0c9a6673cbd9b7c088020be938799' into glitch-soc/merge-upstream 2026-06-03 22:30:16 +02:00
Eugen RochkoClairediondiondion
 		52aa8a44bb Bump version to v4.6.0-beta.1 (#39222) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-06-03 15:09:26 +00:00
Claire 003ad015f8 Merge commit '0529a1f7d2197dd535f59163c00634f9c060723d' into glitch-soc/merge-upstream 2026-06-03 14:42:51 +02:00
Claire 0529a1f7d2 Bump version to v4.5.11 (#39264) 2026-06-03 12:26:55 +00:00
Claire 659a077616 Merge commit '07236016bcc78a82205093b3e067bf4a1bb07d88' into glitch-soc/merge-upstream 2026-06-03 12:19:05 +02:00
Pia B. 07236016bc Merge commit from fork 
* add guard clause to check for node attributes

* check for encoding attribute specifically

* check for encoding attribute specifically

* change spec
 2026-06-03 12:12:37 +02:00
Claire dd12ed2b98 Merge commit 'd1c26c1e27348278fb8081b290e300b327a61ca1' into glitch-soc/merge-upstream 2026-06-02 18:01:45 +02:00
Claire d1c26c1e27 Fix not importing stylesheet recursively (#39254) 2026-06-02 15:23:52 +00:00
Claire 3cf0fb7ba0 Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream 2026-06-01 18:00:03 +02:00
Matt Jankowski 50b6bbe379 Update vite_rails to version 3.11.0 (#39218) 2026-06-01 14:51:01 +00:00
Claire ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.
 2026-05-30 12:13:35 +02:00
David Roetzel 6d3182a6eb Move Collections API to v1 namespace (#39210) 2026-05-29 08:39:51 +00:00
Claire 487c814eb9 Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Glitch-soc allows a wider range of HTML than upstream.
  Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
  added it there too.
 2026-05-22 19:43:42 +02:00
Artemis Tosini c337487111 Allow HTML lang attribute in remote posts (#39114) 2026-05-22 08:43:16 +00:00
Claire ca427bc176 Merge commit 'f5b57e8ba7a2d3687b1ae496f6213bfe5347c0fa' into glitch-soc/merge-upstream 2026-05-20 15:43:33 +02:00
Claire f5b57e8ba7 Bump version to v4.5.10 (#39104) 2026-05-20 13:20:08 +00:00
Claire 0c80bf0e82 Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream changed a line adjacent to one glitch-soc modified due to its theming system.
  Adapted upstream's change.
- `yarn.lock`:
  Upstream updated a dependency next to one glitch-soc added.
  Updated the dependency as upstream did.
 2026-05-19 20:40:57 +02:00
Echo 34c91555ae Refactor emoji search (#39008) 2026-05-19 10:47:45 +00:00
Claire 4fcc9b8a40 Merge commit 'd2f640272f3f36c8979cff645416682840528906' into glitch-soc/merge-upstream 2026-05-12 18:37:31 +02:00
Pia B. a6a8a37ae1 add raketasks to generate collections for testing (#38986) 2026-05-11 15:17:00 +00:00
Claire 3072de056a Merge commit '3a84990780fb1b48999f661f0cea5cb29cca4d33' into glitch-soc/merge-upstream 2026-04-15 16:27:32 +02:00
Claire 3a84990780 Bump version to v4.5.9 (#38696) 2026-04-15 14:10:28 +00:00
Claire ff80786d2e Merge commit 'd9ea631d5911ebfe090e0d1ea1b11441aa58c918' into glitch-soc/merge-upstream 2026-04-15 13:36:46 +02:00