mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
23,542 Commits 2 Branches 16 Tags 298 MiB
Commit Graph

2285 Commits

Author SHA1 Message Date
Siph d45e85cbf2
Merge tag 'v4.3.2' 2024-12-03 21:56:55 +01:00
Claire 0d69cc068c Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
 2024-12-02 21:49:12 +01:00
Matt Jankowski a089109b77 Use `async_count` in more view locations (#32086) 2024-12-02 16:20:32 +01:00
Leni Kadali 74f9f7c600 Add error message when user tries to follow their own account (#31910) 2024-12-02 16:20:32 +01:00
Siph 763fab2ec2
Merge tag 'v4.3.1' 2024-11-06 10:27:50 +01:00
Claire 198283a188 Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while
  glitch-soc has a different version of the file overall.
  Added upstream's changes.
 2024-10-16 12:42:12 +02:00
Christian Schmidt 0ff427fab3 Translate to regional language variant (e.g. pt-BR) (#32428) 2024-10-16 12:40:58 +02:00
Claire b40adb4a89 Merge commit 'f99da81ef8b14a851347503d4177f83322c16d9a' into glitch-soc/stable-4.3 2024-10-14 19:18:08 +02:00
Claire e5e0144957 Fix notification requests from suspended accounts still being listed (#32354) 2024-10-14 13:14:38 +02:00
Siph c424034186
Merge tag 'v4.3.0' into glitch-soc-release 2024-10-08 18:59:10 +02:00
Claire dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
 2024-10-05 20:45:05 +02:00
Claire 81cd489208 Fix Content-Security-Policy when using sso-redirect (#32241) 2024-10-04 17:48:03 +02:00
Christian Schmidt cbf1349370 Support /.well-known/host-meta.json (#32206) 2024-10-04 17:48:03 +02:00
David Roetzel ce2481a81b Move OTP secret length to configuration (#32125) 2024-10-04 17:48:03 +02:00
Siph 21fc9033f6
merge upstream 2024-09-30 22:02:02 +02:00
Claire 7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02: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 633165ba9c Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream 2024-09-25 17:41:37 +02:00
Renaud Chaput 3dc4ddc663
Fix search params being dropped when redirected to non-deck path (#31984) 2024-09-25 13:35:37 +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 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 c922af2737
Add `LIMIT` constant for `api/v1/peers/search` endpoint (#31989) 2024-09-20 08:31:58 +00:00
Matt Jankowski 5405bdd344
Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00
Matt Jankowski a397141d78
Move non-action public method controller callback to private methods (#31933) 2024-09-18 08:05:25 +00: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 e0648a916a
Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` (#31840) 2024-09-16 12:10:02 +00:00
Claire 83b553c7d1 Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
Matt Jankowski f3c4874522
Remove unused `statuses#embed` body class assignment (#31787) 2024-09-12 13:38:15 +00:00
Matt Jankowski 4aa600387e
Move redirect/base body class to view (#31796) 2024-09-12 13:31:50 +00:00
Claire a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive (#26897) 2024-09-12 13:24:19 +00:00
Claire 10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02: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 29124990a2 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.
 2024-09-06 19:25:31 +02:00
Matt Jankowski 7335a43b6d
Use async count in admin dashboard (#30606) 2024-09-06 16:52:35 +00:00
Matt Jankowski 0a433d08fb
Move shares/modal body class to layout (#31789) 2024-09-06 16:46:55 +00:00
Matt Jankowski 4f81ad2494
Add coverage for `media#player`, move body class to view (#31790) 2024-09-06 16:46:25 +00:00
Emelia Smith c88ba523ee
Fix sort order of moderation notes on Reports and Accounts (#31528) 2024-09-06 14:58:36 +00:00
Matt Jankowski a9d0b48b65
Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
Matt Jankowski 7efe0bde9d
Add `have_http_link_header` matcher and set header values as strings (#31010) 2024-09-05 20:05:38 +00:00
Claire 5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests.
 2024-09-04 19:38:52 +02:00
Claire 1fcffa573c
Fix 500 error in `GET /api/v2_alpha/notifications` when there are no notifications to return (#31746) 2024-09-04 12:54:15 +00:00
Claire fef055db96 Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
  Upstream refactored this file, while we had a change to switch a default setting.
  Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
  Upstream refactored this file, while we stubbed different methods.
  Updated as upstream did, and updated the stubs accordingly.
 2024-09-03 21:51:53 +02:00
Claire ea0d691e19
Add `GET /api/v2_alpha/notifications/:group_key/accounts` (#31725) 2024-09-03 14:32:26 +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
Claire ad0a28a8bf
Add `grouped_types` parameter to allow clients to restrict which notifications types get grouped (#31594) 2024-08-29 12:39:07 +00: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