Jeremy Kescher
|
0353a3d759
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
# app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
|
2024-03-20 22:59:13 +01:00 |
|
github-actions[bot]
|
6c0b1a41a1
|
New Crowdin Translations (automated) (#29657)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-03-20 08:39:42 +00:00 |
|
Jeremy Kescher
|
a53f2cf970
|
Merge branch 'glitch-soc' into develop
|
2024-03-19 18:31:27 +01:00 |
|
Claire
|
bc6f9befde
|
Change “Notifications” settings page to “E-mail notifications” (#29646)
|
2024-03-19 13:40:16 +00:00 |
|
github-actions[bot]
|
4e61bce4e9
|
New Crowdin Translations (automated) (#29641)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-03-19 08:36:52 +00:00 |
|
Claire
|
cf08a438e7
|
Add badge on account card in report moderation interface when account is already suspended (#29592)
|
2024-03-19 08:20:53 +00:00 |
|
Matt Jankowski
|
ecdbf15ebe
|
Remove unused link_to_older and link_to_newer helper methods (#29620)
|
2024-03-18 08:54:46 +00:00 |
|
github-actions[bot]
|
04817e965a
|
New Crowdin Translations (automated) (#29623)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-03-18 08:47:48 +00:00 |
|
Claire
|
82c2af0356
|
Fix user_mailer.welcome.hashtags_recent_count not having plural form (#29607)
|
2024-03-16 16:38:20 +00:00 |
|
github-actions[bot]
|
6865fda593
|
New Crowdin Translations (automated) (#29603)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-03-15 10:02:10 +00:00 |
|
Jeremy Kescher
|
21a23b58ab
|
Merge branch 'glitch-soc' into develop
|
2024-03-14 21:46:57 +01:00 |
|
Jeremy Kescher
|
caccc2e0f4
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# README.md
# app/javascript/flavours/glitch/components/status.jsx
# app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
# app/javascript/flavours/glitch/locales/en.json
# app/javascript/flavours/glitch/reducers/compose.js
# app/javascript/flavours/glitch/styles/components.scss
# app/javascript/mastodon/reducers/compose.js
# app/models/notification.rb
|
2024-03-14 20:01:30 +01:00 |
|
github-actions[bot]
|
5aea35de13
|
New Crowdin Translations (automated) (#29587)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-03-14 09:00:42 +00:00 |
|
github-actions[bot]
|
171948b910
|
New Crowdin Translations (automated) (#29563)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-03-13 12:42:44 +00:00 |
|
github-actions[bot]
|
dc36b961aa
|
New Crowdin Translations (automated) (#29554)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-03-12 09:03:51 +00:00 |
|
Eugen Rochko
|
5b3a8737d6
|
Add hints for rules (#29539)
|
2024-03-11 08:57:07 +00:00 |
|
github-actions[bot]
|
f85168b189
|
New Crowdin Translations (automated) (#29467)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-03-11 07:37:04 +00:00 |
|
Eugen Rochko
|
50b17f7e10
|
Add notification policies and notification requests (#29366)
|
2024-03-07 14:53:37 +00:00 |
|
Jeremy Kescher
|
6aa17a7c1b
|
Merge branch 'glitch-soc' into develop
|
2024-03-03 03:12:37 +01:00 |
|
HTeuMeuLeu
|
934cab7508
|
New welcome email (#28883)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
|
2024-03-01 12:16:53 +00:00 |
|
github-actions[bot]
|
cdf5098166
|
New Crowdin Translations (automated) (#29452)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-29 09:38:33 +00:00 |
|
Jeremy Kescher
|
de1e89f42c
|
Merge branch 'glitch-soc' into develop
|
2024-02-28 23:01:31 +01:00 |
|
github-actions[bot]
|
7f84bbfd92
|
New Crowdin Translations (automated) (#29430)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-28 12:14:42 +00:00 |
|
github-actions[bot]
|
bc4c5ed918
|
New Crowdin Translations (automated) (#29423)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-27 14:53:53 +00:00 |
|
github-actions[bot]
|
98e3dc2578
|
New Crowdin Translations (automated) (#29382)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-26 13:03:06 +00:00 |
|
Jeremy Kescher
|
009251a17d
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/initial_state.js
# app/serializers/initial_state_serializer.rb
# config/initializers/chewy.rb
# config/locales/en.yml
# config/locales/ja.yml
|
2024-02-24 19:11:05 +01:00 |
|
Jeremy Kescher
|
6e635a4283
|
Clarify English locale
|
2024-02-24 14:05:49 +01:00 |
|
noellabo
|
d518f06eae
|
Add reject blurhash to Admin setting
|
2024-02-24 11:14:32 +01:00 |
|
Jeremy Kescher
|
a4e12a484d
|
Merge branch 'glitch-soc' into develop
|
2024-02-24 11:11:24 +01:00 |
|
Paolo Melchiorre
|
aca691726b
|
Fix #21492 Add missing WebP hint in avatar/header localizations (#22395)
|
2024-02-23 22:10:46 +00:00 |
|
github-actions[bot]
|
bba4118ddd
|
New Crowdin Translations (automated) (#29369)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-23 15:21:02 +00:00 |
|
Claire
|
d23f445527
|
Automatically switch from open to approved registrations in absence of moderators (#29318)
|
2024-02-22 20:45:40 +01:00 |
|
Claire
|
b71904816a
|
Change registrations to be disabled by default for new servers (#29280)
|
2024-02-22 13:28:19 +00:00 |
|
github-actions[bot]
|
449fcf1ae7
|
New Crowdin Translations (automated) (#29343)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-22 10:37:48 +00:00 |
|
Claire
|
2751acb6cd
|
Automatically switch from open to approved registrations in absence of moderators (#29318)
|
2024-02-21 17:45:06 +00:00 |
|
github-actions[bot]
|
fd2b6c29c6
|
New Crowdin Translations (automated) (#29311)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-21 11:24:44 +00:00 |
|
github-actions[bot]
|
9a2b9d1484
|
New Crowdin Translations (automated) (#29298)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-20 09:23:40 +00:00 |
|
github-actions[bot]
|
ad16362efe
|
New Crowdin Translations (automated) (#29255)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-19 13:25:45 +00:00 |
|
noellabo
|
5255bd08e0
|
Add reject pattern to Admin setting (Ported to Glitch Soc)
# Conflicts:
# app/views/admin/settings/shared/_links.html.haml
# config/routes/admin.rb
|
2024-02-17 18:55:57 +01:00 |
|
github-actions[bot]
|
1c93d625c6
|
New Crowdin Translations (automated) (#29195)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-16 07:51:13 +00:00 |
|
Claire
|
e7ca82762d
|
Fix user creation failure handling in OAuth paths (#29207)
|
2024-02-14 23:12:59 +01:00 |
|
Claire
|
d4d0565b0f
|
Fix user creation failure handling in OAuth paths (#29207)
|
2024-02-14 21:49:45 +00:00 |
|
github-actions[bot]
|
6482948547
|
New Crowdin Translations (automated) (#29156)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-12 09:59:05 +00:00 |
|
github-actions[bot]
|
c07028b2fa
|
New Crowdin Translations (automated) (#29152)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-09 09:55:30 +00:00 |
|
github-actions[bot]
|
2a362d62a8
|
New Crowdin Translations (automated) (#29145)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-08 09:43:02 +00:00 |
|
github-actions[bot]
|
17052714a2
|
New Crowdin Translations (automated) (#29121)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-07 12:38:37 +00:00 |
|
github-actions[bot]
|
90ccf7beb2
|
New Crowdin Translations (automated) (#28965)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-06 18:47:44 +00:00 |
|
github-actions[bot]
|
45287049ab
|
New Crowdin Translations (automated) (#28923)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-01-26 09:15:55 +00:00 |
|
github-actions[bot]
|
59d2ea0d82
|
New Crowdin Translations (automated) (#28899)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-01-25 13:00:44 +00:00 |
|
Eugen Rochko
|
b19ae521b7
|
Add confirmation when redirecting logged-out requests to permalink (#27792)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
2024-01-24 10:49:19 +00:00 |
|