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
Claire
c574f5b53f
Change how migrations duplicated between glitch and upstream are handled ( #2878 )
2024-10-09 18:36:19 +02:00
Claire
7e06d724c9
Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream
2024-10-07 20:45:07 +02:00
Claire
4a859140ec
Merge commit 'edcf3d9234b03d6b1c4b29d1d15339f7f64040fb' into glitch-soc/backports-4.3
2024-10-07 20:03:53 +02:00
Leni Kadali
4238da6ee3
Add error message when user tries to follow their own account ( #31910 )
2024-10-07 12:05:46 +00:00
github-actions[bot]
2e0d918d7d
New Crowdin Translations for stable-4.3 (automated) ( #32253 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-07 11:21:49 +02:00
github-actions[bot]
498024558a
New Crowdin Translations (automated) ( #32262 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-07 07:06:43 +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
Christian Schmidt
cbf1349370
Support /.well-known/host-meta.json ( #32206 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
19d1392b33
Avoid repeated icon stack in settings sidebar ( #32201 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
f517f0dbef
Fix nav item active highlight for some paths ( #32159 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
4ad1e955eb
Use module: :users in routes/admin section ( #30767 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
1283c3544c
Avoid id duplication conflict with main navigation from settings profile link ( #32181 )
2024-10-04 17:48:03 +02:00
gunchleoc
160917e718
Pluralize csv imports ( #27094 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-10-04 08:19:01 +00:00
github-actions[bot]
1b247a1dc2
New Crowdin Translations (automated) ( #32249 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-04 07:29:53 +00:00
Jeremy Kescher
1290a5609d
Merge branch 'glitch-v4.3.0-rc.1' into develop
2024-10-03 22:25:40 +02:00
github-actions[bot]
fe3f5375e3
New Crowdin Translations (automated) ( #32233 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-03 09:15:31 +00:00
Christian Schmidt
33d3ca7cf1
Support /.well-known/host-meta.json ( #32206 )
2024-10-02 09:23:44 +00:00
github-actions[bot]
ea72d5ec3a
New Crowdin Translations (automated) ( #32214 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-02 09:05:57 +00:00
Matt Jankowski
df98cf71e3
Avoid repeated icon stack in settings sidebar ( #32201 )
2024-10-01 13:50:20 +00:00
Matt Jankowski
4b4bf82ea9
Fix nav item active highlight for some paths ( #32159 )
2024-10-01 10:48:27 +00:00
Matt Jankowski
efd3f59627
Use module: :users in routes/admin section ( #30767 )
2024-10-01 10:02:58 +00:00
Emelia Smith
454d21ab5a
Remove OAuth Password Grant Type support ( #30960 )
2024-10-01 09:56:58 +00:00
Matt Jankowski
685067efd1
Avoid id duplication conflict with main navigation from settings profile link ( #32181 )
2024-10-01 08:23:05 +00:00
github-actions[bot]
5839ee434b
New Crowdin Translations (automated) ( #32195 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-01 08:21:17 +00:00
Claire
9af9ef6fb3
Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream
2024-09-30 13:04:19 +02:00
Claire
e22eff8900
Remove regexp timeout feature ( #32169 )
2024-09-30 09:41:06 +00:00
github-actions[bot]
f477dc399e
New Crowdin Translations (automated) ( #32140 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-30 08:53:29 +00:00
Claire
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
github-actions[bot]
c9b0699964
New Crowdin Translations (automated) ( #32121 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-27 07:34:46 +00:00
Claire
513f187daf
Add “A Mastodon update is available.” message on admin dashboard for non-bugfix updates ( #32106 )
2024-09-26 19:27:57 +00:00
github-actions[bot]
278a075b22
New Crowdin Translations (automated) ( #32103 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-26 08:47:38 +00:00
Christian Schmidt
db332553c9
Rename "Data export" menu item ( #32099 )
2024-09-25 19:54:28 +00: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
github-actions[bot]
4e6fc3a62f
New Crowdin Translations (automated) ( #32083 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-25 07:40:14 +00:00
Claire
c6039f99ce
Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream
2024-09-24 19:34:30 +02:00
David Roetzel
cfb8fc6222
Increase regexp timeout and allow override ( #32056 )
2024-09-24 13:16:58 +00:00
github-actions[bot]
11ac5c8929
New Crowdin Translations (automated) ( #32052 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-24 09:42:14 +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
Tim Campbell
11eae691ba
Feature more otel customization ( #31998 )
2024-09-23 08:55:35 +00:00
github-actions[bot]
ed90d9342e
New Crowdin Translations (automated) ( #32011 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-23 08:50:19 +00:00
Eugen Rochko
5fae1d55e5
Fix OAuth authorization prompt referring to third-party apps ( #32005 )
2024-09-23 08:42:03 +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
github-actions[bot]
162f9a3c90
New Crowdin Translations (automated) ( #31993 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-20 08:31:28 +00:00
