mirror/YuruToot
1
0
Fork 0
mirror of https://github.com/funamitech/mastodon synced 2024-11-23 14:46:52 +09:00
Code
24,223 Commits 1 Branch 1 Tag 329 MiB
main
Commit Graph

761 Commits

Author SHA1 Message Date
Noa Himesaka
ce801c6e63
Merge branch 'glitch-soc:main' into main 2024-11-19 20:05:03 +09:00
Claire
4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
Emelia Smith
2bd56f726a
Add client_secret_expires_at to OAuth Applications (#30317) 2024-11-12 22:06:13 +00:00
Noa Himesaka
5c18104101 Merge branch 'pr2462' 2024-11-11 13:46:02 +09:00
Noa Himesaka
8f563dd680 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2024-11-11 13:44:26 +09:00
Claire
f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
Essem
4563b3a1c9
Fix invisible reactions on detailed statuses when logged out 2024-11-07 20:22:28 -06:00
Eugen Rochko
d6349c0e9a
Add year in review feature to web UI (#32709) 2024-11-05 14:40:07 +00:00
Matt Jankowski
20a147170e
Remove unused usage method from REST::V1::InstanceSerializer (#32768) 2024-11-05 14:20:27 +00:00
Claire
f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
 2024-11-03 20:51:58 +01:00
Emelia Smith
e1b7382ea6
Add userinfo oauth endpoint (#32548) 2024-10-30 14:38:10 +00:00
Jonny Saunders
9074c1fac9
Use likes and shares totalItems on status creations and updates (#32620) 2024-10-28 04:55:18 +00:00
Noa Himesaka
d45671066c Merge branch 'main' of https://github.com/glitch-soc/mastodon 2024-10-17 00:30:51 +09:00
Claire
4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
Jake Anto
0c16365991
Prefer native apps over PWA (#27254) 2024-10-07 20:33:14 +00:00
Essem
729587128a
Add notification grouping for reactions 2024-10-06 23:40:03 -05:00
Essem
10faca4790
Hydrate reactions on streaming API 2024-10-06 23:38:19 -05:00
Essem
b275f1aa77
Add support for emoji reactions 
Squashed, modified, and rebased from glitch-soc/mastodon#2221.

Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2024-10-06 23:38:15 -05:00
Noa Himesaka
67c1a405ad Merge branch 'pr2462' 2024-10-01 17:19:04 +09:00
Essem
4e127c00b8
Add notification grouping for reactions 2024-09-30 20:29:21 -05:00
Essem
7cb1921ae7
Hydrate reactions on streaming API 2024-09-30 20:28:01 -05:00
Essem
0fe45d5fef
Add support for emoji reactions 
Squashed, modified, and rebased from glitch-soc/mastodon#2221.

Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2024-09-30 20:27:58 -05:00
Claire
7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
Noa Himesaka
262ddc00f4 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2024-09-28 23:23:16 +09:00
Eugen Rochko
3426ea2912
Add preview of followers removed in domain block modal in web UI (#32032) 2024-09-25 18:13:36 +00:00
Claire
c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
Eugen Rochko
aaab6b7adc
Add reblogs and favourites counts to statuses in ActivityPub (#32007) 2024-09-23 13:14:15 +00:00
Claire
221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
Matt Jankowski
a7dbf6f5a5
Use heredoc/squish for inline css styles in oembed serializer (#31991) 2024-09-20 12:50:51 +00:00
Matt Jankowski
bdf83c353f
Move default embed size knowledge into OEmbedSerializer (#31990) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-20 12:39:48 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00
Claire
6de18bb475 Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream 2024-09-17 17:54:00 +02:00
Claire
665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
 2024-09-16 21:08:58 +02:00
Claire
c620452fd7
Enable grouped notifications unconditionally (#31929) 2024-09-16 13:12:10 +00:00
Claire
e0648a916a
Rename /api/v2_alpha/notifications* to /api/v2/notifications* (#31840) 2024-09-16 12:10:02 +00:00
Claire
3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.
 2024-09-12 20:05:08 +02:00
Eugen Rochko
24ef8255b3
Change design of embed modal in web UI (#31801) 2024-09-12 12:54:16 +00:00
Claire
10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
Eugen Rochko
3d46f47817
Change embedded posts to use web UI (#31766) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-12 09:41:19 +00:00
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews (#31819) 2024-09-10 12:00:40 +00:00
Claire
402c1e116d Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream 2024-09-02 17:43:10 +02:00
Claire
a23b3747ac
Fix N+1s in grouped notifications (#31638) 2024-09-02 09:56:00 +00:00
Claire
6f35e93f72 Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream 2024-08-31 16:06:04 +02:00
Matt Jankowski
662f87dbe9
Use MediaAttachment.supported_mime_types method where relevant (#31635) 2024-08-29 08:52:29 +00:00
Claire
94d8cdc494 Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream 2024-08-27 20:00:07 +02:00
Claire
c73868cd78
Add ability for admins to force grouped notifications in web UI (#31610) 2024-08-27 14:55:51 +00:00
Noa Himesaka
acf40f349d Merge branch 'main' of https://github.com/glitch-soc/mastodon 2024-08-24 22:53:34 +09:00
Claire
18556d3e9b Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream refactored some helpers and moved them in another file.
  Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
  Kept glitch-soc definitions where they are and moved upstream ones
  as upstream did.
 2024-08-22 19:54:20 +02:00
Renaud Chaput
4a968cb7a9
Add icon field to instance endpoint (#30205) 2024-08-22 10:04:27 +00:00
Claire
0cec9077a4 Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Upstream added a test for a new attribute, next to a line we modified
  in glitch-soc because of a different default value.
  Updated as upstream's did, keeping glitch-soc's default value.
 2024-08-21 18:44:21 +02:00