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
Jeremy Kescher
9090719153
Merge remote-tracking branch 'refs/remotes/upstream/stable-4.3' into develop
2024-10-10 22:57:13 +02: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
4ad1e955eb
Use module: :users in routes/admin section ( #30767 )
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
efd3f59627
Use module: :users in routes/admin section ( #30767 )
2024-10-01 10:02:58 +00: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
28966fa0a6
Remove deprecated v2_alpha endpoint for grouped notifications ( #32089 )
2024-09-25 15:21:11 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02: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
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
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
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
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
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
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
Claire
da5b45a573
Add endpoints to accept and dismiss multiple notification requests at once ( #31242 )
2024-08-01 12:36:54 +00:00
Jeremy Kescher
788e0fe2ec
Merge branch 'refs/heads/glitch' into develop
2024-07-31 15:02:40 +02:00
Claire
1f796d129d
Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
Ported upstream changes.
2024-07-30 20:47:34 +02:00
Claire
598ae4f2da
Add endpoints for unread notifications count ( #31191 )
2024-07-30 08:39:11 +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
654187a995
Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream
2024-07-29 19:16:58 +02:00
Emelia Smith
c40e481169
Implement UI for Admin Search of Hashtags ( #30880 )
2024-07-29 15:49:44 +00:00
Jeremy Kescher
1862a60e51
Merge branch 'refs/heads/glitch' into develop
2024-07-16 22:32:15 +02:00
Claire
388672ff0d
Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream
2024-07-09 20:39:09 +02:00
Matt Jankowski
f47d761e12
Remove unneeded controller option in routes ( #30958 )
2024-07-09 07:34:19 +00:00
Claire
6a55232988
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
Matt Jankowski
c29fdadefd
Use scope module: ... for more API routes ( #30935 )
2024-07-08 07:21:49 +00:00
Claire
11dd51ef44
Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream and glitch-soc had different comments, some comments got updated upstream.
Updated them in glitch-soc accordingly.
2024-07-06 21:02:42 +02:00
Matt Jankowski
8c375d8a5c
Use scope module: ... for settings/2FA routes ( #30919 )
2024-07-05 08:57:54 +00:00
Jeremy Kescher
209f90f670
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-16 05:32:45 +02:00
Claire
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
Eugen Rochko
a2505e8611
Add timeline of public posts about a trending link to REST API ( #30381 )
2024-06-06 08:43:04 +00:00
Claire
974335e414
Add experimental server-side notification grouping ( #29889 )
2024-06-03 08:35:59 +00:00
Jeremy Kescher
e73c612cb1
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-11 23:31:31 +02:00
