Noa Himesaka
acf40f349d
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-08-24 22:53:34 +09:00
Claire
ccd7eb397a
Merge pull request #2825 from ClearlyClaire/glitch-soc/fixes/nightly-tagging
...
Update github actions
2024-08-24 12:46:57 +02:00
Claire
f5d26225ed
Re-enable PR-needs-rebase action for glitch-soc (was disabled upstream for forks)
2024-08-24 12:33:09 +02:00
Claire
117af5847a
Disable tagging nightly images as latest
2024-08-24 12:32:48 +02:00
Claire
49671fe253
Merge pull request #2824 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 97f6baf977
2024-08-24 12:30:57 +02:00
Claire
d0529b810a
Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream
2024-08-24 12:06:31 +02:00
Claire
97f6baf977
Bump version to v4.3.0-beta.1 ( #30989 )
2024-08-23 16:07:32 +00:00
Michael Stanclift
77c055b78c
Update Docker Compose for 4.3-beta ( #31554 )
2024-08-23 16:00:07 +00:00
Claire
c493689e84
Change output format of repo:changelog task ( #31546 )
2024-08-23 12:55:54 +00:00
Claire
ae9bd635e7
Merge pull request #2822 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to e08d22724d
2024-08-23 12:34:34 +02:00
github-actions[bot]
62be0234d5
New Crowdin Translations (automated) ( #31559 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-23 08:59:31 +00:00
David Roetzel
0374918746
Add spec for doorkeeper behavior around issuing tokens ( #31545 )
2024-08-23 08:20:32 +00:00
Matt Jankowski
6ec768668e
Remove nsa statsd integration (replaced by OpenTelemetry) ( #30240 )
2024-08-22 20:28:54 +00:00
Claire
532b53eece
Fix assets build issue due to slightly different webpack config
2024-08-22 22:23:06 +02:00
Claire
e18bd0450a
Extract strings removed upstream
2024-08-22 22:17:33 +02:00
Claire
7ce079cd26
[Glitch] Fix missing CSS in moderation interface
...
Port e08d22724d
2024-08-22 22:11:48 +02:00
Claire
dc70ef25b2
Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream
2024-08-22 22:09:10 +02:00
Claire
eae232fd01
Merge pull request #2821 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 98237207e6
2024-08-22 22:00:04 +02:00
Claire
e08d22724d
Fix missing CSS in moderation interface ( #31550 )
2024-08-22 18:57:22 +00:00
Claire
9f2d3c721c
[Glitch] Hide multiple selection bar for notification requests when no notificion requests are loaded
...
Port abe292b0ec
2024-08-22 20:00:19 +02:00
Emelia Smith
37f20514d3
[Glitch] Add button to view the Hashtag on the instance from Hashtags in Moderation UI
...
Port 376088f6da
2024-08-22 19:59:37 +02:00
Claire
18556d3e9b
Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream refactored some helpers and moved them in another file.
Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
Kept glitch-soc definitions where they are and moved upstream ones
as upstream did.
2024-08-22 19:54:20 +02:00
Eugen Rochko
500f4925a5
Change how content warnings and filters are displayed in web UI ( #31365 )
2024-08-22 17:12:35 +00:00
Claire
98237207e6
Fix unnecessary “next” link when API returns fewer notification requests than requested ( #31541 )
2024-08-22 13:42:04 +00:00
Claire
abe292b0ec
Hide multiple selection bar for notification requests when no notificion requests are loaded ( #31540 )
2024-08-22 13:42:02 +00:00
renovate[bot]
61d9704f6d
Update babel monorepo to v7.25.4 ( #31542 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-22 11:51:30 +00:00
renovate[bot]
c70dc5f0d7
Update dependency node to 20.17 ( #31531 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-22 11:50:46 +00:00
Renaud Chaput
4a968cb7a9
Add icon field to instance endpoint ( #30205 )
2024-08-22 10:04:27 +00:00
Emelia Smith
376088f6da
Add button to view the Hashtag on the instance from Hashtags in Moderation UI ( #31533 )
2024-08-22 08:42:33 +00:00
renovate[bot]
170c6e9733
Update dependency opentelemetry-instrumentation-active_job to v0.7.7 ( #31530 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-22 08:27:46 +00:00
renovate[bot]
fd93f817e7
Update dependency aws-sdk-s3 to v1.159.0 ( #31518 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-22 08:15:54 +00:00
github-actions[bot]
f86d16adba
New Crowdin Translations (automated) ( #31536 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-22 08:04:56 +00:00
Claire
fd73999a84
Merge pull request #2820 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 2da687a28b
2024-08-21 22:41:10 +02:00
Claire
1e814f58cc
[Glitch] Remove dead CSS code
...
Port 2da687a28b
2024-08-21 20:33:39 +02:00
Claire
fa2e758152
Merge commit '2da687a28b509025343d3d8ca17753de9b128e8f' into glitch-soc/merge-upstream
2024-08-21 20:32:02 +02:00
Claire
0cd60fdb82
Merge pull request #2819 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to edeae945c0
2024-08-21 20:31:08 +02:00
Claire
2da687a28b
Remove dead CSS code ( #31527 )
2024-08-21 17:05:02 +00:00
Claire
3ffdb7cdac
[Glitch] Remove fontawesome leftovers
...
Port edeae945c0
2024-08-21 18:52:40 +02:00
Claire
24849cdb1f
[Glitch] Add automatic notification polling for grouped notifications
...
Port d67e11733e
2024-08-21 18:51:27 +02:00
KMY（雪あすか）
a9cef5c324
[Glitch] Fix boost dialog visibility selection not being taken into account
...
Port 01a757d306
2024-08-21 18:50:44 +02:00
Claire
66bc8d5717
[Glitch] Fix distracting and confusing always-showing scrollbar track in boost confirmation modal
...
Port e48a64d3b5
2024-08-21 18:50:17 +02:00
mogaminsk
b2e6f11b81
[Glitch] Change translation strings of grouped notification label to have full context
...
Port 8c7642cd18
2024-08-21 18:49:54 +02:00
Eugen Rochko
bae0b81779
[Glitch] Change hints for missing remote content in web UI
...
Port b06c7b6b5a
2024-08-21 18:49:02 +02:00
Claire
0cec9077a4
Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Upstream added a test for a new attribute, next to a line we modified
in glitch-soc because of a different default value.
Updated as upstream's did, keeping glitch-soc's default value.
2024-08-21 18:44:21 +02:00
Claire
edeae945c0
Remove fontawesome leftovers ( #31525 )
2024-08-21 15:55:35 +00:00
Claire
19a1acb38b
Add api_versions to /api/v2/instance ( #31354 )
2024-08-21 14:54:59 +00:00
Claire
d67e11733e
Add automatic notification polling for grouped notifications ( #31513 )
2024-08-21 14:41:31 +00:00
KMY（雪あすか）
01a757d306
Fix boost dialog visibility selection not being taken into account ( #31523 )
2024-08-21 13:11:36 +00:00
Claire
e48a64d3b5
Fix distracting and confusing always-showing scrollbar track in boost confirmation modal ( #31524 )
2024-08-21 10:25:14 +00:00
mogaminsk
8c7642cd18
Change translation strings of grouped notification label to have full context ( #31486 )
2024-08-21 08:56:36 +00:00
