Jeremy Kescher
b58bc7102e
Merge branch 'upstream-stable/4.3' into stable/4.3
2024-11-01 17:03:17 +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
Jeremy Kescher
9090719153
Merge remote-tracking branch 'refs/remotes/upstream/stable-4.3' into develop
2024-10-10 22:57:13 +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
Claire
754b03d8cb
Fix unneeded requests to blocked domains when receiving relayed signed activities from them ( #31161 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
66ef4b9984
Remove WebfingerHelper module & move usage inline ( #31203 )
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
Claire
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
Renaud Chaput
d6f5ee75ab
Add notification grouping for follow notifications ( #32085 )
2024-09-25 13:36:19 +00:00
Claire
c6039f99ce
Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream
2024-09-24 19:34:30 +02:00
Claire
c36a76b9eb
Fix error when accepting appeal for sensitive posts deleted in the meantime ( #32037 )
...
Co-authored-by: David Roetzel <david@roetzel.de>
2024-09-24 15:19:55 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Claire
8afa3bb2fa
Change Mastodon to issue correctly-signed queries by default ( #31994 )
2024-09-20 10:10:09 +00:00
Jeremy Kescher
655d28f6a7
Merge remote-tracking branch 'upstream/main' into develop
...
Also apply "Make addReaction and removeReaction optional props", therefore:
Co-authored by: Essem <smswessem@gmail.com>
2024-09-20 11:53:07 +02:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
Claire
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
Jeremy Kescher
0b66cfbc8d
Merge remote-tracking branch 'upstream/main' into develop
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Crowdin / Upload translations / upload-translations (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
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.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-09-10 16:15:59 +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
441af2632d
Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream
2024-09-09 18:22:41 +02:00
Mike Dalessio
a0ea2fa3b0
Change fetch link card service to parse as HTML5 ( #31814 )
2024-09-09 10:59:42 +00:00
Mike Dalessio
afa2e257e4
Change verify link service to use CSS selectors instead of a complex XPath query ( #31815 )
2024-09-08 18:50:22 +00:00
Mike Dalessio
10143d053a
Change some instances of Nokogiri HTML4 parsing to HTML5 ( #31812 )
2024-09-08 18:41:37 +00:00
Claire
ac4002fe08
Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream
2024-09-03 12:12:23 +02:00
Christian Schmidt
a5bbe83dfd
media_ids is an array of strings ( #31709 )
2024-09-02 20:18:09 +00:00
Claire
402c1e116d
Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream
2024-09-02 17:43:10 +02:00
Christian Schmidt
491033c86c
Reject status creation with invalid media_ids parameter ( #31681 )
2024-09-02 15:30:48 +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
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
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
Claire
2ed13071ef
Fix what was intended as a comment being interpreted as strings ( #31398 )
2024-08-13 08:48:10 +00:00
Jeremy Kescher
084cfb7d6c
Merge branch 'refs/heads/glitch' into develop
2024-08-11 19:09:56 +02:00
Claire
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
Claire
cbdd8edf68
Revamp notification policy options ( #31343 )
2024-08-09 13:30:55 +00: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
Claire
719cabe024
Fix logic of block/mute bypass for mentions from moderators ( #31271 )
2024-08-07 06:52:10 +00:00
Claire
08adca0c63
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream
2024-08-06 17:27:48 +02:00
Claire
5d890ebc57
Delete pending notification requests on block and notification mutes ( #31310 )
2024-08-06 10:07:16 +00:00
Jeremy Kescher
2154b55103
Merge branch 'refs/heads/glitch' into develop
2024-08-04 13:48:14 +02:00
Claire
e67e07211f
Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
to glitch-soc-only dependency `atrament`.
Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
to glitch-soc-only dependency `atrament`.
Removed direct dependency on `autoprefixer`.
2024-08-02 18:09:48 +02:00
Christian Schmidt
4853a2bada
Add Accept-Language header when fetching preview card ( #31232 )
2024-08-01 09:14:24 +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
Claire
68000956f4
Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream
2024-07-23 19:31:23 +02:00
