Jeremy Kescher
|
7df41062ba
|
Merge branch 'glitch' into develop
|
2024-08-26 18:31:12 +02: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 |
|
Jeremy Kescher
|
08e538f8a4
|
Merge branch 'glitch' into develop
|
2024-08-16 16:05:14 +02:00 |
|
Jeremy Kescher
|
084cfb7d6c
|
Merge branch 'refs/heads/glitch' into develop
|
2024-08-11 19:09:56 +02:00 |
|
Robin
|
c39a8e1061
|
Change “e-mail” to “email” in en.yml (#31317)
|
2024-08-10 09:32:57 +00:00 |
|
Emelia Smith
|
d3089018d5
|
Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292)
|
2024-08-10 09:17:10 +00:00 |
|
Jeong Arm
|
9bae237792
|
Change confirmation prompt on trending management (#19626)
|
2024-08-09 12:47:02 +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 |
|
Emelia Smith
|
c40e481169
|
Implement UI for Admin Search of Hashtags (#30880)
|
2024-07-29 15:49:44 +00:00 |
|
Emelia Smith
|
bb2e5a4b58
|
Add audit logs to Admin::InstancesController (#27386)
|
2024-07-23 08:12:30 +00:00 |
|
Jeremy Kescher
|
1862a60e51
|
Merge branch 'refs/heads/glitch' into develop
|
2024-07-16 22:32:15 +02:00 |
|
Emelia Smith
|
aa88aca0ad
|
Add optional OAuth application to reports (#30539)
|
2024-07-16 13:23:08 +00:00 |
|
Michael Stanclift
|
905921b2ef
|
Add missing "Update Report" string in audit log (#31033)
|
2024-07-16 07:06:19 +00:00 |
|
David Roetzel
|
9be77fc0db
|
Revert "Add system check for missing database indexes" (#30909)
|
2024-07-03 13:36:42 +00:00 |
|
David Roetzel
|
ebd8e1bbb6
|
Add system check for missing database indexes (#30888)
|
2024-07-03 07:19:54 +00:00 |
|
Jeremy Kescher
|
29ac8c0606
|
Merge branch 'refs/heads/glitch-soc' into develop
|
2024-06-18 00:15:52 +02:00 |
|
Emelia Smith
|
3d9f00ae16
|
Fix unsafe URLs in audit log resulting from domain blocks (#27139)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
2024-06-14 07:54:09 +00:00 |
|
Jeremy Kescher
|
d1856ea48d
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/javascript/mastodon/initial_state.js
|
2024-05-22 23:56:46 +02:00 |
|
Michael Stanclift
|
2c75cf8599
|
Add "Warning preset" link to admin navigation (#26199)
|
2024-05-22 09:05:33 +00:00 |
|
Jeremy Kescher
|
fae98d1deb
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
|
2024-05-20 23:57:04 +02:00 |
|
Jeong Arm
|
a627219b25
|
Fix moderation action logs (#30342)
|
2024-05-17 09:18:54 +00:00 |
|
Jeremy Kescher
|
e73c612cb1
|
Merge branch 'refs/heads/glitch-soc' into develop
|
2024-05-11 23:31:31 +02:00 |
|
Michael Stanclift
|
bb8c6346fb
|
Reword and rearrange Content Retention page (#27733)
|
2024-04-26 15:17:41 +00:00 |
|
Jeremy Kescher
|
2df3b9f803
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/serializers/initial_state_serializer.rb
|
2024-04-11 21:50:48 +02:00 |
|
Renaud Chaput
|
02ea161506
|
Support "system" theme setting (light/dark theme depending on user system preference) (#29748)
Co-authored-by: Nishiki Liu <hello@nshki.com>
|
2024-03-26 09:25:49 +00:00 |
|
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 |
|
Claire
|
44bf7b8128
|
Add notifications of severed relationships (#27511)
|
2024-03-20 15:37:21 +00:00 |
|
Claire
|
bc6f9befde
|
Change “Notifications” settings page to “E-mail notifications” (#29646)
|
2024-03-19 13:40:16 +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 |
|
Claire
|
82c2af0356
|
Fix user_mailer.welcome.hashtags_recent_count not having plural form (#29607)
|
2024-03-16 16:38:20 +00: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 |
|
Eugen Rochko
|
50b17f7e10
|
Add notification policies and notification requests (#29366)
|
2024-03-07 14:53:37 +00:00 |
|
HTeuMeuLeu
|
934cab7508
|
New welcome email (#28883)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
|
2024-03-01 12:16:53 +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 |
|
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 |
|
Claire
|
2751acb6cd
|
Automatically switch from open to approved registrations in absence of moderators (#29318)
|
2024-02-21 17:45:06 +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 |
|
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 |
|
Claire
|
e2d9635074
|
Add notification email on invalid second authenticator (#28822)
|
2024-01-22 13:55:43 +00:00 |
|
Claire
|
3593ee2e36
|
Add rate-limit of TOTP authentication attempts at controller level (#28801)
|
2024-01-19 12:19:49 +00:00 |
|
HTeuMeuLeu
|
7f471e70c0
|
Update new email templates (#28416)
Co-authored-by: Matt Jankowski <matt@jankowski.online>
|
2024-01-15 18:18:59 +00:00 |
|
Claire
|
dfdadb92e8
|
Add ability to require approval when users sign up using specific email domains (#28468)
|
2024-01-04 09:07:05 +00:00 |
|
Matt Jankowski
|
6d51ac246b
|
Update partials for the AdminMailer.new_trends mailer (#28011)
|
2023-11-21 10:52:20 +00:00 |
|
Claire
|
bd575a1dd6
|
Add banner for forwarded reports made by remote users about remote content (#27549)
|
2023-11-15 14:18:43 +00:00 |
|
Claire
|
07a4059901
|
Add support for invite codes in the registration API (#27805)
|
2023-11-13 13:27:00 +00:00 |
|