Jeremy Kescher
b9c08026fd
Merge branch 'upstream-main' into develop
2025-01-03 23:46:21 +01:00
Jeremy Kescher
85aae42f26
Merge branch 'emoji-reactions-base' into develop
2024-12-30 01:38:01 +01:00
Claire
0aa69487a2
Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `config/routes.rb`:
Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
an extra route.
Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
This spec got converted to a system spec upstream.
However, the theme setting works differently in glitch-soc, so the spec had been
changed.
Changed the corresponding system spec as well.
2024-12-25 18:01:37 +01:00
Claire
bcb3b627b9
Fix processing of mentions for post edits with an existing corresponding silent mention ( #33227 )
2024-12-11 12:59:29 +00:00
Eugen Rochko
30aa0df88c
Add terms of service ( #33055 )
2024-12-09 10:04:46 +00:00
Claire
21f6780498
Fix deletion of unconfirmed users with Webauthn set ( #33186 )
2024-12-05 09:38:48 +00:00
Claire
c2817c7fad
Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/feed_manager.rb`:
Upstream changed how notifications from follow subscriptions were handled,
refactoring this file in the process.
Conflict is due to glitch-soc having an extra timeline type (direct).
Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
Ditto.
2024-12-02 21:08:15 +01:00
Jonathan de Jong
360b6d3a44
Fix exclusive lists interfering with notifications ( #28162 )
2024-12-02 09:26:04 +00:00
Claire
f740611820
Merge commit 'd0753ec276502ea28a1e853cbc6487020a0602e3' into glitch-soc/merge-upstream
2024-11-24 18:56:15 +01:00
Claire
6374937147
Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream
...
Conflicts:
- `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-11-24 16:46:28 +01:00
Paulo Vilarinho
2526b32ad3
block scheduled status from frozen users ( #30729 )
2024-11-20 19:06:41 +00:00
Eugen Rochko
2b5faa2ba3
Change lists to reflect added and removed users retroactively ( #32930 )
2024-11-19 10:04:12 +00:00
Jeremy Kescher
a38cc7ec83
Merge branch 'upstream-main' into develop
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Historical data migration test / test (16-alpine) (push) Has been cancelled
Historical data migration test / test (17-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (push) Has been cancelled
Ruby Testing / End to End testing (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (push) Has been cancelled
2024-11-17 00:02:19 +01:00
Claire
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
Emelia Smith
aeae152006
Prevent Web::Push notification delivery if notification is outside of TTL window ( #32842 )
2024-11-11 19:56:28 +00:00
Claire
f0f807cec7
Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream
2024-11-10 13:18:43 +01:00
Matt Jankowski
73f66af6eb
Update location of unused MIN_SCHEDULE_OFFSET constant ( #31217 )
2024-11-07 10:28:59 +00:00
Jeremy Kescher
7fa9c34dee
Merge branch 'upstream-main' into develop
2024-11-01 17:13:04 +01:00
Claire
8103e69b17
Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
...
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/account.rb`:
Conflict due to upstream changing lines adjacent to a change made in glitch-soc
to have configurable limits.
Ported upstream's changes.
- `yarn.lock`:
Dependencies adjacent to glitch-soc-only dependencies updated.
Updated them as well.
2024-10-26 13:38:07 +02:00
David Roetzel
05f23df3b7
Add endpoint to remove web push subscription ( #32626 )
2024-10-23 08:02:31 +00:00
Claire
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
Claire
10ea6da09f
Fix language of push notifications ( #32415 )
2024-10-11 10:24:03 +00:00
Jeremy Kescher
9090719153
Merge remote-tracking branch 'refs/remotes/upstream/stable-4.3' into develop
2024-10-10 22:57:13 +02:00
Matt Jankowski
258dce1256
Add OpenSSL::SSL::SSLError to http connection errors wrapper ( #32307 )
2024-10-08 14:59:51 +00:00
Matt Jankowski
e8ec6667bd
Extract wrapper constant for HTTP::* error classes ( #32285 )
2024-10-08 13:53:35 +00:00
Claire
b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +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
Matt Jankowski
74291dfb77
Remove unneeded reorder(nil) conditions ( #32200 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
f07707a9bb
Extract WebPushRequest from push notification worker and subscription ( #32208 )
2024-10-04 17:48:03 +02:00
Jeong Arm
b8fdffe824
Ignore error if mentioned account was not processable ( #29215 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-10-04 17:48:03 +02:00
Jeremy Kescher
1290a5609d
Merge branch 'glitch-v4.3.0-rc.1' into develop
2024-10-03 22:25:40 +02:00
Matt Jankowski
1f65a95421
Remove unneeded reorder(nil) conditions ( #32200 )
2024-10-02 12:26:16 +00:00
Matt Jankowski
4aa26eba53
Extract WebPushRequest from push notification worker and subscription ( #32208 )
2024-10-02 11:11:52 +00:00
Jeong Arm
66b2bc1c84
Ignore error if mentioned account was not processable ( #29215 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-10-02 08:08:02 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
Jeremy Kescher
7df41062ba
Merge branch 'glitch' into develop
2024-08-26 18:31:12 +02:00
Claire
1760f84349
Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream
2024-08-19 18:25:31 +02:00
Claire
53c183f899
Reload notifications when accepted notifications are merged (streaming only) ( #31419 )
2024-08-19 15:59:06 +00:00
Jeremy Kescher
6a092bd6a3
Merge branch 'glitch' into develop
2024-08-18 18:08:34 +02:00
Claire
3ea00508ac
Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream
2024-08-16 20:06:59 +02:00
Claire
2d589a5ed4
Fix incorrect activity matching in notification unfiltering worker ( #31456 )
2024-08-16 17:11:23 +00:00
Jeremy Kescher
08e538f8a4
Merge branch 'glitch' into develop
2024-08-16 16:05:14 +02:00
Claire
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
Claire
7996a9543d
Change notification request acceptance to immediately delete the request ( #31256 )
2024-08-14 07:34:30 +00:00
Matt Jankowski
02df1b4e4a
Finish email allow/deny list naming migration ( #30530 )
2024-08-13 07:37:32 +00:00
Jeremy Kescher
084cfb7d6c
Merge branch 'refs/heads/glitch' into develop
2024-08-11 19:09:56 +02:00
Claire
06e034db15
Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-soc/merge-upstream
2024-08-07 19:22:25 +02:00
Claire
670e4655d1
Change dismissing a notification to clear existing filtered notifications for that account ( #31329 )
2024-08-07 15:14:37 +00:00
Jeremy Kescher
afa0c78715
Merge branch 'refs/heads/glitch' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/actions/interactions.js
2024-07-30 08:38:14 +02:00
