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
github-actions[bot]
c546aa57cb
New Crowdin Translations (automated) ( #32900 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-15 10:30:11 +00:00
Claire
2de018256a
Fix filters not being correctly applied to boosted posts ( #32895 )
2024-11-14 19:42:43 +00:00
Claire
ec663eaba1
Fix Content Warning and filter states not applying to boosted posts properly ( #32887 )
2024-11-14 12:50:36 +00:00
github-actions[bot]
aaebf142aa
New Crowdin Translations (automated) ( #32884 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-14 09:39:33 +00:00
github-actions[bot]
baad795384
New Crowdin Translations (automated) ( #32868 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-13 09:33:02 +00:00
Eugen Rochko
32e5e1d3f1
Fix a few visual issues with annual reports in web UI ( #32807 )
2024-11-12 12:35:35 +00:00
github-actions[bot]
0d06d70d11
New Crowdin Translations (automated) ( #32811 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-12 08:47:59 +00:00
Christian Schmidt
157fba4698
Backspace hotkey should override default behaviour ( #32826 )
2024-11-10 16:16:07 +00:00
Claire
f0f807cec7
Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream
2024-11-10 13:18:43 +01:00
Jeremy Kescher
c9f7e9454c
Merge branch 'upstream-main' into develop
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
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 / 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-08 14:46:42 +01:00
github-actions[bot]
8df867b20a
New Crowdin Translations (automated) ( #32803 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-08 09:53:47 +00:00
Claire
6ae1fcd059
Fix list of follow requests not having a back button ( #32797 )
2024-11-07 11:45:46 +00:00
github-actions[bot]
4ed3ce2377
New Crowdin Translations (automated) ( #32793 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-07 09:45:05 +00:00
Claire
d482211aa6
Fix out-of-view post contents being inconsistent with in-view post contents ( #32778 )
2024-11-06 13:30:53 +00:00
github-actions[bot]
871e3b25e8
New Crowdin Translations (automated) ( #32782 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-06 08:21:13 +00:00
Eugen Rochko
d6349c0e9a
Add year in review feature to web UI ( #32709 )
2024-11-05 14:40:07 +00:00
github-actions[bot]
933fa81baf
New Crowdin Translations (automated) ( #32772 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-05 08:41:09 +00:00
Claire
0a1b5df202
Fix alt-text pop-in not using the translated description ( #32766 )
2024-11-04 11:08:19 +00:00
github-actions[bot]
2271b39a5c
New Crowdin Translations (automated) ( #32733 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-04 08:56:11 +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
Jeremy Kescher
7fa9c34dee
Merge branch 'upstream-main' into develop
2024-11-01 17:13:04 +01:00
github-actions[bot]
e78db58b65
New Crowdin Translations (automated) ( #32708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-31 10:01:05 +00:00
Renato "Lond" Cerqueira
01e25af2e3
Fix 'unknown' media attachment rendering in detailed view ( #32713 )
2024-10-31 09:37:31 +00:00
github-actions[bot]
0a599d08d8
New Crowdin Translations (automated) ( #32695 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-30 10:02:02 +00:00
github-actions[bot]
244aaf9a38
New Crowdin Translations (automated) ( #32687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-29 09:29:22 +00:00
Emelia Smith
dc0b1948be
Feat: Implement interaction modal for Polls ( #32609 )
2024-10-28 13:27:37 +00:00
github-actions[bot]
0426cb78f7
New Crowdin Translations (automated) ( #32589 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-28 13:23:13 +00: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
Claire
393f0a0159
Redesign Content Warning and filters ( #32543 )
2024-10-23 09:47:23 +00:00
David Roetzel
029c99bd7b
Do not change follow counters when already following ( #32622 )
2024-10-22 12:49:10 +00:00
Emelia Smith
346cdb998c
Fix 'unknown' media attachment type rendering ( #32613 )
2024-10-22 08:31:53 +00:00
renovate[bot]
11a63b2db6
Update eslint (non-major) ( #32279 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-10-21 08:03:44 +00:00
Claire
6281c4dedd
Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream
...
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.
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-19 19:13:32 +02:00
Claire
1fc165de02
Remove ability to get embed code for remote posts ( #32578 )
2024-10-18 10:51:05 +00:00
github-actions[bot]
8eae0d067d
New Crowdin Translations (automated) ( #32573 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-18 07:56:43 +00:00
hota
0f37b7d6ac
Fix column-settings spacing in local timeline in advanced view ( #32567 )
2024-10-18 07:40:08 +00:00
github-actions[bot]
009f2ebc32
New Crowdin Translations (automated) ( #32553 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-17 08:21:51 +00:00
Emelia Smith
bc2e642272
Fix: Reword 'pick one' to 'single choice' for polls ( #32397 )
2024-10-16 10:40:40 +00:00
Renaud Chaput
6c87c76e18
Add ability to group follow notifications in WebUI ( #32520 )
2024-10-16 08:33:11 +00:00
github-actions[bot]
acc1973f3a
New Crowdin Translations (automated) ( #32533 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-16 08:12:43 +00:00
Renaud Chaput
7a7a7cc448
Add back a 6 hours mute duration option ( #32522 )
2024-10-16 07:27:44 +00:00
Jeong Arm
5afdb81b36
Fix reblog icons on account media view ( #32506 )
2024-10-15 10:01:21 +00:00
Claire
5e4cc1a39c
Fix follow recommendation carrousel scrolling on RTL layouts, for real ( #32505 )
2024-10-15 09:38:04 +00:00
github-actions[bot]
7d89cea0ea
New Crowdin Translations (automated) ( #32339 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-15 09:26:28 +00:00
Claire
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
Claire
7c10b0fb7a
Fix follow recommendation carrousel scrolling on RTL layouts ( #32462 )
2024-10-14 15:25:32 +00:00
Jeremy Kescher
d364a1b0a7
Merge branch 'upstream-main' into develop
2024-10-11 00:53:18 +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
